X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=f1b817c033dd2bcdb0d84246bcc4f6b8c6d8bfa5;hb=0e4e22a7a671d1e8efbc44bffd80062191f75c38;hp=eaa4f46c436fe9b2e1e0d0e9920e5e3907db47cb;hpb=feafb6cb2e1979918d934689ac7186cf7e963663;p=ngircd-alex.git diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index eaa4f46c..f1b817c0 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2007 Alexander Barton (alex@barton.de) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,51 +14,61 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-server.c,v 1.32 2003/04/20 23:09:26 alex Exp $"; - #include "imp.h" #include #include #include #include +#include +#include "defines.h" #include "resolve.h" #include "conn.h" +#include "conn-func.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" +#include "numeric.h" #include "ngircd.h" +#include "irc-info.h" #include "exp.h" #include "irc-server.h" -GLOBAL BOOLEAN +/** + * Handler for the IRC command "SERVER". + * See RFC 2813 section 4.1.2. + */ +GLOBAL bool IRC_SERVER( CLIENT *Client, REQUEST *Req ) { - CHAR str[LINE_LEN], *ptr, *modes, *topic; - CLIENT *from, *c, *cl; - CL2CHAN *cl2chan; - INT max_hops, i; - CHANNEL *chan; - BOOLEAN ok; + char str[LINE_LEN], *ptr; + CLIENT *from, *c; + bool ok; + int i; CONN_ID con; 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 ); + /* Return an error if this is not a local 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 )); + if (Client_Type(Client) == CLIENT_GOTPASS || + Client_Type(Client) == CLIENT_GOTPASS_2813) { + /* We got a PASS command from the peer, and now a SERVER + * command: the peer tries to register itself as a server. */ + LogDebug("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 ); @@ -69,14 +79,14 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) { /* 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 ); + Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", true); return DISCONNECTED; } if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 ) { /* Falsches Passwort */ Log( LOG_ERR, "Connection %d: Got bad password from server \"%s\"!", Client_Conn( Client ), Req->argv[0] ); - Conn_Close( Client_Conn( Client ), NULL, "Bad password", TRUE ); + Conn_Close( Client_Conn( Client ), NULL, "Bad password", true); return DISCONNECTED; } @@ -94,12 +104,12 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) if( Client_Token( Client ) != TOKEN_OUTBOUND ) { /* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */ - ok = TRUE; - if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd_out, NGIRCd_ProtoID )) ok = FALSE; + ok = true; + if( ! IRC_WriteStrClient( Client, "PASS %s %s", Conf_Server[i].pwd_out, NGIRCd_ProtoID )) ok = false; else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo ); if( ! ok ) { - Conn_Close( con, "Unexpected server behavior!", NULL, FALSE ); + Conn_Close( con, "Unexpected server behavior!", NULL, false ); return DISCONNECTED; } Client_SetIntroducer( Client, Client ); @@ -112,137 +122,52 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) Client_SetToken( Client, atoi( Req->argv[1] )); } - Log( LOG_NOTICE|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), con ); + /* Mark this connection as belonging to an configured server */ + Conf_SetServer(i, con); + + /* Check protocol level */ + if (Client_Type(Client) == CLIENT_GOTPASS) { + /* We got a "simple" PASS command, so the peer is + * using the protocol as defined in RFC 1459. */ + if (! (Conn_Options(con) & CONN_RFC1459)) + Log(LOG_INFO, + "Switching connection %d (\"%s\") to RFC 1459 compatibility mode.", + con, Client_ID(Client)); + Conn_SetOption(con, CONN_RFC1459); + } - Client_SetType( Client, CLIENT_SERVER ); - Conf_SetServer( i, con ); + Client_SetType(Client, CLIENT_UNKNOWNSERVER); -#ifdef USE_ZLIB +#ifdef ZLIB /* Kompression initialisieren, wenn erforderlich */ if( strchr( Client_Flags( Client ), 'Z' )) { if( ! Zip_InitConn( con )) { /* Fehler! */ - Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, FALSE ); + Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, false ); return DISCONNECTED; } } #endif - /* maximalen Hop Count ermitteln */ - max_hops = 0; - c = Client_First( ); - while( c ) - { - if( Client_Hops( c ) > max_hops ) max_hops = Client_Hops( c ); - c = Client_Next( c ); - } - - /* Alle bisherigen Server dem neuen Server bekannt machen, - * die bisherigen Server ueber den neuen informierenn */ - for( i = 0; i < ( max_hops + 1 ); i++ ) - { - c = Client_First( ); - while( c ) - { - if(( Client_Type( c ) == CLIENT_SERVER ) && ( c != Client ) && ( c != Client_ThisServer( )) && ( Client_Hops( c ) == i )) - { - 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_Hops( c ) == 1 ? Client_ThisServer( ) : 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 ); - } - - /* Channels dem neuen Server bekannt machen */ - chan = Channel_First( ); - while( chan ) - { #ifdef IRCPLUS - /* Send CHANINFO if the peer supports it */ - if( strchr( Client_Flags( Client ), 'C' )) - { - 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; - } - } - } + if (strchr(Client_Flags(Client), 'H')) { + LogDebug("Peer supports IRC+ extended server handshake ..."); + if (!IRC_Send_ISUPPORT(Client)) + return DISCONNECTED; + return IRC_WriteStrClient(Client, RPL_ENDOFMOTD_MSG, + Client_ID(Client)); + } else { #endif - - /* alle Member suchen */ - cl2chan = Channel_FirstMember( chan ); - snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan )); - while( cl2chan ) - { - cl = Channel_GetClient( cl2chan ); - assert( cl != NULL ); - - /* Nick, ggf. mit Modes, anhaengen */ - if( str[strlen( str ) - 1] != ':' ) strlcat( str, ",", sizeof( str )); - if( strchr( Channel_UserModes( chan, cl ), 'v' )) strlcat( str, "+", sizeof( str )); - if( strchr( Channel_UserModes( chan, cl ), 'o' )) strlcat( str, "@", sizeof( str )); - strlcat( str, Client_ID( cl ), sizeof( str )); - - if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 8 )) - { - /* Zeile senden */ - if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; - snprintf( str, sizeof( str ), "NJOIN %s :", Channel_Name( chan )); - } - - cl2chan = Channel_NextMember( chan, cl2chan ); - } - - /* noch Daten da? */ - if( str[strlen( str ) - 1] != ':') - { - /* Ja; Also senden ... */ - if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; - } - - /* naechsten Channel suchen */ - chan = Channel_Next( chan ); + if (Conf_MaxNickLength != CLIENT_NICK_LEN_DEFAULT) + Log(LOG_CRIT, + "Attention: this server uses a non-standard nick length, but the peer doesn't support the IRC+ extended server handshake!"); +#ifdef IRCPLUS } - - return CONNECTED; +#endif + + return IRC_Num_ENDOFMOTD(Client, Req); } else if( Client_Type( Client ) == CLIENT_SERVER ) { @@ -263,17 +188,17 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) { /* Hm, Server, der diesen einfuehrt, ist nicht bekannt!? */ Log( LOG_ALERT, "Unknown ID in prefix of SERVER: \"%s\"! (on connection %d)", Req->prefix, Client_Conn( Client )); - Conn_Close( Client_Conn( Client ), NULL, "Unknown ID in prefix of SERVER", TRUE ); + Conn_Close( Client_Conn( Client ), NULL, "Unknown ID in prefix of SERVER", true); return DISCONNECTED; } /* Neue Client-Struktur anlegen */ - c = Client_NewRemoteServer( Client, Req->argv[0], from, atoi( Req->argv[1] ), atoi( Req->argv[2] ), ptr, TRUE ); + c = Client_NewRemoteServer( Client, Req->argv[0], from, 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 ); + Conn_Close( Client_Conn( Client ), NULL, "Can't allocate client structure for remote server", true); return DISCONNECTED; } @@ -286,16 +211,17 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req ) IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c )); return CONNECTED; - } - else return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + } else + return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, + Client_ID(Client), Req->command); } /* IRC_SERVER */ -GLOBAL BOOLEAN +GLOBAL bool IRC_NJOIN( CLIENT *Client, REQUEST *Req ) { - CHAR nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8]; - BOOLEAN is_op, is_voiced; + char nick_in[COMMAND_LEN], nick_out[COMMAND_LEN], *channame, *ptr, modes[8]; + bool is_op, is_voiced; CHANNEL *chan; CLIENT *c; @@ -312,13 +238,13 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) ptr = strtok( nick_in, "," ); while( ptr ) { - is_op = is_voiced = FALSE; + is_op = is_voiced = false; /* Prefixe abschneiden */ while(( *ptr == '@' ) || ( *ptr == '+' )) { - if( *ptr == '@' ) is_op = TRUE; - if( *ptr == '+' ) is_voiced = TRUE; + if( *ptr == '@' ) is_op = true; + if( *ptr == '+' ) is_voiced = true; ptr++; } @@ -333,17 +259,19 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) if( is_voiced ) Channel_UserModeAdd( chan, c, 'v' ); /* im Channel bekannt machen */ - IRC_WriteStrChannelPrefix( Client, chan, c, FALSE, "JOIN :%s", channame ); + IRC_WriteStrChannelPrefix( Client, chan, c, false, "JOIN :%s", channame ); /* Channel-User-Modes setzen */ 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 )); + 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 ); @@ -359,11 +287,11 @@ IRC_NJOIN( CLIENT *Client, REQUEST *Req ) } /* IRC_NJOIN */ -GLOBAL BOOLEAN +GLOBAL bool IRC_SQUIT( CLIENT *Client, REQUEST *Req ) { CLIENT *target; - CHAR msg[LINE_LEN + 64]; + char msg[LINE_LEN + 64]; assert( Client != NULL ); assert( Req != NULL ); @@ -391,14 +319,14 @@ IRC_SQUIT( CLIENT *Client, REQUEST *Req ) if( Client_Conn( target ) > NONE ) { /* dieser Server hat die Connection */ - if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), msg, Req->argv[1], TRUE ); - else Conn_Close( Client_Conn( target ), msg, NULL, TRUE ); + if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), msg, Req->argv[1], true); + else Conn_Close( Client_Conn( target ), msg, NULL, true); return DISCONNECTED; } else { /* Verbindung hielt anderer Server */ - Client_Destroy( target, msg, Req->argv[1], FALSE ); + Client_Destroy( target, msg, Req->argv[1], false ); return CONNECTED; } } /* IRC_SQUIT */