* Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
* der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
*
- * $Id: irc-server.c,v 1.1 2002/03/03 17:15:11 alex Exp $
+ * $Id: irc-server.c,v 1.16 2002/09/03 23:55:44 alex Exp $
*
* irc-server.c: IRC-Befehle fuer Server-Links
- *
- * $Log: irc-server.c,v $
- * Revision 1.1 2002/03/03 17:15:11 alex
- * - Source in weitere Module fuer IRC-Befehle aufgesplitted.
- *
*/
-#include <portab.h>
-#include "global.h"
+#include "portab.h"
-#include <imp.h>
+#include "imp.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#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 "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;
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)? */
+ 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, NGIRCd_ProtoID )) ok = FALSE;
else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
if( ! ok )
{
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 ), Client_Conn( Client ));
Client_SetType( Client, CLIENT_SERVER );
chan = Channel_First( );
while( chan )
{
- sprintf( str, "NJOIN %s :", Channel_Name( chan ));
-
+ /* 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;
+ }
+
/* alle Member suchen */
cl2chan = Channel_FirstMember( chan );
+ sprintf( str, "NJOIN %s :", Channel_Name( chan ));
while( cl2chan )
{
cl = Channel_GetClient( cl2chan );
if( strchr( Channel_UserModes( chan, cl ), 'o' )) strcat( str, "@" );
strcat( str, Client_ID( cl ));
- if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
+ if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 8 ))
{
/* Zeile senden */
if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
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!? */
/* 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 ));
} /* 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;
/* Falsche Anzahl Parameter? */
if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+ strncpy( str, Req->argv[1], COMMAND_LEN - 1 );
+ str[COMMAND_LEN - 1] = '\0';
+
channame = Req->argv[0];
- ptr = strtok( Req->argv[1], "," );
+ ptr = strtok( str, "," );
while( ptr )
{
is_op = is_voiced = FALSE;
ptr++;
}
- c = Client_GetFromID( ptr );
+ c = Client_Search( ptr );
if( c )
{
Channel_Join( c, channame );
} /* 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];
/* 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 )
{
- Log( LOG_ERR, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
+ /* Den Server kennen wir nicht (mehr), also nichts zu tun. */
+ Log( LOG_WARNING, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
return CONNECTED;
}
else
{
/* Verbindung hielt anderer Server */
- Client_Destroy( target, msg, Req->argv[1] );
+ Client_Destroy( target, msg, Req->argv[1], FALSE );
return CONNECTED;
}
} /* IRC_SQUIT */
projects / ngircd-alex.git / blobdiff