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=1cc595822952b69744a75246dbb1381eff2225a0;hp=48e2173a9490fd9d0d732e02e0ddc8f682b975a5;hb=51dabeafaa1dfab6bde2043ee2e5024f14f72780;hpb=69f683070aec8a8f0773027adee5d4dca202bbb8 diff --git a/src/ngircd/irc-login.c b/src/ngircd/irc-login.c index 48e2173a..1cc59582 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.9 2002/03/19 16:38:37 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 */ @@ -24,21 +24,27 @@ #include #include "ngircd.h" +#include "resolve.h" #include "conf.h" -#include "irc.h" -#include "irc-write.h" +#include "conn.h" +#include "client.h" +#include "channel.h" #include "log.h" #include "messages.h" +#include "parse.h" +#include "irc.h" +#include "irc-write.h" #include "exp.h" #include "irc-login.h" -LOCAL BOOLEAN Hello_User( CLIENT *Client ); -LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason ); +LOCAL BOOLEAN Hello_User PARAMS(( CLIENT *Client )); +LOCAL VOID Kill_Nick PARAMS(( CHAR *Nick, CHAR *Reason )); -GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_PASS( CLIENT *Client, REQUEST *Req ) { assert( Client != NULL ); assert( Req != NULL ); @@ -59,13 +65,63 @@ GLOBAL BOOLEAN 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 c2, c4, *type, *impl, *serverver, *flags, *ptr; + INT protohigh, protolow; + /* noch nicht registrierte Server-Verbindung */ Log( LOG_DEBUG, "Connection %d: got PASS command (new server link) ...", Client_Conn( Client )); /* Passwort speichern */ Client_SetPassword( Client, Req->argv[0] ); + /* 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( type && ( strcmp( type, PROTOIRCPLUS ) == 0 )) + { + /* auf der anderen Seite laeuft ein Server, der + * ebenfalls das IRC+-Protokoll versteht */ + serverver = ptr + 1; + flags = strchr( serverver, ':' ); + if( flags ) + { + *flags = '\0'; + flags++; + } + else flags = ""; + 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 \"%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 )) @@ -77,7 +133,8 @@ GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req ) } /* IRC_PASS */ -GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_NICK( CLIENT *Client, REQUEST *Req ) { CLIENT *intr_c, *target, *c; CHAR *modes; @@ -100,7 +157,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) /* "Ziel-Client" ermitteln */ if( Client_Type( Client ) == CLIENT_SERVER ) { - target = Client_GetFromID( Req->prefix ); + target = Client_Search( Req->prefix ); if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); } else @@ -116,7 +173,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */ if( strcmp( Client_ID( target ), Req->argv[0] ) == 0 ) return CONNECTED; #endif - + /* pruefen, ob Nick bereits vergeben. Speziallfall: der Client * will nur die Gross- und Kleinschreibung aendern. Das darf * er natuerlich machen :-) */ @@ -140,8 +197,16 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) else { /* Nick-Aenderung */ - if( Client_Conn( target ) > NONE ) Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0], Client_Conn( target )); - else Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] ); + if( Client_Conn( target ) > NONE ) + { + /* lokaler Client */ + Log( LOG_INFO, "User \"%s\" changed nick (connection %d): \"%s\" -> \"%s\".", Client_Mask( target ), Client_Conn( target ), Client_ID( target ), Req->argv[0] ); + } + else + { + /* Remote-Client */ + Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] ); + } /* alle betroffenen User und Server ueber Nick-Aenderung informieren */ if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] ); @@ -162,7 +227,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); /* Nick ueberpruefen */ - c = Client_GetFromID( Req->argv[0] ); + c = Client_Search( Req->argv[0] ); if( c ) { /* Der neue Nick ist auf diesem Server bereits registriert: @@ -207,7 +272,8 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) } /* IRC_NICK */ -GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_USER( CLIENT *Client, REQUEST *Req ) { assert( Client != NULL ); assert( Req != NULL ); @@ -237,26 +303,15 @@ GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req ) } /* IRC_USER */ -GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_QUIT( CLIENT *Client, REQUEST *Req ) { CLIENT *target; assert( Client != NULL ); assert( Req != NULL ); - if(( Client_Type( Client ) == CLIENT_USER ) || ( Client_Type( Client ) == CLIENT_SERVICE )) - { - /* User / Service */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE ); - else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE ); - - return DISCONNECTED; - } - else if ( Client_Type( Client ) == CLIENT_SERVER ) + if ( Client_Type( Client ) == CLIENT_SERVER ) { /* Server */ @@ -276,11 +331,23 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req ) return CONNECTED; } - else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + else + { + /* User, Service, oder noch nicht registriert */ + + /* Falsche Anzahl Parameter? */ + if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + if( Req->argc == 0 ) Conn_Close( Client_Conn( Client ), "Got QUIT command.", NULL, TRUE ); + else Conn_Close( Client_Conn( Client ), "Got QUIT command.", Req->argv[0], TRUE ); + + return DISCONNECTED; + } } /* IRC_QUIT */ -GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_PING( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from; @@ -298,12 +365,12 @@ GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req ) if( Req->argc > 1 ) { /* es wurde ein Ziel-Client angegeben */ - target = Client_GetFromID( Req->argv[1] ); + target = Client_Search( Req->argv[1] ); if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); if( target != Client_ThisServer( )) { /* ok, forwarden */ - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix ); + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); else from = Client; if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); return IRC_WriteStrClientPrefix( target, from, "PING %s :%s", Client_ID( from ), Req->argv[1] ); @@ -315,7 +382,8 @@ GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req ) } /* IRC_PING */ -GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_PONG( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from; @@ -331,12 +399,12 @@ GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req ) /* forwarden? */ if( Req->argc == 2 ) { - target = Client_GetFromID( Req->argv[1] ); + target = Client_Search( Req->argv[1] ); if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); if( target != Client_ThisServer( )) { /* ok, forwarden */ - if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix ); + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); else from = Client; if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); return IRC_WriteStrClientPrefix( target, from, "PONG %s :%s", Client_ID( from ), Req->argv[1] ); @@ -344,7 +412,7 @@ GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req ) } /* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket - * aktualisiert, daher muss das hier nicht mehr gemacht werden. */ + * aktualisiert, daher muss das hier nicht mehr gemacht werden. */ if( Client_Conn( Client ) > NONE ) Log( LOG_DEBUG, "Connection %d: received PONG. Lag: %ld seconds.", Client_Conn( Client ), time( NULL ) - Conn_LastPing( Client_Conn( Client ))); else Log( LOG_DEBUG, "Connection %d: received PONG.", Client_Conn( Client )); @@ -353,7 +421,8 @@ GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req ) } /* IRC_PONG */ -LOCAL BOOLEAN Hello_User( CLIENT *Client ) +LOCAL BOOLEAN +Hello_User( CLIENT *Client ) { assert( Client != NULL ); @@ -372,9 +441,9 @@ LOCAL BOOLEAN Hello_User( CLIENT *Client ) IRC_WriteStrServers( NULL, "NICK %s 1 %s %s 1 +%s :%s", Client_ID( Client ), Client_User( Client ), Client_Hostname( Client ), Client_Modes( Client ), Client_Info( Client )); if( ! IRC_WriteStrClient( Client, RPL_WELCOME_MSG, Client_ID( Client ), Client_Mask( Client ))) return FALSE; - if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return FALSE; + if( ! IRC_WriteStrClient( Client, RPL_YOURHOST_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, TARGET_CPU, TARGET_CPU, TARGET_OS )) return FALSE; if( ! IRC_WriteStrClient( Client, RPL_CREATED_MSG, Client_ID( Client ), NGIRCd_StartStr )) return FALSE; - if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )))) return FALSE; + if( ! IRC_WriteStrClient( Client, RPL_MYINFO_MSG, Client_ID( Client ), Client_ID( Client_ThisServer( )), VERSION, USERMODES, CHANMODES )) return FALSE; Client_SetType( Client, CLIENT_USER ); @@ -385,7 +454,8 @@ LOCAL BOOLEAN Hello_User( CLIENT *Client ) } /* Hello_User */ -LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason ) +LOCAL VOID +Kill_Nick( CHAR *Nick, CHAR *Reason ) { CLIENT *c; @@ -398,7 +468,7 @@ LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason ) IRC_WriteStrServers( NULL, "KILL %s :%s", Nick, Reason ); /* Ggf. einen eigenen Client toeten */ - c = Client_GetFromID( Nick ); + c = Client_Search( Nick ); if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Reason, TRUE ); } /* Kill_Nick */