X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-login.c;h=dcfa2d7254373a01c7c3f4b5651f7841488a44aa;hp=37a6b65810808a7d4d09c2929413024f6c396014;hb=ad1cbe34b4213214dfa5f68ccec9d5264b5c91a0;hpb=c67bb2ac9f40f380ba1973d08ef188c40a8d0cbd

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index 37a6b658..dcfa2d72 100644
--- a/src/ngircd/irc-login.c
+++ b/src/ngircd/irc-login.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-login.c,v 1.16 2002/09/02 19:04:30 alex Exp $
+ * $Id: irc-login.c,v 1.19 2002/09/03 20:39:54 alex Exp $
  *
  * irc-login.c: Anmeldung und Abmeldung im IRC
  */
@@ -65,7 +65,7 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 	}
 	else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 )))
 	{
-		CHAR *impl, *serverver, *flags, *ptr;
+		CHAR c, *type, *impl, *serverver, *flags, *ptr;
 		INT protohigh, protolow;
 
 		/* noch nicht registrierte Server-Verbindung */
@@ -74,24 +74,33 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 		/* Passwort speichern */
 		Client_SetPassword( Client, Req->argv[0] );
 
-		/* Protokollversion ueberpruefen */
-		if( strlen( Req->argv[1] ) > 4 ) Req->argv[1][4] = '\0';
-		if( strlen( Req->argv[1] ) != 4 ) protohigh = protolow = 0;
-		else
+		/* Protokollversion ermitteln */
+		if( strlen( Req->argv[1] ) >= 4 )
 		{
+			c = Req->argv[1][4];
+			Req->argv[1][4] = '\0';
+			
 			protolow = atoi( &Req->argv[1][2] );
 			Req->argv[1][2] = '\0';
 			protohigh = atoi( Req->argv[1] );
-		}
+			
+			Req->argv[1][4] = c;
+		}			
+		else protohigh = protolow = 0;
+
+		/* Protokoll-Typ */
+		if( strlen( Req->argv[1] ) > 4 ) type = &Req->argv[1][4];
+		else type = NULL;
 
 		/* Implementation, Version und ngIRCd-Flags */
 		impl = Req->argv[2];
 		ptr = strchr( impl, '|' );
 		if( ptr ) *ptr = '\0';
 
-		if( strcmp( impl, PACKAGE ) == 0 )
+		if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 ))
 		{
-			/* auf der anderen Seite laeuft auch ein ngIRCd */
+			/* auf der anderen Seite laeuft ein Server, der
+			 * ebenfalls das IRC+-Protokoll versteht */
 			serverver = ptr + 1;
 			flags = strchr( serverver, ':' );
 			if( flags )
@@ -100,15 +109,17 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
 				flags++;
 			}
 			else flags = "";
-			Log( LOG_INFO, "Other server is \"%s\" %s (flags: \"%s\"), using protocol version %d.%d.", impl, serverver, flags, protohigh, protolow );
+			Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s (flags: \"%s\") using protocol version %d.%d+.", Client_Conn( Client ), impl, serverver, flags, protohigh, protolow );
 		}
 		else
 		{
 			serverver = flags = "";
-			Log( LOG_INFO, "Other server is \"%s\" using protocol version %d.%d.", impl, protohigh, protolow );
+			Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol version %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
 		}
 
 		Client_SetType( Client, CLIENT_GOTPASSSERVER );
+		Client_SetFlags( Client, flags );
+
 		return CONNECTED;
 	}
 	else if(( Client_Type( Client ) == CLIENT_UNKNOWN  ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER ))