[gnucula-commits] Gnucula GnuControl.cpp,1.13,1.14 GnuNode.cpp,1.19,1.20 GnuShare.cpp,1.12,1.13

[<ri...@us...>]

Update of /cvsroot/gnucula/Gnucula
In directory sc8-pr-cvs1:/tmp/cvs-serv22102

Modified Files:
	GnuControl.cpp GnuNode.cpp GnuShare.cpp 
Log Message:
small changes...



Index: GnuControl.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuControl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** GnuControl.cpp	8 Jul 2003 08:55:08 -0000	1.13
--- GnuControl.cpp	23 Aug 2003 21:30:00 -0000	1.14
***************
*** 795,799 ****
  {
  
! 	for (int i = 0; i < 3; i++)
  	{
  		CGnuNode* DeadNode = NULL;
--- 795,799 ----
  {
  
! 	for (int mode = 0; mode < 3; mode++)
  	{
  		CGnuNode* DeadNode = NULL;
***************
*** 802,817 ****
  
  		// Drop Normal/Ultra nodes
! 		for (int j = 0; j < m_NodeList.size(); j++)
  			if (SOCK_CONNECTED == m_NodeList[i]->m_Status)
  			{
! 				if ((i == 0 && m_NodeList[j]->m_HostMode == CLIENT_NORMAL) || \
! 						((i == 1 && m_NodeList[j]->m_HostMode == CLIENT_ULTRAPEER && \
! 						(m_NodeList[j]->m_RemoteAgent.Find("GnucDNA") == -1)) || \
! 						(i == 2 && m_NodeList[j]->m_HostMode == CLIENT_ULTRAPEER))
  
! 					if (LowestTime.GetTimeSpan() == 0 || CurrentTime - m_NodeList[j]->m_ConnectTime < LowestTime)
  					{
! 						DeadNode	 = m_NodeList[j];
! 						LowestTime   = CurrentTime - m_NodeList[j]->m_ConnectTime;
  					}
  			}
--- 802,818 ----
  
  		// Drop Normal/Ultra nodes
! 		for (int i = 0; i < m_NodeList.size(); i++)
  			if (SOCK_CONNECTED == m_NodeList[i]->m_Status)
  			{
! 				if ((mode == 0 && m_NodeList[i]->m_HostMode == CLIENT_NORMAL) || \
! 						((mode == 1 && m_NodeList[i]->m_HostMode == CLIENT_ULTRAPEER && \
! 						(m_NodeList[i]->m_RemoteAgent.Find("GnucDNA") == -1)) || \
! 						(mode == 2 && m_NodeList[i]->m_HostMode == CLIENT_ULTRAPEER))
  
! 					if ((LowestTime.GetTimeSpan() == 0) || \
! 							(CurrentTime - m_NodeList[i]->m_ConnectTime < LowestTime))
  					{
! 						DeadNode = m_NodeList[i];
! 						LowestTime = CurrentTime - m_NodeList[i]->m_ConnectTime;
  					}
  			}

Index: GnuNode.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuNode.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** GnuNode.cpp	10 Jul 2003 22:41:07 -0000	1.19
--- GnuNode.cpp	23 Aug 2003 21:30:00 -0000	1.20
***************
*** 81,96 ****
  	m_SecsDead			= 0;
  
! 	m_IntervalPing		= 0;
  	m_NextReSearchWait  = 0;
  
  	// Connection vars
! 	m_HostIP	= Host;
! 	m_HostName  = Host;
  
! 	m_NetworkName = m_pCore->NetworkName;
  	
  	m_HostMode			= CLIENT_NORMAL;
! 	m_Port				= Port;
! 	m_Inbound			= false;
  	m_ConnectTime		= CTime::GetCurrentTime();
  
--- 81,96 ----
  	m_SecsDead			= 0;
  
! 	m_IntervalPing	= 0;
  	m_NextReSearchWait  = 0;
  
  	// Connection vars
! 	m_HostIP				= Host;
! 	m_HostName  		= Host;
  
! 	m_NetworkName 	= m_pCore->NetworkName;
  	
  	m_HostMode			= CLIENT_NORMAL;
! 	m_Port					= Port;
! 	m_Inbound				= false;
  	m_ConnectTime		= CTime::GetCurrentTime();
  
***************
*** 100,117 ****
  	m_DeflateSend   = false;
  	m_DeflateStreamSize = 0;
! 	m_ZipStat = 0;
  
  	InflateStream.zalloc = Z_NULL;
  	InflateStream.zfree  = Z_NULL;
  	InflateStream.opaque = Z_NULL;
  
! 	DeflateStream.zalloc   = Z_NULL;
! 	DeflateStream.zfree    = Z_NULL;
! 	DeflateStream.opaque   = Z_NULL;
  
  	// Ultrapeers
! 	m_HostUptime		= CTimeSpan(0,0,0,0);
  	m_NodeFileCount		= 0;
! 	m_NodeLeafMax		= 0;
  	
  	m_DowngradeRequest  = false;
--- 100,119 ----
  	m_DeflateSend   = false;
  	m_DeflateStreamSize = 0;
! 	m_ZipStat 			= 0;
  
  	InflateStream.zalloc = Z_NULL;
  	InflateStream.zfree  = Z_NULL;
  	InflateStream.opaque = Z_NULL;
+ 	InflateStream.state  = Z_NULL;
  
! 	DeflateStream.zalloc = Z_NULL;
! 	DeflateStream.zfree  = Z_NULL;
! 	DeflateStream.opaque = Z_NULL;
! 	DeflateStream.state  = Z_NULL;
  
  	// Ultrapeers
! 	m_HostUptime			= CTimeSpan(0,0,0,0);
  	m_NodeFileCount		= 0;
! 	m_NodeLeafMax			= 0;
  	
  	m_DowngradeRequest  = false;
***************
*** 121,138 ****
  
  	// QRP
! 	m_TableInfinity	= 0;
! 	m_TableLength	= 0;
  	
! 	m_PatchTable	= NULL;
! 	m_TableNextPos  = 0;
  	
  	m_CompressedTable = NULL;
  	m_CompressedSize  = 0;
  
! 	m_CurrentSeq	  = 1;
  
  	// Host Browsing
! 	m_BrowseID	 = 0;
! 	m_BrowseSize = 0;
  	m_BrowseBuffer	  = NULL;
  	m_BrowseBuffSize  = 0;
--- 123,140 ----
  
  	// QRP
! 	m_TableInfinity		= 0;
! 	m_TableLength			= 0;
  	
! 	m_PatchTable			= NULL;
! 	m_TableNextPos  	= 0;
  	
  	m_CompressedTable = NULL;
  	m_CompressedSize  = 0;
  
! 	m_CurrentSeq	  	= 1;
  
  	// Host Browsing
! 	m_BrowseID	 			= 0;
! 	m_BrowseSize 		= 0;
  	m_BrowseBuffer	  = NULL;
  	m_BrowseBuffSize  = 0;

Index: GnuShare.cpp
===================================================================
RCS file: /cvsroot/gnucula/Gnucula/GnuShare.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GnuShare.cpp	9 Jul 2003 06:37:44 -0000	1.12
--- GnuShare.cpp	23 Aug 2003 21:30:00 -0000	1.13
***************
*** 514,522 ****
  {
  	TRACE0("*** Search Thread Started\n");
! 	srand((unsigned)time(NULL));
  
  	CGnuShare* pShare = (CGnuShare*) pVoidShare;
  	CGnuCore*	pCore = pShare->m_pCore;
! 	CGnuControl* pComm = pCore->m_pComm;;
  	CGnuWordHash* pWordHash = pShare->m_pWordTable;
  
--- 514,522 ----
  {
  	TRACE0("*** Search Thread Started\n");
! 	srand((unsigned) time(NULL));
  
  	CGnuShare* pShare = (CGnuShare*) pVoidShare;
  	CGnuCore*	pCore = pShare->m_pCore;
! 	CGnuControl* pComm = pCore->m_pComm;
  	CGnuWordHash* pWordHash = pShare->m_pWordTable;
  
***************
*** 538,547 ****
  	// Search vars
  	QueryComp SearchQuery;
! 	byte*	QueryReplyNext		= NULL;
! 	DWORD	QueryReplyLength	= 0;
! 	UINT	TotalReplyCount		= 0;
  	byte	ReplyCount			= 0;
  	bool	QueryMatch			= false;
! 	int		MaxReplies			= 0;
  	CharString MetaTail;
  
--- 538,547 ----
  	// Search vars
  	QueryComp SearchQuery;
! 	byte*	QueryReplyNext			= NULL;
! 	DWORD	QueryReplyLength		= 0;
! 	UINT	TotalReplyCount			= 0;
  	byte	ReplyCount			= 0;
  	bool	QueryMatch			= false;
! 	int	MaxReplies			= 0;
  	CharString MetaTail;