[Planeshift-cvs] CVS: planeshift/src/server authentserver.cpp,1.43,1.44

[Matze B. <mat...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory usw-pr-cvs1:/tmp/cvs-serv8839

Modified Files:
	authentserver.cpp 
Log Message:
check for network version

Index: authentserver.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/authentserver.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** authentserver.cpp	18 Apr 2002 06:41:46 -0000	1.43
--- authentserver.cpp	21 Apr 2002 11:51:11 -0000	1.44
***************
*** 87,90 ****
--- 87,105 ----
  
      /**
+      * Is Network protokol compatible?
+      */
+     if (!msg.NetVersionOk())
+     {
+ 	CPrintf ("Authentication request rejected for %s -> incompatible network protocol version.\n", (const char*) msg.sUser);
+ 	
+ 	psAuthRejectedMessage msgb (me->clientnum, 
+ 		psAuthRejectedMessage::INCOMPPROTO);
+ 	pMsgQueue->Broadcast (msgb.msg, NetBase::BC_FINALPACKET);
+ 	psserver->RemovePlayer (me->clientnum);
+ 
+ 	return;
+     }
+ 
+     /**
       * CHECK 1: Server has loaded a map
       */
***************
*** 97,104 ****
          
          pMsgQueue->Broadcast(msgb.msg, NetBase::BC_FINALPACKET);
! 	    psserver->RemovePlayer(me->clientnum);
  
!         CPrintf("User %s/%s authentication request rejected: Server has not loaded a world map.\n",
!                 (const char *)msg.sUser,(const char *)msg.sPassword);
          
          return;
--- 112,119 ----
          
          pMsgQueue->Broadcast(msgb.msg, NetBase::BC_FINALPACKET);
! 	psserver->RemovePlayer(me->clientnum);
  
!         CPrintf("User '%s' authentication request rejected: Server has not loaded a world map.\n",
!                 (const char *)msg.sUser );
          
          return;
***************
*** 117,122 ****
          psserver->RemovePlayer(me->clientnum);
  
!         CPrintf("User %s/%s authentication request rejected: User already logged in.\n",
!                 (const char *)msg.sUser,(const char *)msg.sPassword);
          
          return;
--- 132,137 ----
          psserver->RemovePlayer(me->clientnum);
  
!         CPrintf("User '%s' authentication request rejected: User already logged in.\n",
!                 (const char *)msg.sUser);
          
          return;
***************
*** 137,142 ****
          psserver->RemovePlayer(me->clientnum);
  
!         CPrintf("User %s/%s authentication request rejected: Too many connections.\n",
!                 (const char *)msg.sUser,(const char *)msg.sPassword);
          
          return;
--- 152,157 ----
          psserver->RemovePlayer(me->clientnum);
  
!         CPrintf("User '%s' authentication request rejected: Too many connections.\n",
!                 (const char *)msg.sUser );
          
          return;
***************
*** 176,180 ****
  
      // Check if login was correct
!     CPrintf("Check Login for: %s, %s\n", (const char*)msg.sUser, (const char*)msg.sPassword);
      int id = psserver->GetDatabase()->CheckLogin(msg.sUser,msg.sPassword);
  
--- 191,195 ----
  
      // Check if login was correct
!     CPrintf("Check Login for: '%s'\n", (const char*)msg.sUser);
      int id = psserver->GetDatabase()->CheckLogin(msg.sUser,msg.sPassword);
  
***************
*** 187,192 ****
          psserver->RemovePlayer(me->clientnum);
          
!         CPrintf("User %s/%s authentication request rejected.\n",
!                 (const char *)msg.sUser,(const char *)msg.sPassword);
          return;
      }
--- 202,207 ----
          psserver->RemovePlayer(me->clientnum);
          
!         CPrintf("User '%s' authentication request rejected.\n",
!                 (const char *)msg.sUser);
          return;
      }
***************
*** 216,221 ****
      }
  
!     CPrintf("User %s/%s (%d)added to active client list\n",
!             (const char*) msg.sUser, (const char*) msg.sPassword, me->clientnum);
  
      psserver->GetDatabase()->UpdateLoginDate(cid);
--- 231,236 ----
      }
  
!     CPrintf("User '%s' (%d)added to active client list\n",
!             (const char*) msg.sUser, me->clientnum);
  
      psserver->GetDatabase()->UpdateLoginDate(cid);