- Renamed functions now found in "conn-zip.c".

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

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index 60f75659134d3994dea6eacf15acc75a53b0091c..99b5cb095bae2a481bc10c56327adfe1342f4ed8 100644 (file)
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -14,7 +14,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-server.c,v 1.28 2002/12/26 17:14:48 alex Exp $";
+static char UNUSED id[] = "$Id: irc-server.c,v 1.30 2002/12/30 16:07:50 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -23,8 +23,9 @@ static char UNUSED id[] = "$Id: irc-server.c,v 1.28 2002/12/26 17:14:48 alex Exp
 #include <string.h>
 
 #include "resolve.h"
-#include "conf.h"
 #include "conn.h"
+#include "conn-zip.h"
+#include "conf.h"
 #include "client.h"
 #include "channel.h"
 #include "irc-write.h"
@@ -63,8 +64,8 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                if(( Req->argc != 2 ) && ( Req->argc != 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
                /* Ist dieser Server bei uns konfiguriert? */
-               for( i = 0; i < Conf_Server_Count; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
-               if( i >= Conf_Server_Count )
+               for( i = 0; i < MAX_SERVERS; i++ ) if( strcasecmp( Req->argv[0], Conf_Server[i].name ) == 0 ) break;
+               if( i >= MAX_SERVERS )
                {
                        /* Server ist nicht konfiguriert! */
                        Log( LOG_ERR, "Connection %d: Server \"%s\" not configured here!", Client_Conn( Client ), Req->argv[0] );
@@ -114,13 +115,13 @@ IRC_SERVER( CLIENT *Client, REQUEST *Req )
                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 );
+               Conf_SetServer( i, con );
 
 #ifdef USE_ZLIB
                /* Kompression initialisieren, wenn erforderlich */
                if( strchr( Client_Flags( Client ), 'Z' ))
                {
-                       if( ! Conn_InitZip( con ))
+                       if( ! Zip_InitConn( con ))
                        {
                                /* Fehler! */
                                Conn_Close( con, "Can't inizialize compression (zlib)!", NULL, FALSE );