Skip to content

Commit

Permalink
bugs--;
Browse files Browse the repository at this point in the history 
crash logs should dump now
fixed a mutex hangup
now freeing dead masterserver connections
  • Loading branch information
stonedDiscord committed Oct 23, 2015
1 parent e0dcee5 commit 0c68fcd
Show file tree
Hide file tree
Showing 9 changed files with 141 additions and 94 deletions.
5 changes: 3 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,6 @@ Temporary Items
# crap i dont need
*.jpg
*.log
build
check*
check*
base/
build/
8 changes: 4 additions & 4 deletions AOprivateServer.pbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<section name="data">
<explorer view="" pattern="8"/>
<log show="1"/>
<lastopen date="2015-09-15 15:29" user="Sven" host="SPC"/>
<lastopen date="2015-10-23 18:51" user="Sven" host="SPC"/>
</section>
<section name="files">
<file name="checker.pb">
Expand All @@ -20,11 +20,11 @@
</file>
<file name="main.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
<fingerprint md5="1f5e84972ee54b9fc26fe18d826f37b6"/>
<fingerprint md5="e0effe57e8c97c2211889d77cfd29cc3"/>
</file>
<file name="server_shared.pb">
<config load="0" scan="1" panel="1" warn="1" lastopen="1" panelstate="+"/>
<fingerprint md5="9221528e063f4b6c143e652cfc29ca55"/>
<fingerprint md5="46ecc560cc69941816a7dd29079ca98b"/>
</file>
</section>
<section name="targets">
Expand All @@ -38,7 +38,7 @@
<icon enable="1">../dolan.ico</icon>
<format exe="default" cpu="2"/>
<debugger custom="1" type="ide"/>
<compilecount enable="1" value="827"/>
<compilecount enable="1" value="828"/>
<buildcount enable="1" value="114"/>
<versioninfo enable="1">
<field0 value="2,%COMPILECOUNT,%BUILDCOUNT,0"/>
Expand Down
18 changes: 9 additions & 9 deletions Common.pb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Enumeration
#Text_6
#String_OP
#Frame_5
#Listview_2
#listbox_event
#Button_BG
#Text_7
#Combo_3
Expand Down Expand Up @@ -149,16 +149,16 @@ Procedure Open_Window_0()
BalloonTip(GadgetID(#ListIcon_2), #ListIcon_2, "Shows the OOC chat history", "", #TOOLTIP_NO_ICON)
FrameGadget(#Frame_5, 520, 0, 210, 340, "OOC")
CompilerIf #EASYLOG
ListViewGadget(#Listview_2, 290, 20, 230, 320)
AddGadgetItem(#Listview_2,0,"serverD "+Str(#PB_Editor_CompileCount)+"."+Str(#PB_Editor_BuildCount))
AddGadgetItem(#Listview_2,0,"Check out http://stoned.ddns.net/serverd.html for updates")
ListViewGadget(#listbox_event, 290, 20, 230, 320)
AddGadgetItem(#listbox_event,0,"serverD "+Str(#PB_Editor_CompileCount)+"."+Str(#PB_Editor_BuildCount))
AddGadgetItem(#listbox_event,0,"Check out http://stoned.ddns.net/serverd.html for updates")
If update
AddGadgetItem(#Listview_2,0,"UPDATE AVAILABLE",#PB_ListIcon_AlwaysShowSelection)
AddGadgetItem(#listbox_event,0,"UPDATE AVAILABLE",#PB_ListIcon_AlwaysShowSelection)
EndIf
CompilerElse
EditorGadget(#Listview_2, 290, 20, 230, 320)
EditorGadget(#listbox_event, 290, 20, 230, 320)
CompilerEndIf
BalloonTip(GadgetID(#Listview_2), #Listview_2, "Shows all activity", "", #TOOLTIP_NO_ICON)
BalloonTip(GadgetID(#listbox_event), #listbox_event, "Shows all activity", "", #TOOLTIP_NO_ICON)

;EndIf
EndIf
Expand Down Expand Up @@ -191,8 +191,8 @@ EndProcedure


; IDE Options = PureBasic 5.31 (Windows - x86)
; CursorPosition = 134
; FirstLine = 122
; CursorPosition = 160
; FirstLine = 114
; Folding = -
; EnableXP
; EnableCompileCount = 0
Expand Down
151 changes: 98 additions & 53 deletions base/musiclist.txt
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,98 @@
~stop.mp3
01_turnabout_courtroom_-_prologue.mp3
113 Confrontation ~ Presto 2009.mp3
114 Pursuit(Miles).mp3
>mlp
>gs4
http://8tracks.s3.amazonaws.com/tf/003/891/309/75308.mp3
http://www.youtube-mp3.org/a2/c/getData?pid=5483687662583808&h=123123&r=1413987290921
Annonce The Truth(AA).mp3
Annonce The Truth(AJ).mp3
Annonce The Truth(JFA).mp3
Annonce The Truth(Miles).mp3
Annonce The Truth(T&T).mp3
Crises of Fate.mp3
Forgotten Legend.mp3
Ghost Trick - 4 Minutes Before Death.mp3
Ghost Trick - Countdown.mp3
Ghost Trick - The World of the Dead.mp3
Godot - The Fragrance of Dark Coffee.mp3
Great Revival ~ Franziska von Karma.mp3
Great Revival ~ Miles Edgeworth.mp3
Hotline of Fate.mp3
Interesting People.mp3
logic_and_trick.mp3
Luke Atmey ~ I Just Want Love.mp3
Noisy People.mp3
OBJECTIOM(AJ).mp3
OBJECTION (AA).mp3
OBJECTON (JFA).mp3
OBJECTION (T&T).mp3
OBJECTION(Miles).mp3
Others ~ Guilty love.mp3
Prelude(AA).mp3
Prelude(AJ).mp3
Pursuit ~ I Want to Find the Truth(Orchestra).mp3
PURSUIT(AA) - variation.mp3
PURSUIT(AA).mp3
PURSUIT(AJ).mp3
PURSUIT(JFA) - variation.mp3
PURSUIT(JFA).mp3
PURSUIT(T&T) - variation.mp3
PURSUIT(T&T).mp3
Questioning(AA-allergo).mp3
Questioning(AA-normal).mp3
Speak up, Pup!.mp3
Super Trixie.mp3
Suspence(AA).mp3
The Great Truth Burglar.mp3
Trial(AA).mp3
Trial(AJ).mp3ne of Fate.mp3
ok this is the end
for real
here
Fluttershy's Flight at the Flying Battery Zone.mp3

This comment has been minimized.

Sign in to view

Copy link
@oldmud0

oldmud0 Nov 12, 2015

ummm none of this is vanilla

This comment has been minimized.

Sign in to view

Copy link
@stonedDiscord

stonedDiscord Nov 14, 2015

Owner

so what
it's my server after all :D

This comment has been minimized.

Sign in to view

Copy link
@oldmud0

oldmud0 Nov 14, 2015

Also, do the web links actually work?

This comment has been minimized.

Sign in to view

Copy link
@stonedDiscord

stonedDiscord Nov 15, 2015

Owner

yes with a client modded to do that
but i didn't release it because it can't play local music anymore

This comment has been minimized.

Sign in to view

Copy link
@oldmud0

oldmud0 Dec 21, 2015

A modded client...? How exactly did you do that?

This comment has been minimized.

Sign in to view

Copy link
@stonedDiscord

stonedDiscord Dec 21, 2015

Owner

http://www.ollydbg.de/

This comment has been minimized.

Sign in to view

Copy link
@oldmud0

oldmud0 Dec 21, 2015

so I was in the right track... I was using olly to see if I could find an exploit so that I could get the client to auto-download resources. I just have to look at tutorials to understand the disassembly and stack a bit more. I've already found the sound play code by following the stack.

This comment has been minimized.

Sign in to view

Copy link
@stonedDiscord

stonedDiscord Dec 21, 2015

Owner

I also use IDA pro which is able to decode the debug information the client came with.
Borland RTTI or something

This comment has been minimized.

Sign in to view

Copy link
@oldmud0

oldmud0 Dec 21, 2015

tried free version of IDA, it's been a couple hours and have not gotten anywhere, I guess I would be better off making a new client instead of hacking the old one

This comment has been minimized.

Sign in to view

Copy link
@stonedDiscord

stonedDiscord Dec 23, 2015

Owner

i think the demo won't cut it, you need to apply the bds8vcl FLIRT signature
Payday 2 Soundtrack - This Is Our Time.mp3
Italobrothers - My Life is a Party.mp3
Night of Nights in Sonic 2.mp3
Eminem - White America.mp3
Halo 3 - Warthog Run.mp3
X-Files Theme.mp3
Rudy's Theme.mp3
Pylons.mp3
Pirate.mp3
furry.mp3
2k12.mp3
Island.mp3
Propane.mp3
Still Dre.mp3
Playhimoff.mp3
Go Far Kid.mp3
Hsin's Theme.mp3
2k12.mp3
2k12.mp3
Fluttershy's Flight at the Flying Battery Zone.mp3
Payday 2 Soundtrack - This Is Our Time.mp3
Italobrothers - My Life is a Party.mp3
Night of Nights in Sonic 2.mp3
Eminem - White America.mp3
Halo 3 - Warthog Run.mp3
X-Files Theme.mp3
Rudy's Theme.mp3
Pylons.mp3
Pirate.mp3
furry.mp3
2k12.mp3
Island.mp3
Propane.mp3
Still Dre.mp3
Playhimoff.mp3
Go Far Kid.mp3
Hsin's Theme.mp3
2k12.mp3
2k12.mp3
Fluttershy's Flight at the Flying Battery Zone.mp3
Payday 2 Soundtrack - This Is Our Time.mp3
Italobrothers - My Life is a Party.mp3
Night of Nights in Sonic 2.mp3
Eminem - White America.mp3
Halo 3 - Warthog Run.mp3
X-Files Theme.mp3
Rudy's Theme.mp3
Pylons.mp3
Pirate.mp3
furry.mp3
2k12.mp3
Island.mp3
Propane.mp3
Still Dre.mp3
Playhimoff.mp3
Go Far Kid.mp3
Hsin's Theme.mp3
2k12.mp3
2k12.mp3
Fluttershy's Flight at the Flying Battery Zone.mp3
Payday 2 Soundtrack - This Is Our Time.mp3
Italobrothers - My Life is a Party.mp3
Night of Nights in Sonic 2.mp3
Eminem - White America.mp3
Halo 3 - Warthog Run.mp3
X-Files Theme.mp3
Rudy's Theme.mp3
Pylons.mp3
Pirate.mp3
furry.mp3
2k12.mp3
Island.mp3
Propane.mp3
Still Dre.mp3
Playhimoff.mp3
Go Far Kid.mp3
Hsin's Theme.mp3
2k12.mp3
2k12.mp3
Fluttershy's Flight at the Flying Battery Zone.mp3
Payday 2 Soundtrack - This Is Our Time.mp3
Italobrothers - My Life is a Party.mp3
Night of Nights in Sonic 2.mp3
Eminem - White America.mp3
Halo 3 - Warthog Run.mp3
X-Files Theme.mp3
Rudy's Theme.mp3
Pylons.mp3
Pirate.mp3
furry.mp3
2k12.mp3
Island.mp3
Propane.mp3
Still Dre.mp3
Playhimoff.mp3
Go Far Kid.mp3
Hsin's Theme.mp3
2 changes: 0 additions & 2 deletions base/op.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
127.0.0.1
SUCKS70B3Y0UGG
31 changes: 17 additions & 14 deletions main.pb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ EndStructure
#C2 = 32618
Global version$="v"+Str(#PB_Editor_CompileCount)+"."+Str(#PB_Editor_BuildCount)
Global CommandThreading=0
Global error=0
Global lasterror=0
Global Logging.b=0
Global LagShield=1
Global public.b=0
Expand Down Expand Up @@ -481,7 +483,6 @@ Procedure SendTarget(user$,message$,*sender.Client)
areas(Clients()\area)\mlock=0
EndIf
DeleteMapElement(Clients(),Str(ClientID))
UnlockMutex(ListMutex)
rf=1
EndIf
EndIf
Expand All @@ -505,7 +506,6 @@ Procedure SendTarget(user$,message$,*sender.Client)
areas(Clients()\area)\mlock=0
EndIf
DeleteMapElement(Clients(),Str(ClientID))
UnlockMutex(ListMutex)
rf=1
EndIf
EndIf
Expand Down Expand Up @@ -827,6 +827,9 @@ ProcedureDLL MasterAdvert(port)
EndIf
If tick>100
WriteLog("Masterserver adverter thread timed out",Server)
If msID
CloseNetworkConnection(msID)
EndIf
Server\ClientID=0
msID=0
EndIf
Expand Down Expand Up @@ -1322,6 +1325,7 @@ Procedure HandleAOCommand(*usagePointer.Client)

Case "/stop"
If *usagePointer\perm>1
WriteLog("stopping server...",*usagePointer)
Quit=1
public=0
EndIf
Expand Down Expand Up @@ -2049,9 +2053,9 @@ Procedure Network(var)
areas(Clients()\area)\mlock=0
EndIf
DeleteMapElement(Clients(),Str(ClientID))
UnlockMutex(ListMutex)
rf=1
EndIf
UnlockMutex(ListMutex)
EndIf
EndIf

Expand All @@ -2061,6 +2065,7 @@ Procedure Network(var)
EndSelect

Until Quit = 1
WriteLog("stopping server...",Server)
LockMutex(ListMutex)
ResetMap(Clients())
While NextMapElement(Clients())
Expand All @@ -2085,10 +2090,9 @@ start:
CompilerIf #PB_Compiler_Debugger
If 1
CompilerElse

If ErrorAddress()

Quit=1
error=ErrorAddress()
If error<>lasterror
lasterror=error
lpublic=public
public=0
OpenFile(5,"crash.txt",#PB_File_NoBuffering|#PB_File_Append)
Expand Down Expand Up @@ -2118,7 +2122,6 @@ CompilerIf #PB_Compiler_Debugger
LoadSettings(1)
Delay(500)
public=lpublic
Quit=0
If nthread
nthread=CreateThread(@Network(),0)
EndIf
Expand Down Expand Up @@ -2224,8 +2227,8 @@ CompilerIf #PB_Compiler_Debugger
Next
EndIf

Case #Listview_2
logclid=GetGadgetItemData(#Listview_2,GetGadgetState(#Listview_2))
Case #listbox_event
logclid=GetGadgetItemData(#listbox_event,GetGadgetState(#listbox_event))
If logclid
For b=0 To CountGadgetItems(#ListView_0)
If GetGadgetItemData(#ListView_0,b) = logclid
Expand Down Expand Up @@ -2269,8 +2272,8 @@ CompilerIf #PB_Compiler_Debugger
ResizeGadget(#Button_2,WindowWidth(0)/6.08,15,WindowWidth(0)/8.111,22)
ResizeGadget(#String_5,WindowWidth(0)/3.476,15,WindowWidth(0)/10.42,22)
ResizeGadget(#Frame_4,WindowWidth(0)/2.517,0,WindowWidth(0)/3.173,WindowHeight(0))
ResizeGadget(#Listview_2, WindowWidth(0)/1.7, 30, WindowWidth(0)-WindowWidth(0)/1.7, WindowHeight(0)-90)
ResizeGadget(#Listview_2,WindowWidth(0)/2.517,20,WindowWidth(0)/3.173,WindowHeight(0)-20)
ResizeGadget(#listbox_event, WindowWidth(0)/1.7, 30, WindowWidth(0)-WindowWidth(0)/1.7, WindowHeight(0)-90)
ResizeGadget(#listbox_event,WindowWidth(0)/2.517,20,WindowWidth(0)/3.173,WindowHeight(0)-20)
ResizeGadget(#Frame_5,WindowWidth(0)/1.4,0,WindowWidth(0)/3.476,WindowHeight(0))
ResizeGadget(#ListIcon_2,WindowWidth(0)/1.4,20,WindowWidth(0)/3.476,WindowHeight(0)-40)

Expand Down Expand Up @@ -2320,8 +2323,8 @@ CompilerIf #PB_Compiler_Debugger

End
; IDE Options = PureBasic 5.31 (Windows - x86)
; CursorPosition = 1827
; FirstLine = 1933
; CursorPosition = 2275
; FirstLine = 2229
; Folding = ---
; EnableXP
; EnableCompileCount = 0
Expand Down
11 changes: 5 additions & 6 deletions poker.ini
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
[cfg]
LogFile = base\serverlog.log
LogFile = poker.log
Logging = 1
oppass = penis
adminpass = dick
oppass = dicks
adminpass = penis
ModCol = 1
LoginReply = CT#sD#dicks#%
motdevi = 0
BlockIni = 0
motdevi = 1
BlockIni = 1
Loading

0 comments on commit 0c68fcd

Please sign in to comment.