- Weitere Anpassungen an pre-ANSI-Compiler.

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 743824c092272dad3f4070631fb6de88118e313e..3cefaa1b50b3766d6e9b8cfb174fb5277a6fcf67 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.11 2002/05/30 16:52:21 alex Exp $
  *
  * irc-server.c: IRC-Befehle fuer Server-Links
  */
@@ -23,16 +23,22 @@
 #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 "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 +86,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, PASSSERVERADD )) ok = FALSE;
                        else ok = IRC_WriteStrClient( Client, "SERVER %s 1 :%s", Conf_ServerName, Conf_ServerInfo );
                        if( ! ok )
                        {
@@ -95,7 +102,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 ));
 
@@ -233,7 +245,8 @@ 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];
        BOOLEAN is_op, is_voiced;
@@ -296,7 +309,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];