X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=7ce6ee2740cd6c2cfc158a110375344dbb085450;hp=60e4d87b62d7668695196e28d8ddf804b1924110;hb=c2ee5437da3483aacf2ab254370b9594776de7ad;hpb=8b162c0ecd2b97f54a564b20a251fb2ac5d488ec diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 60e4d87b..7ce6ee27 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -9,11 +9,34 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc.c,v 1.30 2002/01/06 15:21:29 alex Exp $ + * $Id: irc.c,v 1.36 2002/01/11 23:50:55 alex Exp $ * * irc.c: IRC-Befehle * * $Log: irc.c,v $ + * Revision 1.36 2002/01/11 23:50:55 alex + * - LINKS implementiert, LUSERS begonnen. + * + * Revision 1.35 2002/01/09 21:30:45 alex + * - WHOIS wurde faelschlicherweise an User geforwarded statt vom Server beantwortet. + * + * Revision 1.34 2002/01/09 01:09:58 alex + * - WHOIS wird im "Strict-RFC-Mode" nicht mehr automatisch geforwarded, + * - andere Server werden nun ueber bisherige Server und User informiert. + * + * Revision 1.33 2002/01/07 23:42:12 alex + * - Es werden fuer alle Server eigene Token generiert, + * - QUIT von einem Server fuer einen User wird an andere Server geforwarded, + * - ebenso NICK-Befehle, die "fremde" User einfuehren. + * + * Revision 1.32 2002/01/07 16:02:36 alex + * - Loglevel von Remote-Mode-Aenderungen angepasst (nun Debug). + * - Im Debug-Mode werden nun auch PING's protokolliert. + * + * Revision 1.31 2002/01/07 15:39:46 alex + * - Server nimmt nun Server-Links an: PASS und SERVER entsprechend angepasst. + * - MODE und NICK melden nun die Aenderungen an andere Server. + * * Revision 1.30 2002/01/06 15:21:29 alex * - Loglevel und Meldungen nochmals ueberarbeitet. * - QUIT und SQUIT forwarden nun den Grund der Trennung, @@ -308,6 +331,7 @@ GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) { CHAR str[LINE_LEN], *ptr; + BOOLEAN ok; CLIENT *c; INT i; @@ -323,7 +347,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) Log( LOG_DEBUG, "Connection %d: got SERVER command (new server link) ...", Client_Conn( Client )); /* Falsche Anzahl Parameter? */ - if( Req->argc != 3 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); /* Ist dieser Server bei uns konfiguriert? */ for( i = 0; i < Conf_Server_Count; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break; @@ -347,13 +371,62 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) /* Server-Strukturen fuellen ;-) */ Client_SetID( Client, Req->argv[0] ); - Client_SetToken( Client, atoi( Req->argv[1] )); - Client_SetInfo( Client, Req->argv[2] ); Client_SetHops( Client, 1 ); + Client_SetInfo( Client, Req->argv[Req->argc - 1] ); + + /* Meldet sich der Server bei uns an? */ + if( Req->argc == 2 ) + { + /* Unseren SERVER- und PASS-Befehl senden */ + ok = TRUE; + if( ! IRC_WriteStrClient( Client, "PASS %s "PASSSERVERADD, Conf_Server[i].pwd )) ok = FALSE; + else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo ); + if( ! ok ) + { + Conn_Close( Client_Conn( Client ), "Unexpected server behavior!", NULL, FALSE ); + return DISCONNECTED; + } + Client_SetIntroducer( Client, Client ); + Client_SetToken( Client, 1 ); + } + else Client_SetToken( Client, atoi( Req->argv[1] )); Log( LOG_NOTICE, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client )); Client_SetType( Client, CLIENT_SERVER ); + + /* Alle bisherigen Server dem neuen Server bekannt machen, + * die bisherigen Server ueber den neuen informierenn */ + c = Client_First( ); + while( c ) + { + if(( Client_Type( c ) == CLIENT_SERVER ) && ( c != Client ) && ( c != Client_ThisServer( ))) + { + if( Client_Conn( c ) > NONE ) + { + /* Dem gefundenen Server gleich den neuen + * Server bekannt machen */ + if( ! IRC_WriteStrClient( c, "SERVER %s %d %d :%s", Client_ID( Client ), Client_Hops( Client ) + 1, Client_MyToken( Client ), Client_Info( Client ))) return DISCONNECTED; + } + + /* Den neuen Server ueber den alten informieren */ + if( ! IRC_WriteStrClientPrefix( Client, Client_Introducer( c ), "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c ))) return DISCONNECTED; + } + c = Client_Next( c ); + } + + /* alle User dem neuen Server bekannt machen */ + c = Client_First( ); + while( c ) + { + if( Client_Type( c ) == CLIENT_USER ) + { + /* User an neuen Server melden */ + if( ! IRC_WriteStrClient( Client, "NICK %s %d %s %s %d +%s :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_User( c ), Client_Hostname( c ), Client_MyToken( Client_Introducer( c )), Client_Modes( c ), Client_Info( c ))) return DISCONNECTED; + } + c = Client_Next( c ); + } + return CONNECTED; } else if( Client_Type( Client ) == CLIENT_SERVER ) @@ -404,16 +477,16 @@ GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) { - CLIENT *intr_c, *c; + CLIENT *intr_c, *target, *c; assert( Client != NULL ); assert( Req != NULL ); /* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */ #ifndef STRICT_RFC - if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER ) + if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTUSER || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) #else - if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER ) + if( Client_Type( Client ) == CLIENT_UNKNOWN || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_USER || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) #endif { /* User-Registrierung bzw. Nick-Aenderung */ @@ -421,35 +494,52 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) /* Falsche Anzahl Parameter? */ if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - /* Ist der Client "restricted"? */ - if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client )); + /* "Ziel-Client" ermitteln */ + if( Client_Type( Client ) == CLIENT_SERVER ) + { + target = Client_GetFromID( Req->prefix ); + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); + } + else + { + /* Ist der Client "restricted"? */ + if( Client_HasMode( Client, 'r' )) return IRC_WriteStrClient( Client, ERR_RESTRICTED_MSG, Client_ID( Client )); + target = Client; + } /* Wenn der Client zu seinem eigenen Nick wechseln will, so machen * wir nichts. So macht es das Original und mind. Snak hat probleme, * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */ #ifndef STRICT_RFC - if( strcmp( Client_ID( Client ), Req->argv[0] ) == 0 ) return CONNECTED; + 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 :-) */ - if( strcasecmp( Client_ID( Client ), Req->argv[0] ) != 0 ) + if( strcasecmp( Client_ID( target ), Req->argv[0] ) != 0 ) { - if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED; + if( ! Client_CheckNick( target, Req->argv[0] )) return CONNECTED; } if( Client_Type( Client ) == CLIENT_USER ) { /* Nick-Aenderung: allen mitteilen! */ - Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( Client ), Client_ID( Client ), Req->argv[0] ); + Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] ); IRC_WriteStrRelated( Client, "NICK :%s", Req->argv[0] ); + IRC_WriteStrServersPrefix( NULL, Client, "NICK :%s", Req->argv[0] ); } - + else if( Client_Type( Client ) == CLIENT_SERVER ) + { + /* Nick-Aenderung: allen mitteilen! */ + Log( LOG_DEBUG, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] ); + IRC_WriteStrServersPrefix( Client, Client, "NICK :%s", Req->argv[0] ); + } + /* Client-Nick registrieren */ - Client_SetID( Client, Req->argv[0] ); + Client_SetID( target, Req->argv[0] ); - if( Client_Type( Client ) != CLIENT_USER ) + if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER )) { /* Neuer Client */ Log( LOG_DEBUG, "Connection %d: got NICK command ...", Client_Conn( Client )); @@ -472,7 +562,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) /* Der neue Nick ist auf diesem Server bereits registriert: * sowohl der neue, als auch der alte Client muessen nun * disconnectiert werden. */ - Log( LOG_ERR, "Server %s introduces already registered nick %s!", Client_ID( Client ), Req->argv[0] ); + Log( LOG_ERR, "Server %s introduces already registered nick \"%s\"!", Client_ID( Client ), Req->argv[0] ); Kill_Nick( Req->argv[0] ); return CONNECTED; } @@ -481,7 +571,7 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) intr_c = Client_GetFromToken( Client, atoi( Req->argv[4] )); if( ! intr_c ) { - Log( LOG_ERR, "Server %s introduces nick %s with unknown host server!?", Client_ID( Client ), Req->argv[0] ); + Log( LOG_ERR, "Server %s introduces nick \"%s\" on unknown server!?", Client_ID( Client ), Req->argv[0] ); Kill_Nick( Req->argv[0] ); return CONNECTED; } @@ -498,7 +588,10 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) return CONNECTED; } - Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_ID( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); + Log( LOG_DEBUG, "User \"%s\" registered (via %s, on %s, %d hop%s).", Client_Mask( c ), Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); + + /* Andere Server, ausser dem Introducer, informieren */ + IRC_WriteStrServersPrefix( Client, Client, "NICK %s %d %s %s %d %s :%s", Req->argv[0], atoi( Req->argv[1] ) + 1, Req->argv[2], Req->argv[3], Client_MyToken( intr_c ), Req->argv[5], Req->argv[6] ); return CONNECTED; } @@ -565,7 +658,7 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req ) target = Client_Search( Req->prefix ); if( ! target ) { - Log( LOG_ERR, "Got QUIT from %s for unknown server!?", Client_ID( Client )); + Log( LOG_ERR, "Got QUIT from %s for unknown client!?", Client_ID( Client )); return CONNECTED; } @@ -601,8 +694,8 @@ GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req ) if( target == Client ) Log( LOG_DEBUG, "Got SQUIT from %s: %s", Client_ID( Client ), Req->argv[1] ); else Log( LOG_DEBUG, "Got SQUIT from %s for %s: %s", Client_ID( Client ), Client_ID( target ), Req->argv[1] ); - /* FIXME: das SQUIT muss an alle Server weiter- - * geleitet werden ... */ + /* SQUIT an alle Server weiterleiten */ + IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] ); if( Client_Conn( target ) > NONE ) { @@ -629,6 +722,7 @@ GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req ) if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client )); if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + Log( LOG_DEBUG, "Connection %d: got PING, sending PONG ...", Client_Conn( Client )); return IRC_WriteStrClient( Client, "PONG %s :%s", Client_ID( Client_ThisServer( )), Client_ID( Client )); } /* IRC_PING */ @@ -682,7 +776,8 @@ GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix ); else from = Client; - + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + to = Client_Search( Req->argv[0] ); if( to ) { @@ -708,6 +803,7 @@ GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req ) if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix ); else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); to = Client_Search( Req->argv[0] ); if( to ) @@ -824,12 +920,13 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) if( Client_Type( Client ) == CLIENT_SERVER ) { /* Modes an andere Server forwarden */ - /* FIXME */ + IRC_WriteStrServersPrefix( Client, Client, "MODE %s :%s", Client_ID( target ), new_modes ); } else { - /* Bestaetigung an Client schicken */ + /* Bestaetigung an Client schicken & andere Server informieren */ ok = IRC_WriteStrRelated( Client, "MODE %s :%s", Client_ID( target ), new_modes ); + IRC_WriteStrServers( Client, "MODE %s :%s", Client_ID( target ), new_modes ); } Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( target ), Client_Modes( target )); } @@ -872,6 +969,7 @@ GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req ) /* noch kein o-Mode gesetzt */ Client_ModeAdd( Client, 'o' ); if( ! IRC_WriteStrRelated( Client, "MODE %s :+o", Client_ID( Client ))) return DISCONNECTED; + IRC_WriteStrServersPrefix( NULL, Client, "MODE %s :+o", Client_ID( Client )); } if( ! Client_OperByMe( Client )) Log( LOG_NOTICE, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client )); @@ -1030,15 +1128,17 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] ); ptr = Req->argv[1]; } +#ifndef STRICT_RFC else if( Client_Conn( c ) == NONE ) { /* Client ist nicht von uns. Ziel-Server suchen */ target = c; ptr = Req->argv[0]; } +#endif else target = NULL; - if( target && ( Client_NextHop( target ) != Client_ThisServer( ))) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], ptr ); + if( target && ( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], ptr ); /* Nick, User und Name */ if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED; @@ -1116,6 +1216,69 @@ GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req ) } /* IRC_ERROR */ +GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req ) +{ + assert( Client != NULL ); + assert( Req != NULL ); + + if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + + /* Falsche Anzahl Parameter? */ + if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + return CONNECTED; +} /* IRC_LUSERS */ + + +GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req ) +{ + CLIENT *target, *from, *c; + CHAR *mask; + + assert( Client != NULL ); + assert( Req != NULL ); + + if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); + + /* Falsche Anzahl Parameter? */ + if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + /* Server-Mask ermitteln */ + if( Req->argc > 0 ) mask = Req->argv[Req->argc - 1]; + else mask = "*"; + + /* Absender ermitteln */ + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix ); + else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + /* An anderen Server forwarden? */ + if( Req->argc == 2 ) + { + target = Client_GetFromID( Req->argv[0] ); + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); + else if( target != Client_ThisServer( )) return IRC_WriteStrClientPrefix( target, from, "LINKS %s %s", Req->argv[0], Req->argv[1] ); + } + + /* Wer ist der Absender? */ + if( Client_Type( Client ) == CLIENT_SERVER ) target = Client_GetFromID( Req->prefix ); + else target = Client; + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + c = Client_First( ); + while( c ) + { + if( Client_Type( c ) == CLIENT_SERVER ) + { + if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; + } + c = Client_Next( c ); + } + + return IRC_WriteStrClient( target, RPL_ENDOFLINKS_MSG, Client_ID( target ), mask ); +} /* IRC_LINKS */ + + LOCAL BOOLEAN Hello_User( CLIENT *Client ) { assert( Client != NULL );