- CHANINFO wird auf Server-Links gesendet, wenn unterstuetzt.

[ngircd-alex.git] / src / ngircd / irc-server.c

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 743824c092272dad3f4070631fb6de88118e313e..2ed347ba9a188c67c10fcea392b5ed3a22b5148a 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -9,7 +9,7 @@
  * 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.8 2002/03/27 20:52:58 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
  */
@@ -23,16 +23,23 @@
 #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 "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;
@@ -80,12 +87,13 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
                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 )
                        {
@@ -95,7 +103,12 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
                        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|LOG_snotice, "Server \"%s\" registered (connection %d, 1 hop - direct link).", Client_ID( Client ), Client_Conn( Client ));
 
@@ -149,6 +162,13 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
                chan = Channel_First( );
                while( 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 ));
@@ -233,9 +253,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;
@@ -248,8 +269,11 @@ GLOBAL BOOLEAN 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 );
 
+       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;
@@ -296,7 +320,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];