X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-server.c;h=743824c092272dad3f4070631fb6de88118e313e;hb=20a2ffef88a426c0531eb6d08718e6ca19bdacc8;hp=bb01dcd256e158dc4e7f8a2ac9cd58d6cbac68fc;hpb=50ec7a56a4e75dad25b20fdb904545143ac19ff3;p=ngircd-alex.git

diff --git a/src/ngircd/irc-server.c b/src/ngircd/irc-server.c
index bb01dcd2..743824c0 100644
--- a/src/ngircd/irc-server.c
+++ b/src/ngircd/irc-server.c
@@ -9,29 +9,15 @@
  * 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.4 2002/03/11 22:04:10 alex Exp $
+ * $Id: irc-server.c,v 1.8 2002/03/27 20:52:58 alex Exp $
  *
  * irc-server.c: IRC-Befehle fuer Server-Links
- *
- * $Log: irc-server.c,v $
- * Revision 1.4  2002/03/11 22:04:10  alex
- * - Client_Destroy() hat neuen Paramter: QUITs fuer Clients verschicken?
- *
- * Revision 1.3  2002/03/11 17:33:40  alex
- * - Log-Level von SQUIT und QUIT bei unbekannten Clients auf DEBUG herabgesetzt.
- *
- * Revision 1.2  2002/03/06 15:50:14  alex
- * - kleine Code-Umstellungen.
- *
- * 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>
@@ -42,7 +28,7 @@
 #include "log.h"
 #include "messages.h"
 
-#include <exp.h>
+#include "exp.h"
 #include "irc-server.h"
 
 
@@ -111,7 +97,7 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Req )
 		}
 		else  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 );
 
@@ -214,7 +200,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!? */
@@ -236,7 +222,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 ));
@@ -276,7 +262,7 @@ GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 			ptr++;
 		}
 
-		c = Client_GetFromID( ptr );
+		c = Client_Search( ptr );
 		if( c )
 		{
 			Channel_Join( c, channame );
@@ -329,11 +315,11 @@ GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 	/* 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. */
-		Log( LOG_DEBUG, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
+		Log( LOG_WARNING, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
 		return CONNECTED;
 	}