[Spread-cvs] commit: r454 - trunk/daemon

[jschultz at spread.org]

Author: jschultz
Date: 2012-01-09 15:20:19 -0500 (Mon, 09 Jan 2012)
New Revision: 454

Modified:
   trunk/daemon/session.c
Log:
Made session a bit pickier about return values when accepting a client session.


Modified: trunk/daemon/session.c
===================================================================
--- trunk/daemon/session.c	2012-01-09 20:18:01 UTC (rev 453)
+++ trunk/daemon/session.c	2012-01-09 20:20:19 UTC (rev 454)
@@ -658,7 +658,7 @@
         version[0] = version[1] = version[2] = 0;
 
 	ret = recv( Sessions[MAX_SESSIONS].mbox, version, 2, 0 );
-	if( ret < 0 )
+	if( ret != 2 )
 	{
 		Alarm( SESSION, "Sess_accept_continue: reading version.subversion failed on mailbox %d\n", 
 			Sessions[MAX_SESSIONS].mbox );
@@ -668,7 +668,7 @@
         if ( version[0]*10000 + version[1]*100 + version[2] > 31400 )
         {
             ret = recv( Sessions[MAX_SESSIONS].mbox, &version[2], 1, 0 );
-            if( ret < 0 )
+            if( ret != 1 )
             {
 		Alarm( SESSION, "Sess_accept_continue: reading patch_version failed on mailbox %d\n", 
 			Sessions[MAX_SESSIONS].mbox );
@@ -691,20 +691,13 @@
         Sessions[MAX_SESSIONS].lib_version[2] = version[2];
  
 	ret = recv( Sessions[MAX_SESSIONS].mbox, conn, 2, 0 );
-	if( ret < 0 )
+	if( ret != 2 )
 	{
 		Alarm( SESSION, "Sess_accept_continue: reading private name failed on mailbox %d\n", 
 			Sessions[MAX_SESSIONS].mbox );
 		close( Sessions[MAX_SESSIONS].mbox );
 		return;
 
-	}else if( ret < 2 ){
-		response = REJECT_NO_NAME;
-		send( Sessions[MAX_SESSIONS].mbox, &response, sizeof(response), 0 );
-		Alarm( SESSION, "Sess_accept_continue: reading private name failed on mailbox %d\n",
-			Sessions[MAX_SESSIONS].mbox );
-		close( Sessions[MAX_SESSIONS].mbox );
-		return;
 	}
 
         if( ((int)conn[0] % 2) ==  1 ) Sessions[MAX_SESSIONS].status = Set_memb_session( Sessions[MAX_SESSIONS].status );