X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=93ae5ee174bf13ed3b2e6317647f7208a4610087;hp=db5772086ae2f8e7ff6274424e13068c42125470;hb=695631b2984111a825346396dc56635a2fe3a7c4;hpb=ca33cbda05902b0009058d369f88c0a7a43b1bbe diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c index db577208..93ae5ee1 100644 --- a/src/ngircd/irc-server.c +++ b/src/ngircd/irc-server.c @@ -2,37 +2,43 @@ * ngIRCd -- The Next Generation IRC Daemon * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) * - * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen - * der GNU General Public License (GPL), wie von der Free Software Foundation - * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2 - * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version. - * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste - * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * Please read the file COPYING, README and AUTHORS for more information. * - * $Id: irc-server.c,v 1.6 2002/03/12 14:37:52 alex Exp $ - * - * irc-server.c: IRC-Befehle fuer Server-Links + * IRC commands for server links */ #include "portab.h" +static char UNUSED id[] = "$Id: irc-server.c,v 1.27 2002/12/26 17:04:54 alex Exp $"; + #include "imp.h" #include #include #include #include +#include "resolve.h" #include "conf.h" +#include "conn.h" +#include "client.h" +#include "channel.h" #include "irc-write.h" #include "log.h" #include "messages.h" +#include "parse.h" +#include "ngircd.h" #include "exp.h" #include "irc-server.h" -GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_SERVER( CLIENT *Client, REQUEST *Req ) { CHAR str[LINE_LEN], *ptr; CLIENT *from, *c, *cl; @@ -40,6 +46,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) INT max_hops, i; CHANNEL *chan; BOOLEAN ok; + CONN_ID con; assert( Client != NULL ); assert( Req != NULL ); @@ -64,10 +71,10 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) Conn_Close( Client_Conn( Client ), NULL, "Server not configured here", TRUE ); return DISCONNECTED; } - if( strcmp( Client_Password( Client ), Conf_Server[i].pwd ) != 0 ) + if( strcmp( Client_Password( Client ), Conf_Server[i].pwd_in ) != 0 ) { /* Falsches Passwort */ - Log( LOG_ERR, "Connection %d: Bad password for server \"%s\"!", Client_Conn( Client ), Req->argv[0] ); + 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 ); return DISCONNECTED; } @@ -79,27 +86,48 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) 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 ) + + /* Meldet sich der Server bei uns an (d.h., bauen nicht wir + * selber die Verbindung zu einem anderen Server auf)? */ + con = Client_Conn( Client ); + if( Client_Token( Client ) != TOKEN_OUTBOUND ) { - /* Unseren SERVER- und PASS-Befehl senden */ + /* Eingehende Verbindung: Unseren SERVER- und PASS-Befehl senden */ ok = TRUE; - if( ! IRC_WriteStrClient( Client, "PASS %s "PASSSERVERADD, Conf_Server[i].pwd )) ok = FALSE; + 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( Client_Conn( Client ), "Unexpected server behavior!", NULL, FALSE ); + Conn_Close( con, "Unexpected server behavior!", NULL, FALSE ); return DISCONNECTED; } Client_SetIntroducer( Client, Client ); Client_SetToken( Client, 1 ); } - else Client_SetToken( Client, atoi( Req->argv[1] )); + else + { + /* Ausgehende verbindung, SERVER und PASS wurden von uns bereits + * an die Gegenseite uerbermittelt */ + 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 )); + 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 ); + +#ifdef USE_ZLIB + /* Kompression initialisieren, wenn erforderlich */ + if( strchr( Client_Flags( Client ), 'Z' )) + { + if( ! Conn_InitZip( con )) + { + /* Fehler! */ + Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, FALSE ); + return DISCONNECTED; + } + } +#endif /* maximalen Hop Count ermitteln */ max_hops = 0; @@ -149,6 +177,15 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) chan = Channel_First( ); while( chan ) { +#ifdef IRCPLUS + /* Wenn unterstuetzt, CHANINFO senden */ + 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; + } +#endif + /* alle Member suchen */ cl2chan = Channel_FirstMember( chan ); sprintf( str, "NJOIN %s :", Channel_Name( chan )); @@ -158,15 +195,15 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) assert( cl != NULL ); /* Nick, ggf. mit Modes, 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( 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, str )) return DISCONNECTED; + if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; sprintf( str, "NJOIN %s :", Channel_Name( chan )); } @@ -177,7 +214,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) if( str[strlen( str ) - 1] != ':') { /* Ja; Also senden ... */ - if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED; + if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED; } /* naechsten Channel suchen */ @@ -200,7 +237,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) ptr = strchr( Req->argv[3] + 2, '[' ); if( ! ptr ) ptr = Req->argv[3]; - from = Client_GetFromID( Req->prefix ); + from = Client_Search( Req->prefix ); if( ! from ) { /* Hm, Server, der diesen einfuehrt, ist nicht bekannt!? */ @@ -222,7 +259,7 @@ GLOBAL BOOLEAN 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 )); 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": "" ); + 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": "" ); /* Andere Server informieren */ IRC_WriteStrServersPrefix( Client, from, "SERVER %s %d %d :%s", Client_ID( c ), Client_Hops( c ) + 1, Client_MyToken( c ), Client_Info( c )); @@ -233,9 +270,10 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req ) } /* IRC_SERVER */ -GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_NJOIN( CLIENT *Client, REQUEST *Req ) { - CHAR *channame, *ptr, modes[8]; + CHAR str[COMMAND_LEN], *channame, *ptr, modes[8]; BOOLEAN is_op, is_voiced; CHANNEL *chan; CLIENT *c; @@ -243,13 +281,13 @@ 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 )); - /* 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 )); + channame = Req->argv[0]; - ptr = strtok( Req->argv[1], "," ); + ptr = strtok( str, "," ); while( ptr ) { is_op = is_voiced = FALSE; @@ -262,7 +300,7 @@ GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req ) ptr++; } - c = Client_GetFromID( ptr ); + c = Client_Search( ptr ); if( c ) { Channel_Join( c, channame ); @@ -276,7 +314,7 @@ GLOBAL BOOLEAN 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 */ @@ -296,7 +334,8 @@ GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req ) } /* IRC_NJOIN */ -GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req ) +GLOBAL BOOLEAN +IRC_SQUIT( CLIENT *Client, REQUEST *Req ) { CLIENT *target; CHAR msg[LINE_LEN + 64]; @@ -304,18 +343,12 @@ GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req ) 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 ); Log( LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID( Client ), Req->argv[0], Req->argv[1] ); - /* SQUIT an alle Server weiterleiten */ - IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] ); - - target = Client_GetFromID( Req->argv[0] ); + target = Client_Search( Req->argv[0] ); if( ! target ) { /* Den Server kennen wir nicht (mehr), also nichts zu tun. */