X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=99e31050dc4ed55e9b05ac83ab8f1703908ca20e;hp=f5b01d90db2969937f58da0bf8a148e251eb6fcd;hb=2ee05c9a6856d78f996dfbc991452e4cc1c58c37;hpb=00f86465ef0d751a14997559331638efce2747e4 diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index f5b01d90..99e31050 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -9,750 +9,82 @@ * 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.38 2002/01/18 15:31:32 alex Exp $ + * $Id: irc.c,v 1.84 2002/03/03 17:15:11 alex Exp $ * * irc.c: IRC-Befehle * * $Log: irc.c,v $ - * Revision 1.38 2002/01/18 15:31:32 alex - * - die User-Modes bei einem NICK von einem Server wurden falsch uebernommen. + * Revision 1.84 2002/03/03 17:15:11 alex + * - Source in weitere Module fuer IRC-Befehle aufgesplitted. * - * Revision 1.37 2002/01/16 22:10:18 alex - * - IRC_LUSERS() implementiert. + * Revision 1.83 2002/02/28 00:48:26 alex + * - Forwarding von TOPIC an andere Server gefixed. Hoffentlich ;-) * - * Revision 1.36 2002/01/11 23:50:55 alex - * - LINKS implementiert, LUSERS begonnen. + * Revision 1.82 2002/02/27 23:26:36 alex + * - einige Funktionen in irc-xxx-Module ausgegliedert. * - * Revision 1.35 2002/01/09 21:30:45 alex - * - WHOIS wurde faelschlicherweise an User geforwarded statt vom Server beantwortet. + * Revision 1.81 2002/02/27 20:55:44 alex + * - Channel-Topics werden nun auch korrekt von anderen Server angenommen. * - * 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.80 2002/02/27 20:33:13 alex + * - Channel-Topics implementiert. * - * 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.79 2002/02/27 18:57:21 alex + * - PRIVMSG zeugt nun bei Texten an User an, wenn diese "away" sind. * - * 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.78 2002/02/27 18:23:45 alex + * - IRC-Befehl "AWAY" implementert. * - * 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.77 2002/02/27 17:05:41 alex + * - PRIVMSG beachtet nun die Channel-Modes "n" und "m". * - * Revision 1.30 2002/01/06 15:21:29 alex - * - Loglevel und Meldungen nochmals ueberarbeitet. - * - QUIT und SQUIT forwarden nun den Grund der Trennung, - * - WHOIS wird nun immer an den "Original-Server" weitergeleitet. + * Revision 1.76 2002/02/27 16:04:14 alex + * - Bug bei belegtem Nickname bei User-Registrierung (NICK-Befehl) behoben. * - * Revision 1.29 2002/01/05 23:24:54 alex - * - WHOIS erweitert: Anfragen koennen an andere Server weitergeleitet werden. - * - Vorbereitungen fuer Ident-Abfragen bei neuen Client-Strukturen. + * Revision 1.75 2002/02/27 15:23:27 alex + * - NAMES beachtet nun das "invisible" Flag ("i") von Usern. * - * Revision 1.28 2002/01/05 20:08:02 alex - * - Div. Aenderungen fuer die Server-Links (u.a. WHOIS, QUIT, NICK angepasst). - * - Neue Funktionen IRC_WriteStrServer() und IRC_WriteStrServerPrefix(). + * Revision 1.74 2002/02/27 03:44:53 alex + * - gerade eben in SQUIT eingefuehrten Bug behoben: entfernte Server werden nun + * nur noch geloescht, die Verbindung, von der SQUIT kam, bleibt wieder offen. * - * Revision 1.27 2002/01/05 19:15:03 alex - * - Fehlerpruefung bei select() in der "Hauptschleife" korrigiert. + * Revision 1.73 2002/02/27 03:08:05 alex + * - Log-Meldungen bei SQUIT erneut ueberarbeitet ... * - * Revision 1.26 2002/01/05 16:51:18 alex - * - das Passwort von Servern wird nun ueberprueft (PASS- und SERVER-Befehl). + * Revision 1.72 2002/02/27 02:26:58 alex + * - SQUIT wird auf jeden Fall geforwarded, zudem besseres Logging. * - * Revision 1.25 2002/01/05 00:48:33 alex - * - bei SQUIT wurde immer die Verbindung getrennt, auch bei Remote-Servern. + * Revision 1.71 2002/02/27 00:50:05 alex + * - einige unnoetige Client_NextHop()-Aufrufe entfernt. + * - NAMES korrigiert und komplett implementiert. * - * Revision 1.24 2002/01/04 17:58:44 alex - * - IRC_WriteStrXXX()-Funktionen eingefuehrt, groessere Anpassungen daran. - * - neuer Befehl SQUIT, QUIT an Server-Links angepasst. - * - * Revision 1.23 2002/01/04 01:36:40 alex - * - Loglevel ein wenig angepasst. - * - * Revision 1.22 2002/01/04 01:21:47 alex - * - Client-Strukruren werden nur noch ueber Funktionen angesprochen. - * - Weitere Anpassungen und Erweiterungen der Server-Links. - * - * Revision 1.21 2002/01/03 02:26:51 alex - * - neue Befehle SERVER und NJOIN begonnen, - * - begonnen, diverse IRC-Befehle an Server-Links anzupassen. - * - * Revision 1.20 2002/01/02 12:46:41 alex - * - die Gross- und Kleinschreibung des Nicks kann mit NICK nun geaendert werden. - * - * Revision 1.19 2002/01/02 02:51:39 alex - * - Copyright-Texte angepasst. - * - neuer Befehl "ERROR". - * - * Revision 1.17 2001/12/31 15:33:13 alex - * - neuer Befehl NAMES, kleinere Bugfixes. - * - Bug bei PING behoben: war zu restriktiv implementiert :-) - * - * Revision 1.16 2001/12/31 02:18:51 alex - * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART), - * - neuen Header "defines.h" mit (fast) allen Konstanten. - * - Code Cleanups und viele "kleine" Aenderungen & Bugfixes. - * - * Revision 1.15 2001/12/30 19:26:11 alex - * - Unterstuetzung fuer die Konfigurationsdatei eingebaut. - * - * Revision 1.14 2001/12/30 11:42:00 alex - * - der Server meldet nun eine ordentliche "Start-Zeit". - * - * Revision 1.13 2001/12/29 03:10:06 alex - * - Neue Funktion IRC_MODE() implementiert, div. Aenderungen. - * - neue configure-Optione "--enable-strict-rfc". - * - * Revision 1.12 2001/12/27 19:17:26 alex - * - neue Befehle PRIVMSG, NOTICE, PING. - * - * Revision 1.11 2001/12/27 16:55:41 alex - * - neu: IRC_WriteStrRelated(), Aenderungen auch in IRC_WriteStrClient(). - * - * Revision 1.10 2001/12/26 22:48:53 alex - * - MOTD-Datei ist nun konfigurierbar und wird gelesen. - * - * Revision 1.9 2001/12/26 14:45:37 alex - * - "Code Cleanups". - * - * Revision 1.8 2001/12/26 03:21:46 alex - * - PING/PONG-Befehle implementiert, - * - Meldungen ueberarbeitet: enthalten nun (fast) immer den Nick. - * - * Revision 1.7 2001/12/25 23:25:18 alex - * - und nochmal Aenderungen am Logging ;-) - * - * Revision 1.6 2001/12/25 23:13:33 alex - * - Debug-Meldungen angepasst. - * - * Revision 1.5 2001/12/25 22:02:42 alex - * - neuer IRC-Befehl "/QUIT". Verbessertes Logging & Debug-Ausgaben. - * - * Revision 1.4 2001/12/25 19:19:30 alex - * - bessere Fehler-Abfragen, diverse Bugfixes. - * - Nicks werden nur einmal vergeben :-) - * - /MOTD wird unterstuetzt. - * - * Revision 1.3 2001/12/24 01:34:06 alex - * - USER und NICK wird nun in beliebiger Reihenfolge akzeptiert (wg. BitchX) - * - MOTD-Ausgabe begonnen zu implementieren. - * - * Revision 1.2 2001/12/23 21:57:16 alex - * - erste IRC-Befehle zu implementieren begonnen. - * - * Revision 1.1 2001/12/14 08:13:43 alex - * - neues Modul begonnen :-) + * Revision 1.70 2002/02/26 22:06:40 alex + * - Nick-Aenderungen werden nun wieder korrekt ins Logfile geschrieben. */ -#include -#include "global.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "ngircd.h" -#include "client.h" -#include "conf.h" -#include "conn.h" -#include "log.h" -#include "messages.h" -#include "parse.h" -#include "tool.h" - -#include -#include "irc.h" - - -#define CONNECTED TRUE -#define DISCONNECTED FALSE - - -LOCAL BOOLEAN Hello_User( CLIENT *Client ); -LOCAL BOOLEAN Show_MOTD( CLIENT *Client ); - -LOCAL VOID Kill_Nick( CHAR *Nick ); - - -GLOBAL VOID IRC_Init( VOID ) -{ -} /* IRC_Init */ - - -GLOBAL VOID IRC_Exit( VOID ) -{ -} /* IRC_Exit */ - - -GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... ) -{ - CHAR buffer[1000]; - BOOLEAN ok = CONNECTED; - va_list ap; - - assert( Client != NULL ); - assert( Format != NULL ); - - va_start( ap, Format ); - vsnprintf( buffer, 1000, Format, ap ); - va_end( ap ); - - /* an den Client selber */ - ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), buffer ); - - return ok; -} /* IRC_WriteStrClient */ - - -GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... ) -{ - /* Text an Clients, lokal bzw. remote, senden. */ - - CHAR buffer[1000]; - va_list ap; - - assert( Client != NULL ); - assert( Format != NULL ); - assert( Prefix != NULL ); - - va_start( ap, Format ); - vsnprintf( buffer, 1000, Format, ap ); - va_end( ap ); - - return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Client_ID( Prefix ), buffer ); -} /* IRC_WriteStrClientPrefix */ - - -GLOBAL BOOLEAN IRC_WriteStrRelated( CLIENT *Client, CHAR *Format, ... ) -{ - CHAR buffer[1000]; - BOOLEAN ok = CONNECTED; - va_list ap; - - assert( Client != NULL ); - assert( Format != NULL ); - - va_start( ap, Format ); - vsnprintf( buffer, 1000, Format, ap ); - va_end( ap ); - - /* an den Client selber */ - ok = IRC_WriteStrClient( Client, buffer ); - - /* FIXME */ - - return ok; -} /* IRC_WriteStrRelated */ - - -GLOBAL VOID IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... ) -{ - CHAR buffer[1000]; - va_list ap; - - assert( Format != NULL ); - - va_start( ap, Format ); - vsnprintf( buffer, 1000, Format, ap ); - va_end( ap ); - - /* an den Client selber */ - return IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer ); -} /* IRC_WriteStrServers */ - - -GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... ) -{ - CHAR buffer[1000]; - CLIENT *c; - va_list ap; - - assert( Format != NULL ); - assert( Prefix != NULL ); - - va_start( ap, Format ); - vsnprintf( buffer, 1000, Format, ap ); - va_end( ap ); - - c = Client_First( ); - while( c ) - { - if(( Client_Type( c ) == CLIENT_SERVER ) && ( Client_Conn( c ) > NONE ) && ( c != Client_ThisServer( )) && ( c != ExceptOf )) - { - /* Ziel-Server gefunden */ - IRC_WriteStrClientPrefix( c, Prefix, buffer ); - } - c = Client_Next( c ); - } -} /* IRC_WriteStrServersPrefix */ - - -GLOBAL BOOLEAN IRC_PASS( 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_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; - } - else if((( Client_Type( Client ) == CLIENT_UNKNOWN ) || ( Client_Type( Client ) == CLIENT_UNKNOWNSERVER )) && (( Req->argc == 3 ) || ( Req->argc == 4 ))) - { - /* 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] ); - - Client_SetType( Client, CLIENT_GOTPASSSERVER ); - return CONNECTED; - } - 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 )); -} /* IRC_PASS */ - - -GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) -{ - CHAR str[LINE_LEN], *ptr; - BOOLEAN ok; - CLIENT *c; - INT i; - - 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 )); - - /* Falsche Anzahl Parameter? */ - 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; - if( i >= Conf_Server_Count ) - { - /* Server ist nicht konfiguriert! */ - Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] ); - Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", TRUE ); - return DISCONNECTED; - } - if( strcmp( Client_Password( Client ), Conf_Server[i].pwd ) != 0 ) - { - /* Falsches Passwort */ - Log( LOG_ERR, "Connection %d: Bad password for server \"%s\"!", Client_Conn( Client ), Req->argv[0] ); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE ); - return DISCONNECTED; - } - - /* Ist ein Server mit dieser ID bereits registriert? */ - if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED; - - /* Server-Strukturen fuellen ;-) */ - Client_SetID( Client, Req->argv[0] ); - 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 ) - { - /* Neuer Server wird im Netz angekuendigt */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* Ist ein Server mit dieser ID bereits registriert? */ - if( ! Client_CheckID( Client, Req->argv[0] )) return DISCONNECTED; - - /* Ueberfluessige Hostnamen aus Info-Text entfernen */ - ptr = strchr( Req->argv[3] + 2, '[' ); - if( ! ptr ) ptr = Req->argv[3]; - - /* Neue Client-Struktur anlegen */ - c = Client_NewRemoteServer( Client, Req->argv[0], atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, TRUE ); - if( ! c ) - { - /* Neue Client-Struktur konnte nicht angelegt werden */ - Log( LOG_ALERT, "Can't create client structure for server! (on connection %d)", Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", TRUE ); - return DISCONNECTED; - } - - /* Log-Meldung zusammenbauen und ausgeben */ - if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) sprintf( str, "connected to %s, ", Req->prefix ); - else strcpy( str, "" ); - Log( LOG_NOTICE, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); - - return CONNECTED; - } - else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); -} /* IRC_SERVER */ - - -GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - - if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTEREDSERVER_MSG, Client_ID( Client )); - - return CONNECTED; -} /* IRC_NJOIN */ - - -GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) -{ - CLIENT *intr_c, *target, *c; - CHAR *modes; - - 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 || ( 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 || ( Client_Type( Client ) == CLIENT_SERVER && Req->argc == 1 )) -#endif - { - /* User-Registrierung bzw. Nick-Aenderung */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* "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( 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( target ), Req->argv[0] ) != 0 ) - { - 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( 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( target, Req->argv[0] ); - - if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER )) - { - /* Neuer Client */ - Log( LOG_DEBUG, "Connection %d: got NICK command ...", Client_Conn( Client )); - if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client ); - else Client_SetType( Client, CLIENT_GOTNICK ); - } - return CONNECTED; - } - else if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Server fuehrt neuen Client ein */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc != 7 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* Nick ueberpruefen */ - c = Client_GetFromID( Req->argv[0] ); - if( c ) - { - /* 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] ); - Kill_Nick( Req->argv[0] ); - return CONNECTED; - } - - /* Server, zu dem der Client connectiert ist, suchen */ - intr_c = Client_GetFromToken( Client, atoi( Req->argv[4] )); - if( ! intr_c ) - { - Log( LOG_ERR, "Server %s introduces nick \"%s\" on unknown server!?", Client_ID( Client ), Req->argv[0] ); - Kill_Nick( Req->argv[0] ); - return CONNECTED; - } - - /* Neue Client-Struktur anlegen */ - c = Client_NewRemoteUser( intr_c, Req->argv[0], atoi( Req->argv[1] ), Req->argv[2], Req->argv[3], atoi( Req->argv[4] ), Req->argv[5] + 1, Req->argv[6], TRUE ); - if( ! c ) - { - /* Eine neue Client-Struktur konnte nicht angelegt werden. - * Der Client muss disconnectiert werden, damit der Netz- - * status konsistent bleibt. */ - Log( LOG_ALERT, "Can't create client structure! (on connection %d)", Client_Conn( Client )); - Kill_Nick( Req->argv[0] ); - return CONNECTED; - } - - modes = Client_Modes( c ); - if( *modes ) Log( LOG_DEBUG, "User \"%s\" (+%s) registered (via %s, on %s, %d hop%s).", Client_Mask( c ), modes, Client_ID( Client ), Client_ID( intr_c ), Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); - else 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; - } - else return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client )); -} /* IRC_NICK */ - - -GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req ) -{ - assert( Client != NULL ); - assert( Req != NULL ); - -#ifndef STRICT_RFC - if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS || Client_Type( Client ) == CLIENT_UNKNOWN ) -#else - if( Client_Type( Client ) == CLIENT_GOTNICK || Client_Type( Client ) == CLIENT_GOTPASS ) -#endif - { - /* Falsche Anzahl Parameter? */ - if( Req->argc != 4 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - Client_SetUser( Client, Req->argv[0], FALSE ); - Client_SetInfo( Client, Req->argv[3] ); - - Log( LOG_DEBUG, "Connection %d: got USER command ...", Client_Conn( Client )); - if( Client_Type( Client ) == CLIENT_GOTNICK ) return Hello_User( Client ); - else Client_SetType( Client, CLIENT_GOTUSER ); - return CONNECTED; - } - else if( Client_Type( Client ) == CLIENT_USER || Client_Type( Client ) == CLIENT_SERVER || Client_Type( Client ) == CLIENT_SERVICE ) - { - return IRC_WriteStrClient( Client, ERR_ALREADYREGISTRED_MSG, Client_ID( Client )); - } - else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); -} /* IRC_USER */ - - -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 ) - { - /* Server */ - - /* Falsche Anzahl Parameter? */ - if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - target = Client_Search( Req->prefix ); - if( ! target ) - { - Log( LOG_ERR, "Got QUIT from %s for unknown client!?", Client_ID( Client )); - return CONNECTED; - } - - if( Req->argc == 0 ) Client_Destroy( target, "Got QUIT command.", NULL ); - else Client_Destroy( target, "Got QUIT command.", Req->argv[0] ); - - return CONNECTED; - } - else return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); -} /* IRC_QUIT */ - - -GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req ) -{ - CLIENT *target; - - assert( Client != NULL ); - assert( Req != NULL ); - - /* SQUIT ist nur fuer Server erlaubt */ - if( 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 ); - - target = Client_GetFromID( Req->argv[0] ); - if( ! target ) - { - Log( LOG_ERR, "Got SQUIT from %s for unknown server \%s\"!?", Client_ID( Client ), Req->argv[0] ); - return CONNECTED; - } - - 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] ); - - /* SQUIT an alle Server weiterleiten */ - IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] ); - - if( Client_Conn( target ) > NONE ) - { - if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), "Got SQUIT command.", Req->argv[1], TRUE ); - else Conn_Close( Client_Conn( target ), "Got SQUIT command.", NULL, TRUE ); - return DISCONNECTED; - } - else - { - Client_Destroy( target, "Got SQUIT command.", Req->argv[1] ); - return CONNECTED; - } -} /* IRC_SQUIT */ - - -GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req ) -{ - 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 < 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 */ - - -GLOBAL BOOLEAN IRC_PONG( CLIENT *Client, REQUEST *Req ) -{ - 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 )); +#include +#include "global.h" - /* Falsche Anzahl Parameter? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NOORIGIN_MSG, Client_ID( Client )); - if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); +#include +#include +#include +#include +#include +#include - /* Der Connection-Timestamp wurde schon beim Lesen aus dem Socket - * aktualisiert, daher muss das hier nicht mehr gemacht werden. */ +#include "ngircd.h" +#include "channel.h" +#include "client.h" +#include "conf.h" +#include "conn.h" +#include "irc-write.h" +#include "log.h" +#include "messages.h" +#include "tool.h" - Log( LOG_DEBUG, "Connection %d: received PONG.", Client_Conn( Client )); - return CONNECTED; -} /* IRC_PONG */ +#include +#include "irc.h" GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req ) @@ -765,13 +97,15 @@ GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req ) /* Falsche Anzahl Parameter? */ if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - return Show_MOTD( Client ); + return IRC_Show_MOTD( Client ); } /* IRC_MOTD */ GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) { - CLIENT *to, *from; + BOOLEAN is_member, has_voice, is_op, ok; + CLIENT *cl, *from; + CHANNEL *chan; assert( Client != NULL ); assert( Req != NULL ); @@ -787,14 +121,46 @@ GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req ) 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 ) + cl = Client_Search( Req->argv[0] ); + if( cl ) { /* Okay, Ziel ist ein User */ - if( Client_Conn( from ) >= 0 ) Conn_UpdateIdle( Client_Conn( from )); - return IRC_WriteStrClientPrefix( to, from, "PRIVMSG %s :%s", Client_ID( to ), Req->argv[1] ); + if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' ))) + { + /* Ziel-User ist AWAY: Meldung verschicken */ + if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( cl ), Client_Away( cl ))) return DISCONNECTED; + } + + /* Text senden */ + if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from )); + return IRC_WriteStrClientPrefix( cl, from, "PRIVMSG %s :%s", Client_ID( cl ), Req->argv[1] ); + } + + chan = Channel_Search( Req->argv[0] ); + if( chan ) + { + /* Okay, Ziel ist ein Channel */ + is_member = has_voice = is_op = FALSE; + if( Channel_IsMemberOf( chan, from )) + { + is_member = TRUE; + if( strchr( Channel_UserModes( chan, from ), 'v' )) has_voice = TRUE; + if( strchr( Channel_UserModes( chan, from ), 'o' )) is_op = TRUE; + } + + /* pruefen, ob Client in Channel schreiben darf */ + ok = TRUE; + if( strchr( Channel_Modes( chan ), 'n' ) && ( ! is_member )) ok = FALSE; + if( strchr( Channel_Modes( chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE; + + if( ! ok ) return IRC_WriteStrClient( from, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( from ), Req->argv[0] ); + + /* Text senden */ + if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from )); + return IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "PRIVMSG %s :%s", Req->argv[0], Req->argv[1] ); } - else return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] ); + + return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] ); } /* IRC_PRIVMSG */ @@ -824,11 +190,11 @@ GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req ) } /* IRC_NOTICE */ -GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req ) { - CHAR x[2], new_modes[CLIENT_MODE_LEN], *ptr; - BOOLEAN set, ok; - CLIENT *target; + CHAR rpl[COMMAND_LEN], *ptr; + CLIENT *target, *from, *c; + CHANNEL *chan; assert( Client != NULL ); assert( Req != NULL ); @@ -836,236 +202,86 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) 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 ) || ( Req->argc < 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* "Ziel-Client" suchen */ - target = Client_Search( Req->argv[0] ); - - /* Wer ist der Anfragende? */ - if( Client_Type( Client ) == CLIENT_USER ) - { - /* User: MODE ist nur fuer sich selber zulaessig */ - if( target != Client ) return IRC_WriteStrClient( Client, ERR_USERSDONTMATCH_MSG, Client_ID( Client )); - } - else - { - /* Server: gibt es den Client ueberhaupt? */ - if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); - } - - /* Werden die Modes erfragt? */ - if( Req->argc == 1 ) return IRC_WriteStrClient( Client, RPL_UMODEIS_MSG, Client_ID( Client ), Client_Modes( Client )); - - ptr = Req->argv[1]; - - /* Sollen Modes gesetzt oder geloescht werden? */ - if( *ptr == '+' ) set = TRUE; - else if( *ptr == '-' ) set = FALSE; - else return IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); - - /* Reply-String mit Aenderungen vorbereiten */ - if( set ) strcpy( new_modes, "+" ); - else strcpy( new_modes, "-" ); + if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - ptr++; - ok = TRUE; - x[1] = '\0'; - while( *ptr ) + /* From aus Prefix ermitteln */ + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix ); + else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); + + if( Req->argc == 2 ) { - x[0] = '\0'; - if( Client_Type( Client ) == CLIENT_SERVER ) - { - x[0] = *ptr; - ok = TRUE; - } - else - { - switch( *ptr ) - { - case 'i': - /* invisible */ - x[0] = 'i'; - break; - case 'r': - /* restricted (kann nur gesetzt werden) */ - if( set ) x[0] = 'r'; - else ok = IRC_WriteStrClient( target, ERR_RESTRICTED_MSG, Client_ID( target )); - break; - case 'o': - /* operator (kann nur geloescht werden) */ - if( ! set ) - { - Client_SetOperByMe( target, FALSE ); - x[0] = 'o'; - } - else ok = IRC_WriteStrClient( target, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( target )); - break; - default: - ok = IRC_WriteStrClient( target, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( target )); - x[0] = '\0'; - } - } - if( ! ok ) break; - - ptr++; - if( ! x[0] ) continue; + /* an anderen Server forwarden */ + target = Client_GetFromID( Req->argv[1] ); + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[1] ); - /* Okay, gueltigen Mode gefunden */ - if( set ) - { - /* Mode setzen. Wenn der Client ihn noch nicht hatte: merken */ - if( Client_ModeAdd( target, x[0] )) strcat( new_modes, x ); - } - else + if( target != Client_ThisServer( )) { - /* Modes geloescht. Wenn der Client ihn hatte: merken */ - if( Client_ModeDel( target, x[0] )) strcat( new_modes, x ); + /* Ok, anderer Server ist das Ziel: forwarden */ + return IRC_WriteStrClientPrefix( target, from, "NAMES %s :%s", Req->argv[0], Req->argv[1] ); } } - - /* Geanderte Modes? */ - if( new_modes[1] ) + + if( Req->argc > 0 ) { - if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Modes an andere Server forwarden */ - IRC_WriteStrServersPrefix( Client, Client, "MODE %s :%s", Client_ID( target ), new_modes ); - } - else + /* bestimmte Channels durchgehen */ + ptr = strtok( Req->argv[0], "," ); + while( ptr ) { - /* 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 ); + chan = Channel_Search( ptr ); + if( chan ) + { + /* Namen ausgeben */ + if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED; + } + if( ! IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), ptr )) return DISCONNECTED; + + /* naechsten Namen ermitteln */ + ptr = strtok( NULL, "," ); } - Log( LOG_DEBUG, "User \"%s\": Mode change, now \"%s\".", Client_Mask( target ), Client_Modes( target )); + return CONNECTED; } - return ok; -} /* IRC_MODE */ - - -GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req ) -{ - INT i; - 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 ); - - /* Operator suchen */ - for( i = 0; i < Conf_Oper_Count; i++) - { - if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break; - } - if( i >= Conf_Oper_Count ) + /* alle Channels durchgehen */ + chan = Channel_First( ); + while( chan ) { - Log( LOG_WARNING, "Got invalid OPER from \"%s\": Name \"%s\" not configured!", Client_Mask( Client ), Req->argv[0] ); - return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); - } + /* Namen ausgeben */ + if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED; - /* Stimmt das Passwort? */ - if( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 ) - { - Log( LOG_WARNING, "Got invalid OPER from \"%s\": Bad password for \"%s\"!", Client_Mask( Client ), Conf_Oper[i].name ); - return IRC_WriteStrClient( Client, ERR_PASSWDMISMATCH_MSG, Client_ID( Client )); - } - - if( ! Client_HasMode( Client, 'o' )) - { - /* 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 )); + /* naechster Channel */ + chan = Channel_Next( chan ); } - if( ! Client_OperByMe( Client )) Log( LOG_NOTICE, "Got valid OPER from \"%s\", user is an IRC operator now.", Client_Mask( Client )); - - Client_SetOperByMe( Client, TRUE ); - return IRC_WriteStrClient( Client, RPL_YOUREOPER_MSG, Client_ID( Client )); -} /* IRC_OPER */ - - -GLOBAL BOOLEAN IRC_DIE( 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 != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - - Log( LOG_NOTICE, "Got DIE command from \"%s\", going down!", Client_Mask( Client )); - NGIRCd_Quit = TRUE; - return CONNECTED; -} /* IRC_DIE */ - - -GLOBAL BOOLEAN IRC_RESTART( 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 != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - if(( ! Client_HasMode( Client, 'o' )) || ( ! Client_OperByMe( Client ))) return IRC_WriteStrClient( Client, ERR_NOPRIVILEGES_MSG, Client_ID( Client )); - - Log( LOG_NOTICE, "Got RESTART command from \"%s\", going down!", Client_Mask( Client )); - NGIRCd_Restart = TRUE; - return CONNECTED; -} /* IRC_RESTART */ - - -GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req ) -{ - CHAR rpl[COMMAND_LEN]; - CLIENT *c; - - 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 != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* Noch alle User ausgeben, die in keinem Channel sind */ - rpl[0] = '\0'; + /* Nun noch alle Clients ausgeben, die in keinem Channel sind */ c = Client_First( ); + sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" ); while( c ) { - if( Client_Type( c ) == CLIENT_USER ) + if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' ))) { - /* Okay, das ist ein User */ + /* Okay, das ist ein User: anhaengen */ + if( rpl[strlen( rpl ) - 1] != ':' ) strcat( rpl, " " ); strcat( rpl, Client_ID( c )); - strcat( rpl, " " ); - } - /* Antwort zu lang? Splitten. */ - if( strlen( rpl ) > 480 ) - { - if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0'; - if( ! IRC_WriteStrClient( Client, RPL_NAMREPLY_MSG, Client_ID( Client ), "*", "*", rpl )) return DISCONNECTED; - rpl[0] = '\0'; + if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 )) + { + /* Zeile wird zu lang: senden! */ + if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED; + sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" ); + } } - + + /* naechster Client */ c = Client_Next( c ); } - if( rpl[0] ) + if( rpl[strlen( rpl ) - 1] != ':') { /* es wurden User gefunden */ - if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0'; - if( ! IRC_WriteStrClient( Client, RPL_NAMREPLY_MSG, Client_ID( Client ), "*", "*", rpl )) return DISCONNECTED; + if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED; } - return IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), "*" ); + + return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" ); } /* IRC_NAMES */ @@ -1110,7 +326,9 @@ GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req ) { CLIENT *from, *target, *c; - CHAR *ptr = NULL; + CHAR str[LINE_LEN + 1], *ptr = NULL; + CL2CHAN *cl2chan; + CHANNEL *chan; assert( Client != NULL ); assert( Req != NULL ); @@ -1137,17 +355,11 @@ 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; + else target = Client_ThisServer( ); + + assert( target != NULL ); - 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 ); + if(( 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; @@ -1155,6 +367,36 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req ) /* Server */ if( ! IRC_WriteStrClient( from, RPL_WHOISSERVER_MSG, Client_ID( from ), Client_ID( c ), Client_ID( Client_Introducer( c )), Client_Info( Client_Introducer( c )))) return DISCONNECTED; + /* Channels */ + sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c )); + cl2chan = Channel_FirstChannelOf( c ); + while( cl2chan ) + { + chan = Channel_GetChannel( cl2chan ); + assert( chan != NULL ); + + /* Channel-Name anhaengen */ + if( str[strlen( str ) - 1] != ':' ) strcat( str, " " ); + if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" ); + if( strchr( Channel_UserModes( chan, c ), 'o' )) strcat( str, "@" ); + strcat( str, Channel_Name( chan )); + + if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 )) + { + /* Zeile wird zu lang: senden! */ + if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED; + sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c )); + } + + /* naechstes Mitglied suchen */ + cl2chan = Channel_NextChannelOf( c, cl2chan ); + } + if( str[strlen( str ) - 1] != ':') + { + /* Es sind noch Daten da, die gesendet werden muessen */ + if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED; + } + /* IRC-Operator? */ if( Client_HasMode( c, 'o' )) { @@ -1167,11 +409,31 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( from, RPL_WHOISIDLE_MSG, Client_ID( from ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED; } + /* Away? */ + if( Client_HasMode( c, 'a' )) + { + if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( c ), Client_Away( c ))) return DISCONNECTED; + } + /* End of Whois */ return IRC_WriteStrClient( from, RPL_ENDOFWHOIS_MSG, Client_ID( from ), Client_ID( c )); } /* IRC_WHOIS */ +GLOBAL BOOLEAN IRC_WHO( 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_WHO */ + + GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req ) { CHAR rpl[COMMAND_LEN]; @@ -1228,7 +490,6 @@ GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *from; - INT cnt; assert( Client != NULL ); assert( Req != NULL ); @@ -1256,28 +517,7 @@ GLOBAL BOOLEAN IRC_LUSERS( CLIENT *Client, REQUEST *Req ) else target = Client; if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); - /* Users, Services und Serevr im Netz */ - if( ! IRC_WriteStrClient( target, RPL_LUSERCLIENT_MSG, Client_ID( target ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED; - - /* IRC-Operatoren im Netz */ - cnt = Client_OperCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( target, RPL_LUSEROP_MSG, Client_ID( target ), cnt )) return DISCONNECTED; - } - - /* Unbekannt Verbindungen */ - cnt = Client_UnknownCount( ); - if( cnt > 0 ) - { - if( ! IRC_WriteStrClient( target, RPL_LUSERUNKNOWN_MSG, Client_ID( target ), cnt )) return DISCONNECTED; - } - - /* Channels im Netz */ - if( ! IRC_WriteStrClient( target, RPL_LUSERCHANNELS_MSG, Client_ID( target ), Channel_Count( ))) return DISCONNECTED; - - /* Channels im Netz */ - if( ! IRC_WriteStrClient( target, RPL_LUSERME_MSG, Client_ID( target ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED; + IRC_Send_LUSERS( target ); return CONNECTED; } /* IRC_LUSERS */ @@ -1323,7 +563,7 @@ GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req ) { 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; + if( ! IRC_WriteStrClient( target, RPL_LINKS_MSG, Client_ID( target ), Client_ID( c ), Client_ID( Client_TopServer( c ) ? Client_TopServer( c ) : Client_ThisServer( )), Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; } c = Client_Next( c ); } @@ -1332,36 +572,73 @@ GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req ) } /* IRC_LINKS */ -LOCAL BOOLEAN Hello_User( CLIENT *Client ) +GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req ) { + CLIENT *target, *prefix; + assert( Client != NULL ); + assert( Req != NULL ); - /* Passwort ueberpruefen */ - if( strcmp( Client_Password( Client ), Conf_ServerPwd ) != 0 ) + /* Falsche Anzahl Parameter? */ + if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + /* Ziel suchen */ + if( Req->argc == 1 ) target = Client_GetFromID( Req->argv[0] ); + else target = Client_ThisServer( ); + + /* Prefix ermitteln */ + if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_GetFromID( Req->prefix ); + else prefix = Client; + if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix ); + + /* An anderen Server weiterleiten? */ + if( target != Client_ThisServer( )) { - /* Falsches Passwort */ - Log( LOG_ERR, "User \"%s\" rejected (connection %d): Bad password!", Client_Mask( Client ), Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE ); - return DISCONNECTED; + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); + + /* forwarden */ + IRC_WriteStrClientPrefix( target, prefix, "VERSION %s", Req->argv[0] ); + return CONNECTED; } - Log( LOG_NOTICE, "User \"%s\" registered (connection %d).", Client_Mask( Client ), Client_Conn( Client )); + /* mit Versionsinfo antworten */ + return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( )); +} /* IRC_VERSION */ + - /* Andere Server informieren */ - 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 )); +GLOBAL BOOLEAN IRC_KILL( CLIENT *Client, REQUEST *Req ) +{ + CLIENT *prefix, *c; + + assert( Client != NULL ); + assert( Req != NULL ); - 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_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( 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 ); - Client_SetType( Client, CLIENT_USER ); + prefix = Client_GetFromID( Req->prefix ); + if( ! prefix ) + { + Log( LOG_WARNING, "Got KILL with invalid prefix: \"%s\"!", Req->prefix ); + prefix = Client_ThisServer( ); + } + + Log( LOG_NOTICE, "Got KILL command from \"%s\" for \"%s\": %s", Client_Mask( prefix ), Req->argv[0], Req->argv[1] ); + + /* andere Server benachrichtigen */ + IRC_WriteStrServersPrefix( Client, prefix, "KILL %s :%s", Req->argv[0], Req->argv[1] ); - return Show_MOTD( Client ); -} /* Hello_User */ + /* haben wir selber einen solchen Client? */ + c = Client_GetFromID( Req->argv[0] ); + if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE ); + + return CONNECTED; +} /* IRC_KILL */ -LOCAL BOOLEAN Show_MOTD( CLIENT *Client ) +GLOBAL BOOLEAN IRC_Show_MOTD( CLIENT *Client ) { BOOLEAN ok; CHAR line[127]; @@ -1392,15 +669,92 @@ LOCAL BOOLEAN Show_MOTD( CLIENT *Client ) fclose( fd ); return ok; -} /* Show_MOTD */ +} /* IRC_Show_MOTD */ + + +GLOBAL BOOLEAN IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) +{ + BOOLEAN is_visible, is_member; + CHAR str[LINE_LEN + 1]; + CL2CHAN *cl2chan; + CLIENT *cl; + + assert( Client != NULL ); + assert( Chan != NULL ); + + if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE; + else is_member = FALSE; + + /* Alle Mitglieder suchen */ + sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan )); + cl2chan = Channel_FirstMember( Chan ); + while( cl2chan ) + { + cl = Channel_GetClient( cl2chan ); + + if( strchr( Client_Modes( cl ), 'i' )) is_visible = FALSE; + else is_visible = TRUE; + + if( is_member || is_visible ) + { + /* Nick anhaengen */ + if( str[strlen( str ) - 1] != ':' ) strcat( str, " " ); + if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" ); + if( strchr( Channel_UserModes( Chan, cl ), 'o' )) strcat( str, "@" ); + strcat( str, Client_ID( cl )); + + if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 )) + { + /* Zeile wird zu lang: senden! */ + if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED; + sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan )); + } + } + + /* naechstes Mitglied suchen */ + cl2chan = Channel_NextMember( Chan, cl2chan ); + } + if( str[strlen( str ) - 1] != ':') + { + /* Es sind noch Daten da, die gesendet werden muessen */ + if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED; + } + + return CONNECTED; +} /* IRC_Send_NAMES */ -LOCAL VOID Kill_Nick( CHAR *Nick ) +GLOBAL BOOLEAN IRC_Send_LUSERS( CLIENT *Client ) { - Log( LOG_ERR, "User(s) with nick \"%s\" will be disconnected!", Nick ); - /* FIXME */ - Log( LOG_ALERT, "[Kill_Nick() not implemented - OOOPS!]" ); -} /* Kill_Nick */ + INT cnt; + + assert( Client != NULL ); + + /* Users, Services und Serevr im Netz */ + if( ! IRC_WriteStrClient( Client, RPL_LUSERCLIENT_MSG, Client_ID( Client ), Client_UserCount( ), Client_ServiceCount( ), Client_ServerCount( ))) return DISCONNECTED; + + /* IRC-Operatoren im Netz */ + cnt = Client_OperCount( ); + if( cnt > 0 ) + { + if( ! IRC_WriteStrClient( Client, RPL_LUSEROP_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + } + + /* Unbekannt Verbindungen */ + cnt = Client_UnknownCount( ); + if( cnt > 0 ) + { + if( ! IRC_WriteStrClient( Client, RPL_LUSERUNKNOWN_MSG, Client_ID( Client ), cnt )) return DISCONNECTED; + } + + /* Channels im Netz */ + if( ! IRC_WriteStrClient( Client, RPL_LUSERCHANNELS_MSG, Client_ID( Client ), Channel_Count( ))) return DISCONNECTED; + + /* Channels im Netz */ + if( ! IRC_WriteStrClient( Client, RPL_LUSERME_MSG, Client_ID( Client ), Client_MyUserCount( ), Client_MyServiceCount( ), Client_MyServerCount( ))) return DISCONNECTED; + + return CONNECTED; +} /* IRC_Send_LUSERS */ /* -eof- */