Do not close RRQ socket until the last ACK is received.

git-svn-id: http://svn.klever.net/kin/pumpkin/trunk@152 fe716a7a-6dde-0310-88d9-d003556173a8

1 files changed, 68 insertions, 170 deletions

diff --git a/pumpkin.mak b/pumpkin.mak
index a22a6fa..bf9e895 100644
--- a/pumpkin.mak
+++ b/pumpkin.mak
@@ -683,65 +683,54 @@ LINK32_OBJS= \
 !ENDIF 

 

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PumpKIN.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PUMPK=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PUMPK=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PumpKIN.sbr" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PUMPK=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PumpKIN.obj" : $(SOURCE) $(DEP_CPP_PUMPK) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PumpKINDlg.cpp

+

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

 DEP_CPP_PUMPKI=\

 	".\ACLTargetCombo.h"\

 	".\ConfirmRRQDlg.h"\

 	".\ConfirmWRQDlg.h"\

 	".\PropsACL.h"\

 	".\PropsNetwork.h"\

@@ -755,31 +744,66 @@ DEP_CPP_PUMPKI=\
 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

-

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

+DEP_CPP_PUMPKI=\

+	".\ACLTargetCombo.h"\

+	".\ConfirmRRQDlg.h"\

+	".\ConfirmWRQDlg.h"\

+	".\PropsACL.h"\

+	".\PropsNetwork.h"\

+	".\PropsServer.h"\

+	".\PropsSounds.h"\

+	".\pumpkin.h"\

+	".\PumpKINDlg.h"\

+	".\RequestDlg.h"\

+	".\Resolver.h"\

+	".\Retrier.h"\

+	".\shared-code\kHelpers.h"\

+	".\stdafx.h"\

+	".\Trayer.h"\

+	

+NODEP_CPP_PUMPKI=\

+	".\DoSelect"\

+	

 

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PumpKINDlg.sbr" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

+DEP_CPP_PUMPKI=\

+	".\ACLTargetCombo.h"\

+	".\ConfirmRRQDlg.h"\

+	".\ConfirmWRQDlg.h"\

+	".\PropsACL.h"\

+	".\PropsNetwork.h"\

+	".\PropsServer.h"\

+	".\PropsSounds.h"\

+	".\pumpkin.h"\

+	".\PumpKINDlg.h"\

+	".\RequestDlg.h"\

+	".\Resolver.h"\

+	".\Retrier.h"\

+	".\shared-code\BellsNWhistles.h"\

+	".\shared-code\kHelpers.h"\

+	".\stdafx.h"\

+	".\Trayer.h"\

+	

 

 "$(INTDIR)\PumpKINDlg.obj" : $(SOURCE) $(DEP_CPP_PUMPKI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -983,53 +1007,39 @@ BuildCmds= \
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PropsServer.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PROPS=\

 	".\PropsServer.h"\

 	".\pumpkin.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PROPS=\

-	".\PropsServer.h"\

-	".\pumpkin.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PropsServer.sbr" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PROPS=\

-	".\PropsServer.h"\

-	".\pumpkin.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsServer.obj" : $(SOURCE) $(DEP_CPP_PROPS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -1075,112 +1085,80 @@ DEP_CPP_PROPSN=\
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\ConfirmRRQDlg.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_CONFI=\

 	".\ConfirmRRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_CONFI=\

-	".\ConfirmRRQDlg.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\ConfirmRRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_CONFI=\

-	".\ConfirmRRQDlg.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\ConfirmRRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\ConfirmWRQDlg.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_CONFIR=\

 	".\ConfirmWRQDlg.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_CONFIR=\

-	".\ConfirmWRQDlg.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\ConfirmWRQDlg.sbr" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_CONFIR=\

-	".\ConfirmWRQDlg.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\ConfirmWRQDlg.obj" : $(SOURCE) $(DEP_CPP_CONFIR) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -1226,168 +1204,120 @@ DEP_CPP_REQUE=\
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Resolver.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_RESOL=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Resolver.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_RESOL=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\Resolver.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\Resolver.sbr" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_RESOL=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\Resolver.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\Resolver.obj" : $(SOURCE) $(DEP_CPP_RESOL) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Retrier.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_RETRI=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\Retrier.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_RETRI=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\Retrier.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\Retrier.sbr" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_RETRI=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\Retrier.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\Retrier.obj" : $(SOURCE) $(DEP_CPP_RETRI) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\Trayer.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_TRAYE=\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	".\Trayer.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_TRAYE=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	".\Trayer.h"\

-	

 

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\Trayer.sbr" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_TRAYE=\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	".\Trayer.h"\

-	

 

 "$(INTDIR)\Trayer.obj" : $(SOURCE) $(DEP_CPP_TRAYE) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -1414,56 +1344,40 @@ SOURCE=.\help\pumpkin.cnt
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\PropsSounds.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_PROPSS=\

 	".\PropsSounds.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_PROPSS=\

-	".\PropsSounds.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\PropsSounds.sbr" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_PROPSS=\

-	".\PropsSounds.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\PropsSounds.obj" : $(SOURCE) $(DEP_CPP_PROPSS) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF 

@@ -1511,56 +1425,40 @@ DEP_CPP_PROPSA=\
 

 # End Source File

 ################################################################################

 # Begin Source File

 

 SOURCE=.\ACLTargetCombo.cpp

-

-!IF  "$(CFG)" == "PumpKIN - Win32 Release"

-

 DEP_CPP_ACLTA=\

 	".\ACLTargetCombo.h"\

 	".\pumpkin.h"\

 	".\PumpKINDlg.h"\

 	".\shared-code\BellsNWhistles.h"\

 	".\shared-code\kHelpers.h"\

 	".\stdafx.h"\

 	

 

+!IF  "$(CFG)" == "PumpKIN - Win32 Release"

+

+

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Debug"

 

-DEP_CPP_ACLTA=\

-	".\ACLTargetCombo.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 "$(INTDIR)\ACLTargetCombo.sbr" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ELSEIF  "$(CFG)" == "PumpKIN - Win32 Static"

 

-DEP_CPP_ACLTA=\

-	".\ACLTargetCombo.h"\

-	".\pumpkin.h"\

-	".\PumpKINDlg.h"\

-	".\shared-code\BellsNWhistles.h"\

-	".\shared-code\kHelpers.h"\

-	".\stdafx.h"\

-	

 

 "$(INTDIR)\ACLTargetCombo.obj" : $(SOURCE) $(DEP_CPP_ACLTA) "$(INTDIR)"\

  "$(INTDIR)\pumpkin.pch"

 

 

 !ENDIF