X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=c22b867bd059410645ccd9f387f16073dc6b0926;hb=0ac6151be9978d143a2be966b7dfbb2f2f8437d2;hp=306ab1c5284d959117634ad47cef90cb0ecb7d92;hpb=ef7f7a90f4242d2b27adf3539bc7bc0c00dde0d1;p=ngircd-alex.git diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 306ab1c5..c22b867b 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -9,58 +9,15 @@ * 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.82 2002/02/27 23:26:36 alex Exp $ + * $Id: irc.c,v 1.88 2002/03/12 14:37:52 alex Exp $ * * irc.c: IRC-Befehle - * - * $Log: irc.c,v $ - * Revision 1.82 2002/02/27 23:26:36 alex - * - einige Funktionen in irc-xxx-Module ausgegliedert. - * - * Revision 1.81 2002/02/27 20:55:44 alex - * - Channel-Topics werden nun auch korrekt von anderen Server angenommen. - * - * Revision 1.80 2002/02/27 20:33:13 alex - * - Channel-Topics implementiert. - * - * Revision 1.79 2002/02/27 18:57:21 alex - * - PRIVMSG zeugt nun bei Texten an User an, wenn diese "away" sind. - * - * Revision 1.78 2002/02/27 18:23:45 alex - * - IRC-Befehl "AWAY" implementert. - * - * Revision 1.77 2002/02/27 17:05:41 alex - * - PRIVMSG beachtet nun die Channel-Modes "n" und "m". - * - * Revision 1.76 2002/02/27 16:04:14 alex - * - Bug bei belegtem Nickname bei User-Registrierung (NICK-Befehl) behoben. - * - * Revision 1.75 2002/02/27 15:23:27 alex - * - NAMES beachtet nun das "invisible" Flag ("i") von Usern. - * - * 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.73 2002/02/27 03:08:05 alex - * - Log-Meldungen bei SQUIT erneut ueberarbeitet ... - * - * Revision 1.72 2002/02/27 02:26:58 alex - * - SQUIT wird auf jeden Fall geforwarded, zudem besseres Logging. - * - * Revision 1.71 2002/02/27 00:50:05 alex - * - einige unnoetige Client_NextHop()-Aufrufe entfernt. - * - NAMES korrigiert und komplett implementiert. - * - * Revision 1.70 2002/02/26 22:06:40 alex - * - Nick-Aenderungen werden nun wieder korrekt ins Logfile geschrieben. */ -#include -#include "global.h" +#include "portab.h" -#include +#include "imp.h" #include #include #include @@ -77,7 +34,7 @@ #include "messages.h" #include "tool.h" -#include +#include "exp.h" #include "irc.h" @@ -184,87 +141,6 @@ GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req ) } /* IRC_NOTICE */ -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 ) - { - 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 )); - } - - /* 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_WriteStrClient( 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 )); - - 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], *ptr; @@ -452,8 +328,8 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req ) /* 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, "@" ); + else if( strchr( Channel_UserModes( chan, c ), 'v' )) strcat( str, "+" ); strcat( str, Channel_Name( chan )); if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 )) @@ -495,6 +371,83 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req ) } /* IRC_WHOIS */ +GLOBAL BOOLEAN IRC_WHO( CLIENT *Client, REQUEST *Req ) +{ + BOOLEAN ok, only_ops; + CHAR flags[8], *ptr; + CL2CHAN *cl2chan; + CHANNEL *chan; + 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 > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + + only_ops = FALSE; + chan = NULL; + + if( Req->argc == 2 ) + { + /* Nur OPs anzeigen? */ + if( strcmp( Req->argv[1], "o" ) == 0 ) only_ops = TRUE; +#ifdef STRICT_RFC + else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); +#endif + } + + if( Req->argc >= 1 ) + { + /* wurde ein Channel oder Nick-Mask angegeben? */ + chan = Channel_Search( Req->argv[0] ); + } + + if( chan ) + { + /* User eines Channels ausgeben */ + if( ! IRC_Send_WHO( Client, chan, only_ops )) return DISCONNECTED; + } + + c = Client_First( ); + while( c ) + { + if(( Client_Type( c ) == CLIENT_USER ) && ( ! strchr( Client_Modes( c ), 'i' ))) + { + ok = FALSE; + if( Req->argc == 0 ) ok = TRUE; + else + { + if( strcasecmp( Req->argv[0], Client_ID( c )) == 0 ) ok = TRUE; + else if( strcmp( Req->argv[0], "0" ) == 0 ) ok = TRUE; + } + + if( ok && (( ! only_ops ) || ( strchr( Client_Modes( c ), 'o' )))) + { + /* Flags zusammenbasteln */ + strcpy( flags, "H" ); + if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" ); + + /* ausgeben */ + cl2chan = Channel_FirstChannelOf( c ); + if( cl2chan ) ptr = Channel_Name( Channel_GetChannel( cl2chan )); + else ptr = "*"; + if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), ptr, Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; + } + } + + /* naechster Client */ + c = Client_Next( c ); + } + + if( chan ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Channel_Name( chan )); + else if( Req->argc == 0 ) return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), "*" ); + else return IRC_WriteStrClient( Client, RPL_ENDOFWHO_MSG, Client_ID( Client ), Req->argv[0] ); +} /* IRC_WHO */ + + GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req ) { CHAR rpl[COMMAND_LEN]; @@ -633,190 +586,6 @@ GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req ) } /* IRC_LINKS */ -GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req ) -{ - CHAR *channame, *flags, *topic, modes[8]; - BOOLEAN is_new_chan; - CLIENT *target; - CHANNEL *chan; - - 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_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - /* 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 ); - - /* Channel-Namen durchgehen */ - channame = strtok( Req->argv[0], "," ); - while( channame ) - { - /* wird der Channel neu angelegt? */ - flags = NULL; - - if( Channel_Search( channame )) is_new_chan = FALSE; - else is_new_chan = TRUE; - - /* Hat ein Server Channel-User-Modes uebergeben? */ - if( Client_Type( Client ) == CLIENT_SERVER ) - { - /* Channel-Flags extrahieren */ - flags = strchr( channame, 0x7 ); - if( flags ) *flags++ = '\0'; - } - - /* neuer Channel udn lokaler Client? */ - if( is_new_chan && ( Client_Type( Client ) == CLIENT_USER )) - { - /* Dann soll der Client Channel-Operator werden! */ - flags = "o"; - } - - /* Channel joinen (und ggf. anlegen) */ - if( ! Channel_Join( target, channame )) - { - /* naechsten Namen ermitteln */ - channame = strtok( NULL, "," ); - continue; - } - chan = Channel_Search( channame ); - assert( chan != NULL ); - - /* Modes setzen (wenn vorhanden) */ - while( flags && *flags ) - { - Channel_UserModeAdd( chan, target, *flags ); - flags++; - } - - /* Muessen Modes an andere Server gemeldet werden? */ - strcpy( &modes[1], Channel_UserModes( chan, target )); - if( modes[1] ) modes[0] = 0x7; - else modes[0] = '\0'; - - /* An andere Server weiterleiten */ - IRC_WriteStrServersPrefix( Client, target, "JOIN :%s%s", channame, modes ); - - /* im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "JOIN :%s", channame ); - if( modes[1] ) - { - /* Modes im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, target, FALSE, "MODE %s %s :%s", channame, modes, Client_ID( target )); - } - - if( Client_Type( Client ) == CLIENT_USER ) - { - /* an Client bestaetigen */ - IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame ); - - /* Topic an Client schicken */ - topic = Channel_Topic( chan ); - if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic ); - - /* Mitglieder an Client Melden */ - IRC_Send_NAMES( Client, chan ); - IRC_WriteStrClient( Client, RPL_ENDOFNAMES_MSG, Client_ID( Client ), Channel_Name( chan )); - } - - /* naechsten Namen ermitteln */ - channame = strtok( NULL, "," ); - } - return CONNECTED; -} /* IRC_JOIN */ - - -GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req ) -{ - CLIENT *target; - CHAR *chan; - - 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 ); - - /* 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 ); - - /* Channel-Namen durchgehen */ - chan = strtok( Req->argv[0], "," ); - while( chan ) - { - if( ! Channel_Part( target, Client, chan, Req->argc > 1 ? Req->argv[1] : Client_ID( target ))) - { - /* naechsten Namen ermitteln */ - chan = strtok( NULL, "," ); - continue; - } - - /* naechsten Namen ermitteln */ - chan = strtok( NULL, "," ); - } - return CONNECTED; -} /* IRC_PART */ - - -GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req ) -{ - CHANNEL *chan; - CLIENT *from; - CHAR *topic; - - 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 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - - 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 ); - - /* Welcher Channel? */ - chan = Channel_Search( Req->argv[0] ); - if( ! chan ) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] ); - - /* Ist der User Mitglied in dem Channel? */ - if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] ); - - if( Req->argc == 1 ) - { - /* Topic erfragen */ - topic = Channel_Topic( chan ); - if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic ); - else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan )); - } - - if( strchr( Channel_Modes( chan ), 't' )) - { - /* Topic Lock. Ist der User ein Channel Operator? */ - if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); - } - - /* Topic setzen */ - Channel_SetTopic( chan, Req->argv[1] ); - Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "" ); - - /* im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); - return IRC_WriteStrClientPrefix( from, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] ); -} /* IRC_TOPIC */ - - GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req ) { CLIENT *target, *prefix; @@ -944,8 +713,8 @@ GLOBAL BOOLEAN IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) { /* 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, "@" ); + else if( strchr( Channel_UserModes( Chan, cl ), 'v' )) strcat( str, "+" ); strcat( str, Client_ID( cl )); if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 )) @@ -969,6 +738,50 @@ GLOBAL BOOLEAN IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan ) } /* IRC_Send_NAMES */ +GLOBAL BOOLEAN IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps ) +{ + BOOLEAN is_visible, is_member; + CL2CHAN *cl2chan; + CHAR flags[8]; + CLIENT *c; + + assert( Client != NULL ); + assert( Chan != NULL ); + + if( Channel_IsMemberOf( Chan, Client )) is_member = TRUE; + else is_member = FALSE; + + /* Alle Mitglieder suchen */ + cl2chan = Channel_FirstMember( Chan ); + while( cl2chan ) + { + c = Channel_GetClient( cl2chan ); + + if( strchr( Client_Modes( c ), 'i' )) is_visible = FALSE; + else is_visible = TRUE; + + if( is_member || is_visible ) + { + /* Flags zusammenbasteln */ + strcpy( flags, "H" ); + if( strchr( Client_Modes( c ), 'o' )) strcat( flags, "*" ); + if( strchr( Channel_UserModes( Chan, c ), 'o' )) strcat( flags, "@" ); + else if( strchr( Channel_UserModes( Chan, c ), 'v' )) strcat( flags, "+" ); + + /* ausgeben */ + if(( ! OnlyOps ) || ( strchr( Client_Modes( c ), 'o' ))) + { + if( ! IRC_WriteStrClient( Client, RPL_WHOREPLY_MSG, Client_ID( Client ), Channel_Name( Chan ), Client_User( c ), Client_Hostname( c ), Client_ID( Client_Introducer( c )), Client_ID( c ), flags, Client_Hops( c ), Client_Info( c ))) return DISCONNECTED; + } + } + + /* naechstes Mitglied suchen */ + cl2chan = Channel_NextMember( Chan, cl2chan ); + } + return CONNECTED; +} /* IRC_Send_WHO */ + + GLOBAL BOOLEAN IRC_Send_LUSERS( CLIENT *Client ) { INT cnt;