- Log-Meldungen bei SQUIT erneut ueberarbeitet ...

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 889ab5383dc2ba0ec2f5bab6d222f24a78a9fc03..d664d954aa2d73c6542c87e2c435f2ba5448d223 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,17 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.71 2002/02/27 00:50:05 alex Exp $
+ * $Id: irc.c,v 1.73 2002/02/27 03:08:05 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.73  2002/02/27 03:08:05  alex
+ * - Log-Meldungen bei SQUIT erneut ueberarbeitet ...
+ *
+ * Revision 1.72  2002/02/27 02:26:58  alex
+ * - SQUIT wird auf jeden Fall geforwarded, zudem besseres Logging.
+ *
  * Revision 1.71  2002/02/27 00:50:05  alex
  * - einige unnoetige Client_NextHop()-Aufrufe entfernt.
  * - NAMES korrigiert und komplett implementiert.
@@ -1045,6 +1051,7 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
 GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target;
+       CHAR msg[LINE_LEN + 64];
        
        assert( Client != NULL );
        assert( Req != NULL );
@@ -1055,30 +1062,34 @@ GLOBAL BOOLEAN IRC_SQUIT( CLIENT *Client, REQUEST *Req )
        /* Falsche Anzahl Parameter? */
        if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
+       Log( LOG_DEBUG, "Got SQUIT from %s for \"%s\": \"%s\" ...", Client_ID( Client ), Req->argv[0], Req->argv[1] );
+       
+       /* SQUIT an alle Server weiterleiten */
+       IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] );
+
        target = Client_GetFromID( Req->argv[0] );
        if( ! target )
        {
-               Log( LOG_ERR, "Got SQUIT from %s for unknown server \%s\"!?", Client_ID( Client ), Req->argv[0] );
+               Log( LOG_ERR, "Got SQUIT from %s for unknown server \"%s\"!?", Client_ID( Client ), Req->argv[0] );
                return CONNECTED;
        }
 
-       if( target == Client ) Log( LOG_DEBUG, "Got SQUIT from %s: %s", Client_ID( Client ), Req->argv[1] );
-       else Log( LOG_DEBUG, "Got SQUIT from %s for %s: %s", Client_ID( Client ), Client_ID( target ), Req->argv[1] );
-
-       /* SQUIT an alle Server weiterleiten */
-       IRC_WriteStrServers( Client, "SQUIT %s :%s", Req->argv[0], Req->argv[1] );
-
-       if( Client_Conn( target ) > NONE )
+       if( Req->argv[1][0] )
        {
-               if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), "Got SQUIT command.", Req->argv[1], TRUE );
-               else Conn_Close( Client_Conn( target ), "Got SQUIT command.", NULL, TRUE );
-               return DISCONNECTED;
+               if( strlen( Req->argv[1] ) > LINE_LEN ) Req->argv[1][LINE_LEN] = '\0';
+               sprintf( msg, "%s (SQUIT from %s).", Req->argv[1], Client_ID( Client ));
        }
-       else
+       else sprintf( msg, "Got SQUIT from %s.", Client_ID( Client ));
+
+       if( Client_Conn( target ) > NONE )
        {
-               Client_Destroy( target, "Got SQUIT command.", Req->argv[1] );
-               return CONNECTED;
+               /* dieser Server hat die Connection */
+               if( Req->argv[1][0] ) Conn_Close( Client_Conn( target ), msg, Req->argv[1], TRUE );
+               else Conn_Close( Client_Conn( target ), msg, NULL, TRUE );
        }
+       else Client_Destroy( target, msg, Req->argv[1] );
+
+       return DISCONNECTED;
 } /* IRC_SQUIT */