- Nick-Aenderungen werden nun wieder korrekt ins Logfile geschrieben.

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 2ecdfaeb5c8f70e76cf7985947a06651afeebe6d..2a8a6149f5d126eb416c4b8713a1bf8e894a8981 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,24 @@
  * 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.66 2002/02/23 21:39:48 alex Exp $
+ * $Id: irc.c,v 1.70 2002/02/26 22:06:40 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.70  2002/02/26 22:06:40  alex
+ * - Nick-Aenderungen werden nun wieder korrekt ins Logfile geschrieben.
+ *
+ * Revision 1.69  2002/02/26 20:52:40  alex
+ * - VERSION wurde falsch weitergeleitet und beantwortet (Prefix nicht beachtet)
+ *
+ * Revision 1.68  2002/02/25 17:46:27  alex
+ * - an User wird nun immer ein "komplettes" Prefix verschickt.
+ *
+ * Revision 1.67  2002/02/25 13:21:25  alex
+ * - WHOIS wird nicht mehr automatisch an den "Original-Server" weiterge-
+ *   leitet: war eh nicht RFC-konform und machte Probleme mit Clients.
+ *
  * Revision 1.66  2002/02/23 21:39:48  alex
  * - IRC-Befehl KILL sowie Kills bei Nick Collsisions implementiert.
  *
@@ -287,6 +300,8 @@ LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason );
 LOCAL BOOLEAN Send_NAMES( CLIENT *Client, CHANNEL *Chan );
 LOCAL BOOLEAN Send_LUSERS( CLIENT *Client );
 
+CHAR *Get_Prefix( CLIENT *Target, CLIENT *Client );
+
 
 GLOBAL VOID IRC_Init( VOID )
 {
@@ -333,7 +348,7 @@ GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *F
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
-       return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Client_ID( Prefix ), buffer );
+       return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Get_Prefix( Client_NextHop( Client ), Prefix ), buffer );
 } /* IRC_WriteStrClientPrefix */
 
 
@@ -355,8 +370,8 @@ GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remot
 
 GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
 {
+       BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
        CHAR buffer[1000];
-       BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED;
        CL2CHAN *cl2chan;
        CLIENT *c;
        INT s, i;
@@ -393,6 +408,8 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT
                        assert( s >= 0 );
                        assert( s < MAX_CONNECTIONS );
                        sock[s] = TRUE;
+                       if( Client_Type( c ) == CLIENT_SERVER ) is_server[s] = TRUE;
+                       else is_server[s] = FALSE;
                }
                cl2chan = Channel_NextMember( Chan, cl2chan );
        }
@@ -402,7 +419,8 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT
        {
                if( sock[i] )
                {
-                       ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
+                       if( is_server[i] ) ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
+                       else ok = Conn_WriteStr( i, ":%s %s", Client_Mask( Prefix ), buffer );
                        if( ! ok ) break;
                }
        }
@@ -454,7 +472,7 @@ GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *F
 
 GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
 {
-       BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED;
+       BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
        CL2CHAN *chan_cl2chan, *cl2chan;
        CHAR buffer[1000];
        CHANNEL *chan;
@@ -498,6 +516,8 @@ GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEA
                                assert( s >= 0 );
                                assert( s < MAX_CONNECTIONS );
                                sock[s] = TRUE;
+                               if( Client_Type( c ) == CLIENT_SERVER ) is_server[s] = TRUE;
+                               else is_server[s] = FALSE;
                        }
                        cl2chan = Channel_NextMember( chan, cl2chan );
                }
@@ -511,7 +531,8 @@ GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEA
        {
                if( sock[i] )
                {
-                       ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
+                       if( is_server[i] ) ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
+                       else ok = Conn_WriteStr( i, ":%s %s", Client_Mask( Prefix ), buffer );
                        if( ! ok ) break;
                }
        }
@@ -877,9 +898,6 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
                if( Client_Type( Client ) == CLIENT_USER ) IRC_WriteStrClientPrefix( Client, Client, "NICK :%s", Req->argv[0] );
                IRC_WriteStrServersPrefix( Client, target, "NICK :%s", Req->argv[0] );
                IRC_WriteStrRelatedPrefix( target, target, FALSE, "NICK :%s", Req->argv[0] );
-       
-               /* Client-Nick registrieren */
-               Client_SetID( target, Req->argv[0] );
 
                if(( Client_Type( target ) != CLIENT_USER ) && ( Client_Type( target ) != CLIENT_SERVER ))
                {
@@ -890,6 +908,9 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
                }
                else Log( LOG_INFO, "User \"%s\" changed nick: \"%s\" -> \"%s\".", Client_Mask( target ), Client_ID( target ), Req->argv[0] );
 
+               /* Client-Nick registrieren */
+               Client_SetID( target, Req->argv[0] );
+
                return CONNECTED;
        }
        else if( Client_Type( Client ) == CLIENT_SERVER )
@@ -1722,17 +1743,11 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
                ptr = Req->argv[1];
        }
-#ifndef STRICT_RFC
-       else if( Client_Conn( c ) == NONE )
-       {
-               /* Client ist nicht von uns. Ziel-Server suchen */
-               target = c;
-               ptr = Req->argv[0];
-       }
-#endif
-       else target = NULL;
+       else target = Client_ThisServer( );
+
+       assert( target != NULL );
        
-       if( target && ( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], ptr );
+       if(( Client_NextHop( target ) != Client_ThisServer( )) && ( Client_Type( Client_NextHop( target )) == CLIENT_SERVER )) return IRC_WriteStrClientPrefix( target, from, "WHOIS %s :%s", Req->argv[0], ptr );
        
        /* Nick, User und Name */
        if( ! IRC_WriteStrClient( from, RPL_WHOISUSER_MSG, Client_ID( from ), Client_ID( c ), Client_User( c ), Client_Hostname( c ), Client_Info( c ))) return DISCONNECTED;
@@ -2058,7 +2073,7 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req )
 {
-       CLIENT *target;
+       CLIENT *target, *prefix;
        
        assert( Client != NULL );
        assert( Req != NULL );
@@ -2070,15 +2085,23 @@ GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req )
        if( Req->argc == 1 ) target = Client_GetFromID( Req->argv[0] );
        else target = Client_ThisServer( );
 
+       /* Prefix ermitteln */
+       if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_GetFromID( Req->prefix );
+       else prefix = Client;
+       if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+       
        /* An anderen Server weiterleiten? */
        if( target != Client_ThisServer( ))
        {
                if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
-               IRC_WriteStrClientPrefix( Client_NextHop( target ), Client, "VERSION %s", Req->argv[0] );
+
+               /* forwarden */
+               IRC_WriteStrClientPrefix( Client_NextHop( target ), prefix, "VERSION %s", Req->argv[0] );
                return CONNECTED;
        }
 
-       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( Client ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+       /* mit Versionsinfo antworten */
+       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
 } /* IRC_VERSION */
 
 
@@ -2276,4 +2299,14 @@ LOCAL BOOLEAN Send_LUSERS( CLIENT *Client )
 } /* Send_LUSERS */
 
 
+CHAR *Get_Prefix( CLIENT *Target, CLIENT *Client )
+{
+       assert( Target != NULL );
+       assert( Client != NULL );
+
+       if( Client_Type( Target ) == CLIENT_SERVER ) return Client_ID( Client );
+       else return Client_Mask( Client );
+} /* Get_Prefix */
+
+
 /* -eof- */