X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=72ca92bbcb28df7a802850dfe090a7d1d0780fa2;hb=a49a580a778d3ac194439c8fa14e7dc915b7b2b0;hp=6a6f4712febfcfc632a22f27aa111dcf7c289cae;hpb=6626395c88fc46eeb110942b17eb9245a1d0021b;p=ngircd-alex.git diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index 6a6f4712..72ca92bb 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -14,20 +14,24 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-server.c,v 1.26 2002/12/26 16:48:14 alex Exp $"; +static char UNUSED id[] = "$Id: irc-server.c,v 1.37 2004/05/11 00:01:11 alex Exp $"; #include "imp.h" #include #include #include #include +#include +#include "defines.h" #include "resolve.h" -#include "conf.h" #include "conn.h" +#include "conn-zip.h" +#include "conf.h" #include "client.h" #include "channel.h" #include "irc-write.h" +#include "lists.h" #include "log.h" #include "messages.h" #include "parse.h" @@ -40,7 +44,7 @@ static char UNUSED id[] = "$Id: irc-server.c,v 1.26 2002/12/26 16:48:14 alex Exp GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) { - CHAR str[LINE_LEN], *ptr; + CHAR str[LINE_LEN], *ptr, *modes, *topic; CLIENT *from, *c, *cl; CL2CHAN *cl2chan; INT max_hops, i; @@ -63,8 +67,8 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) 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 ) + for( i = 0; i < MAX_SERVERS; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break; + if( i >= MAX_SERVERS ) { /* Server ist nicht konfiguriert! */ Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] ); @@ -114,13 +118,13 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), con ); Client_SetType( Client, CLIENT_SERVER ); - Conn_SetServer( con, i ); + Conf_SetServer( i, con ); -#ifdef USE_ZLIB +#ifdef ZLIB /* Kompression initialisieren, wenn erforderlich */ if( strchr( Client_Flags( Client ), 'Z' )) { - if( ! Conn_InitZip( con )) + if( ! Zip_InitConn( con )) { /* Fehler! */ Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, FALSE ); @@ -178,17 +182,40 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) while( chan ) { #ifdef IRCPLUS - /* Wenn unterstuetzt, CHANINFO senden */ + /* Send CHANINFO if the peer supports it */ if( strchr( Client_Flags( Client ), 'C' )) { - /* CHANINFO senden */ - if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), Channel_Modes( chan ), Channel_Topic( chan ))) return DISCONNECTED; +#ifdef DEBUG + Log( LOG_DEBUG, "Sending CHANINFO commands ..." ); +#endif + modes = Channel_Modes( chan ); + topic = Channel_Topic( chan ); + + if( *modes || *topic ) + { + /* send CHANINFO */ + if(( ! strchr( Channel_Modes( chan ), 'k' )) && ( ! strchr( Channel_Modes( chan ), 'l' )) && ( ! *topic )) + { + /* "CHANINFO +" */ + if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s", Channel_Name( chan ), modes )) return DISCONNECTED; + } + else if(( ! strchr( Channel_Modes( chan ), 'k' )) && ( ! strchr( Channel_Modes( chan ), 'l' ))) + { + /* "CHANINFO + :" */ + if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s :%s", Channel_Name( chan ), modes, topic )) return DISCONNECTED; + } + else + { + /* "CHANINFO + :" */ + if( ! IRC_WriteStrClient( Client, "CHANINFO %s +%s %s %ld :%s", Channel_Name( chan ), modes, strchr( Channel_Modes( chan ), 'k' ) ? Channel_Key( chan ) : "*", strchr( Channel_Modes( chan ), 'l' ) ? Channel_MaxUsers( chan ) : 0L, topic )) return DISCONNECTED; + } + } } #endif /* alle Member suchen */ cl2chan = Channel_FirstMember( chan ); - sprintf( str, "NJOIN %s :", Channel_Name( chan )); + snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan )); while( cl2chan ) { cl = Channel_GetClient( cl2chan ); @@ -204,7 +231,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) { /* Zeile senden */ if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; - sprintf( str, "NJOIN %s :", Channel_Name( chan )); + snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan )); } cl2chan = Channel_NextMember( chan, cl2chan ); @@ -217,6 +244,18 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; } +#ifdef IRCPLUS + if( strchr( Client_Flags( Client ), 'L' )) + { +#ifdef DEBUG + Log( LOG_DEBUG, "Synchronizing INVITE- and BAN-lists ..." ); +#endif + /* Synchronize INVITE- and BAN-lists */ + if( ! Lists_SendInvites( Client )) return DISCONNECTED; + if( ! Lists_SendBans( Client )) return DISCONNECTED; + } +#endif + /* naechsten Channel suchen */ chan = Channel_Next( chan ); } @@ -257,7 +296,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) } /* Log-Meldung zusammenbauen und ausgeben */ - if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) sprintf( str, "connected to %s, ", Client_ID( from )); + if(( Client_Hops( c ) > 1 ) && ( Req->prefix[0] )) snprintf( str, sizeof( str ), "connected to %s, ", Client_ID( from )); else strcpy( str, "" ); Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (via %s, %s%d hop%s).", Client_ID( c ), Client_ID( Client ), str, Client_Hops( c ), Client_Hops( c ) > 1 ? "s": "" ); @@ -273,7 +312,7 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req ) { - CHAR str[COMMAND_LEN], *channame, *ptr, modes[8]; + CHAR nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8]; BOOLEAN is_op, is_voiced; CHANNEL *chan; CLIENT *c; @@ -284,10 +323,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) /* Falsche Anzahl Parameter? */ if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); - strlcpy( str, Req->argv[1], sizeof( str )); + strlcpy( nick_in, Req->argv[1], sizeof( nick_in )); + strcpy( nick_out, "" ); channame = Req->argv[0]; - ptr = strtok( str, "," ); + ptr = strtok( nick_in, "," ); while( ptr ) { is_op = is_voiced = FALSE; @@ -314,12 +354,17 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame ); /* Channel-User-Modes setzen */ - strcpy( modes, Channel_UserModes( chan, c )); + strlcpy( modes, Channel_UserModes( chan, c ), sizeof( modes )); if( modes[0] ) { /* Modes im Channel bekannt machen */ IRC_WriteStrChannelPrefix( Client, chan, Client, FALSE, "MODE %s +%s %s", channame, modes, Client_ID( c )); } + + if( nick_out[0] != '\0' ) strlcat( nick_out, ",", sizeof( nick_out )); + if( is_op ) strlcat( nick_out, "@", sizeof( nick_out )); + if( is_voiced ) strlcat( nick_out, "+", sizeof( nick_out )); + strlcat( nick_out, ptr, sizeof( nick_out )); } else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, channame ); @@ -328,7 +373,7 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) } /* an andere Server weiterleiten */ - IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], Req->argv[1] ); + if( nick_out[0] != '\0' ) IRC_WriteStrServersPrefix( Client, Client_ThisServer( ), "NJOIN %s :%s", Req->argv[0], nick_out ); return CONNECTED; } /* IRC_NJOIN */ @@ -359,9 +404,9 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req ) if( Req->argv[1][0] ) { if( strlen( Req->argv[1] ) > LINE_LEN ) Req->argv[1][LINE_LEN] = '\0'; - sprintf( msg, "%s (SQUIT from %s).", Req->argv[1], Client_ID( Client )); + snprintf( msg, sizeof( msg ), "%s (SQUIT from %s).", Req->argv[1], Client_ID( Client )); } - else sprintf( msg, "Got SQUIT from %s.", Client_ID( Client )); + else snprintf( msg, sizeof( msg ), "Got SQUIT from %s.", Client_ID( Client )); if( Client_Conn( target ) > NONE ) {