client.h | 7 +- irc-login.c | 169 ++++++++++++++++++++++++++++++++--------------------------- irc-server.c | 22 +++++-- 3 files changed, 112 insertions(+), 86 deletions(-) Index: src/ngircd/client.h =================================================================== RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/client.h,v retrieving revision 1.42 diff -u -p -r1.42 client.h --- src/ngircd/client.h 23 Apr 2006 10:37:27 -0000 1.42 +++ src/ngircd/client.h 29 Sep 2006 22:03:07 -0000 @@ -23,10 +23,9 @@ #define CLIENT_GOTNICK 4 /* client did send NICK */ #define CLIENT_GOTUSER 8 /* client did send USER */ #define CLIENT_USER 16 /* client is an IRC user */ -#define CLIENT_UNKNOWNSERVER 32 /* unregistered server connection */ -#define CLIENT_GOTPASSSERVER 64 /* client did send PASS in "server style" */ -#define CLIENT_SERVER 128 /* client is a server */ -#define CLIENT_SERVICE 256 /* client is a service */ +#define CLIENT_SERVER 32 /* client is a server */ +#define CLIENT_SERVICE 64 /* client is a service */ +#define CLIENT_UNKNOWNSERVER 128 /* unregistered server connection */ #define CLIENT_TYPE int Index: src/ngircd/irc-login.c =================================================================== RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/irc-login.c,v retrieving revision 1.50 diff -u -p -r1.50 irc-login.c --- src/ngircd/irc-login.c 12 Aug 2006 11:56:24 -0000 1.50 +++ src/ngircd/irc-login.c 29 Sep 2006 22:03:07 -0000 @@ -45,101 +45,120 @@ static bool Hello_User PARAMS(( CLIENT * static void Kill_Nick PARAMS(( char *Nick, char *Reason )); +/** + * Handler for the IRC command "PASS". + * See RFC 2813 section 4.1.1, and RFC 2812 section 3.1.1. + */ GLOBAL bool IRC_PASS( CLIENT *Client, REQUEST *Req ) { + char *type, *orig_flags; + int protohigh, protolow; + assert( Client != NULL ); assert( Req != NULL ); - /* Fehler liefern, wenn kein lokaler Client */ - if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command ); + /* Return an error if this is not a local client */ + if (Client_Conn(Client) <= NONE) + return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG, + Client_ID(Client), Req->command); - if(( Client_Type( Client ) == CLIENT_UNKNOWN ) && ( Req->argc == 1)) - { - /* noch nicht registrierte unbekannte Verbindung */ - Log( LOG_DEBUG, "Connection %d: got PASS command ...", Client_Conn( Client )); - - /* Passwort speichern */ - Client_SetPassword( Client, Req->argv[0] ); - - Client_SetType( Client, CLIENT_GOTPASS ); - return CONNECTED; + if (Client_Type(Client) == CLIENT_UNKNOWN && Req->argc == 1) { + /* Not yet registered "unknown" connection, PASS with one + * argument: either a regular client, service, or server + * using the old RFC 1459 section 4.1.1 syntax. */ + LogDebug("Connection %d: got PASS command ...", + Client_Conn(Client)); + } else if ((Client_Type(Client) == CLIENT_UNKNOWN || + Client_Type(Client) == CLIENT_UNKNOWNSERVER) && + (Req->argc == 3 || Req->argc == 4)) { + /* Not yet registered "unknown" connection or outgoing server + * link, PASS with three or four argument: server using the + * RFC 2813 section 4.1.1 syntax. */ + LogDebug("Connection %d: got PASS command (new server link) ...", + Client_Conn(Client)); + } else if (Client_Type(Client) == CLIENT_UNKNOWN || + Client_Type(Client) == CLIENT_UNKNOWNSERVER) { + /* Unregistered connection, but wrong number of arguments: */ + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); + } else { + /* Registered connection, PASS command is not allowed! */ + return IRC_WriteStrClient(Client, ERR_ALREADYREGISTRED_MSG, + Client_ID(Client)); } - else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 ))) - { - char c2, c4, *type, *impl, *serverver, *flags, *ptr, *ircflags; - int protohigh, protolow; - /* noch nicht registrierte Server-Verbindung */ - Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client )); + Client_SetPassword(Client, Req->argv[0]); + Client_SetType(Client, CLIENT_GOTPASS); - /* Passwort speichern */ - Client_SetPassword( Client, Req->argv[0] ); + /* Protocol version */ + if (Req->argc >= 2 && strlen(Req->argv[1]) >= 4) { + int c2, c4; + + 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; - /* Protokollversion ermitteln */ - if( strlen( Req->argv[1] ) >= 4 ) - { - c2 = Req->argv[1][2]; - c4 = Req->argv[1][4]; + /* Protocol type, see doc/Protocol.txt */ + if (Req->argc >= 2 && strlen(Req->argv[1]) > 4) + type = &Req->argv[1][4]; + else + type = NULL; + + /* Protocol flags/options */ + if (Req->argc >= 4) + orig_flags = Req->argv[3]; + else + orig_flags = ""; - 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; - - /* IRC-Flags (nach RFC 2813) */ - if( Req->argc >= 4 ) ircflags = Req->argv[3]; - else ircflags = ""; + /* Implementation, version and IRC+ flags */ + if (Req->argc >= 3) { + char *impl, *ptr, *serverver, *flags; + int _unused_var; - /* Implementation, Version und ngIRCd-Flags */ impl = Req->argv[2]; - ptr = strchr( impl, '|' ); - if( ptr ) *ptr = '\0'; - - if( type && ( strcmp( type, PROTOIRCPLUS ) == 0 )) - { - /* auf der anderen Seite laeuft ein Server, der - * ebenfalls das IRC+-Protokoll versteht */ + ptr = strchr(impl, '|'); + if (ptr) + *ptr = '\0'; + + if (type && strcmp(type, PROTOIRCPLUS) == 0) { + /* The peer seems to be a server which supports the + * IRC+ protocol (see doc/Protocol.txt). */ serverver = ptr + 1; - flags = strchr( serverver, ':' ); - if( flags ) - { + flags = strchr(serverver, ':'); + if (flags) { *flags = '\0'; flags++; - } - else flags = ""; - Log( LOG_INFO, "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", impl, serverver, protohigh, protolow, flags ); - } - else - { - /* auf der anderen Seite laeuft ein Server, der - * nur das Originalprotokoll unterstuetzt */ + } else + flags = ""; + Log(LOG_INFO, + "Peer announces itself as %s-%s using protocol %d.%d/IRC+ (flags: \"%s\").", + impl, serverver, protohigh, protolow, flags); + } else { + /* The peer seems to be a server supporting the + * "original" IRC protocol (RFC 2813). */ serverver = ""; - if( strchr( ircflags, 'Z' )) flags = "Z"; - else flags = ""; - Log( LOG_INFO, "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", impl, protohigh, protolow, flags ); + if (strchr(orig_flags, 'Z')) + flags = "Z"; + else + flags = ""; + Log(LOG_INFO, + "Peer announces itself as \"%s\" using protocol %d.%d (flags: \"%s\").", + impl, protohigh, protolow, flags); } - - Client_SetType( Client, CLIENT_GOTPASSSERVER ); - Client_SetFlags( Client, flags ); - - return CONNECTED; + Client_SetFlags(Client, flags); } - else if(( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) - { - /* Falsche Anzahl Parameter? */ - return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - } - else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client )); + + return CONNECTED; } /* IRC_PASS */ Index: src/ngircd/irc-server.c =================================================================== RCS file: /srv/cvs/ngircd/ngircd/src/ngircd/irc-server.c,v retrieving revision 1.39 diff -u -p -r1.39 irc-server.c --- src/ngircd/irc-server.c 30 Apr 2006 21:31:43 -0000 1.39 +++ src/ngircd/irc-server.c 29 Sep 2006 22:03:07 -0000 @@ -41,6 +41,10 @@ static char UNUSED id[] = "$Id: irc-serv #include "irc-server.h" +/** + * Handler for the IRC command "SERVER". + * See RFC 2813 section 4.1.2. + */ GLOBAL bool IRC_SERVER( CLIENT *Client, REQUEST *Req ) { @@ -55,13 +59,17 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req assert( Client != NULL ); assert( Req != NULL ); - /* Fehler liefern, wenn kein lokaler Client */ - if( Client_Conn( Client ) <= NONE ) return IRC_WriteStrClient( Client, ERR_UNKNOWNCOMMAND_MSG, Client_ID( Client ), Req->command ); - - if( Client_Type( Client ) == CLIENT_GOTPASSSERVER ) - { - /* Verbindung soll als Server-Server-Verbindung registriert werden */ - Log( LOG_DEBUG, "Connection %d: got SERVER command (new server link) ...", Client_Conn( Client )); + /* Return an error if this is not a local client */ + if (Client_Conn(Client) <= NONE) + return IRC_WriteStrClient(Client, ERR_UNKNOWNCOMMAND_MSG, + Client_ID(Client), Req->command); + + if (Client_Type(Client) == CLIENT_GOTPASS) { + /* We got a PASS command from the peer, and now a SERVER + * command: the peer tries to register itself as a server. */ + Log(LOG_DEBUG, + "Connection %d: got SERVER command (new server link) ...", + Client_Conn(Client)); /* Falsche Anzahl Parameter? */ if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );