X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=72d5b029287bd23c97d82154ce4d0ebfa135b70d;hb=9919f38dae7e186ad7b34c0fad7e103b043920d6;hp=36c55433f3c20a1f288988494488d3ad9e3314cc;hpb=e1a1e7ecf424fdfa37db03dd5dc6ebb7f2555753;p=ngircd-alex.git diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c index 36c55433..72d5b029 100644 --- a/src/ngircd/irc.c +++ b/src/ngircd/irc.c @@ -9,11 +9,41 @@ * 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.55 2002/02/12 14:40:37 alex Exp $ + * $Id: irc.c,v 1.64 2002/02/19 20:06:45 alex Exp $ * * irc.c: IRC-Befehle * * $Log: irc.c,v $ + * Revision 1.64 2002/02/19 20:06:45 alex + * - User-Registrierung wird nicht mehr als Nick-Aenderung protokolliert, + * - VERSION liefert nun doch wieder den Debug-Status im Reply. + * + * Revision 1.63 2002/02/19 02:21:17 alex + * - der Debug-Level wird bei VERSION nicht mehr geliefert. Grund: a) absolut + * unnoetig und b) Compiler-Fehler, wenn ohne Debug-Code configure'd ;-)) + * + * Revision 1.62 2002/02/17 23:38:58 alex + * - neuer IRC-Befehl VERSION implementiert: IRC_VERSION(). + * + * Revision 1.61 2002/02/17 19:03:12 alex + * - NICK-Aenderungen wurden dem User selber mit dem falschen Prefix geliefert. + * + * Revision 1.60 2002/02/17 17:43:14 alex + * - Fehlerhafte Modes werden nun ausfuehrlicher an den Client gemeldet. + * + * Revision 1.59 2002/02/17 17:30:21 alex + * - NICK-Aenderungen werden an alle Server und betroffene Clients gemeldet. + * - Neue Funktion IRC_WriteStrRelatedPrefix(). + * + * Revision 1.58 2002/02/17 17:18:59 alex + * - NICK korrigiert. + * + * Revision 1.57 2002/02/13 23:05:29 alex + * - Nach Connect eines Users werden LUSERS-Informationen angezeigt. + * + * Revision 1.56 2002/02/13 17:52:27 alex + * - es werden nun Channel- und User-Modes von Usern angenommen. + * * Revision 1.55 2002/02/12 14:40:37 alex * - via NJOIN gemeldete Benutzer wurden nicht in Channels bekannt gemacht. * @@ -249,6 +279,7 @@ LOCAL BOOLEAN Show_MOTD( CLIENT *Client ); LOCAL VOID Kill_Nick( CHAR *Nick ); LOCAL BOOLEAN Send_NAMES( CLIENT *Client, CHANNEL *Chan ); +LOCAL BOOLEAN Send_LUSERS( CLIENT *Client ); GLOBAL VOID IRC_Init( VOID ) @@ -319,10 +350,10 @@ GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remot GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ) { CHAR buffer[1000]; - BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED, i; + BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED; CL2CHAN *cl2chan; CLIENT *c; - INT s; + INT s, i; va_list ap; assert( Client != NULL ); @@ -415,6 +446,74 @@ GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *F } /* IRC_WriteStrServersPrefix */ +GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ) +{ + BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED; + CL2CHAN *chan_cl2chan, *cl2chan; + CHAR buffer[1000]; + CHANNEL *chan; + va_list ap; + CLIENT *c; + INT i, s; + + assert( Client != NULL ); + assert( Prefix != NULL ); + assert( Format != NULL ); + + va_start( ap, Format ); + vsnprintf( buffer, 1000, Format, ap ); + va_end( ap ); + + /* initialisieren */ + for( i = 0; i < MAX_CONNECTIONS; i++ ) sock[i] = FALSE; + + /* An alle Clients, die in einem Channel mit dem "Ausloeser" sind, + * den Text schicken. An Remote-Server aber jeweils nur einmal. */ + chan_cl2chan = Channel_FirstChannelOf( Client ); + while( chan_cl2chan ) + { + /* Channel des Users durchsuchen */ + chan = Channel_GetChannel( chan_cl2chan ); + cl2chan = Channel_FirstMember( chan ); + while( cl2chan ) + { + c = Channel_GetClient( cl2chan ); + if( ! Remote ) + { + if( Client_Conn( c ) <= NONE ) c = NULL; + else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL; + } + if( c ) c = Client_NextHop( c ); + + if( c && ( c != Client )) + { + /* Ok, anderer Client */ + s = Client_Conn( c ); + assert( s >= 0 ); + assert( s < MAX_CONNECTIONS ); + sock[s] = TRUE; + } + cl2chan = Channel_NextMember( chan, cl2chan ); + } + + /* naechsten Channel */ + chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); + } + + /* Senden ... */ + for( i = 0; i < MAX_CONNECTIONS; i++ ) + { + if( sock[i] ) + { + ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer ); + if( ! ok ) break; + } + } + return ok; +} /* IRC_WriteStrRelatedPrefix */ + + + GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req ) { assert( Client != NULL ); @@ -767,19 +866,11 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) 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_WriteStrClient( 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, target, "NICK :%s", Req->argv[0] ); - } + /* Nick-Aenderung: allen mitteilen! */ + + if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] ); + IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] ); + IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] ); /* Client-Nick registrieren */ Client_SetID( target, Req->argv[0] ); @@ -791,6 +882,8 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req ) if( Client_Type( Client ) == CLIENT_GOTUSER ) return Hello_User( Client ); else Client_SetType( Client, CLIENT_GOTNICK ); } + else Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] ); + return CONNECTED; } else if( Client_Type( Client ) == CLIENT_SERVER ) @@ -1233,7 +1326,7 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) break; default: Log( LOG_DEBUG, "Unknown mode \"%c%c\" from \"%s\"!?", set ? '+' : '-', *mode_ptr, Client_ID( Client )); - ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); + ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr ); x[0] = '\0'; } } @@ -1253,9 +1346,17 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) /* Channel-User-Modes */ switch( *mode_ptr ) { + case 'o': + /* Channel Operator */ + x[0] = 'o'; + break; + case 'v': + /* Voice */ + x[0] = 'v'; + break; default: Log( LOG_DEBUG, "Unknown channel-user-mode \"%c%c\" from \"%s\" on \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Client_ID( chan_cl ), Channel_Name( chan )); - ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); + ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr ); x[0] = '\0'; } } @@ -1264,9 +1365,37 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req ) /* Channel-Modes */ switch( *mode_ptr ) { + case 'a': + /* Anonymous */ + x[0] = 'a'; + break; + case 'm': + /* Moderated */ + x[0] = 'm'; + break; + case 'n': + /* kein Schreiben in den Channel von aussen */ + x[0] = 'n'; + break; + case 'p': + /* Private */ + x[0] = 'p'; + break; + case 'q': + /* Quite */ + x[0] = 'q'; + break; + case 's': + /* Secret */ + x[0] = 's'; + break; + case 't': + /* Topic Lock */ + x[0] = 't'; + break; default: Log( LOG_DEBUG, "Unknown channel-mode \"%c%c\" from \"%s\" at %s!?", set ? '+' : '-', *mode_ptr, Client_ID( Client ), Channel_Name( chan )); - ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG_MSG, Client_ID( Client )); + ok = IRC_WriteStrClient( Client, ERR_UMODEUNKNOWNFLAG2_MSG, Client_ID( Client ), set ? '+' : '-', *mode_ptr ); x[0] = '\0'; } } @@ -1708,7 +1837,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 ); @@ -1736,28 +1864,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; + Send_LUSERS( target ); return CONNECTED; } /* IRC_LUSERS */ @@ -1943,6 +2050,32 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req ) } /* IRC_PART */ +GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req ) +{ + CLIENT *target; + + assert( Client != NULL ); + assert( Req != NULL ); + + /* 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( ); + + /* An anderen Server weiterleiten? */ + if( target != Client_ThisServer( )) + { + if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] ); + IRC_WriteStrClientPrefix( Client_NextHop( target ), Client, "VERSION %s", Req->argv[0] ); + return CONNECTED; + } + + return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( Client ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( )); +} /* IRC_VERSION */ + + LOCAL BOOLEAN Hello_User( CLIENT *Client ) { assert( Client != NULL ); @@ -1968,7 +2101,10 @@ LOCAL BOOLEAN Hello_User( CLIENT *Client ) Client_SetType( Client, CLIENT_USER ); - return Show_MOTD( Client ); + if( ! Send_LUSERS( Client )) return DISCONNECTED; + if( ! Show_MOTD( Client )) return DISCONNECTED; + + return CONNECTED; } /* Hello_User */ @@ -2059,4 +2195,37 @@ LOCAL BOOLEAN Send_NAMES( CLIENT *Client, CHANNEL *Chan ) } /* Send_NAMES */ +LOCAL BOOLEAN Send_LUSERS( CLIENT *Client ) +{ + 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; +} /* Send_LUSERS */ + + /* -eof- */