- Server-Versionsausgabe ueberarbeitet.

[ngircd-alex.git] / src / ngircd / irc-login.c

diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c
index c2d232cf75cef7deac9226ad279f1aa450395dcd..1cc595822952b69744a75246dbb1381eff2225a0 100644 (file)
--- 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.17 2002/09/02 19:31:26 alex Exp $
+ * $Id: irc-login.c,v 1.21 2002/09/09 03:34:33 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 c2, c4, *type, *impl, *serverver, *flags, *ptr;
                INT protohigh, protolow;
 
                /* noch nicht registrierte Server-Verbindung */
@@ -74,24 +74,35 @@ 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 )
                {
+                       c2 = Req->argv[1][2];
+                       c4 = 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][2] = c2;
+                       Req->argv[1][4] = c4;
+               }                       
+               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 +111,17 @@ IRC_PASS( CLIENT *Client, REQUEST *Req )
                                flags++;
                        }
                        else flags = "";
-                       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 );
+                       Log( LOG_INFO, "Connection %d: Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", Client_Conn( Client ), impl, serverver, protohigh, protolow, flags );
                }
                else
                {
                        serverver = flags = "";
-                       Log( LOG_INFO, "Connection %d: Peer announces itself as server of type \"%s\" usinf protocol version %d.%d.", Client_Conn( Client ), impl, protohigh, protolow );
+                       Log( LOG_INFO, "Connection %d: Peer announces itself as \"%s\" using protocol %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 ))