- an User wird nun immer ein "komplettes" Prefix verschickt.

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 2ecdfaeb5c8f70e76cf7985947a06651afeebe6d..078376d502670c88142c6467a7255930ad25a601 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,18 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
  * 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.68 2002/02/25 17:46:27 alex Exp $

  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $

+ * 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.
  *
  * Revision 1.66  2002/02/23 21:39:48  alex
  * - IRC-Befehl KILL sowie Kills bei Nick Collsisions implementiert.
  *


@@ -287,6 +294,8 @@ LOCAL VOID Kill_Nick( CHAR *Nick, CHAR *Reason );
 LOCAL BOOLEAN Send_NAMES( CLIENT *Client, CHANNEL *Chan );
 LOCAL BOOLEAN Send_LUSERS( CLIENT *Client );
 
 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 )
 {
 
 GLOBAL VOID IRC_Init( VOID )
 {


@@ -333,7 +342,7 @@ GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *F
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
        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 */
 
 
 } /* IRC_WriteStrClientPrefix */
 
 


@@ -355,8 +364,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, ... )
 {
 
 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];
        CHAR buffer[1000];

-       BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED;

        CL2CHAN *cl2chan;
        CLIENT *c;
        INT s, i;
        CL2CHAN *cl2chan;
        CLIENT *c;
        INT s, i;


@@ -393,6 +402,8 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT
                        assert( s >= 0 );
                        assert( s < MAX_CONNECTIONS );
                        sock[s] = TRUE;
                        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 );
        }
                }
                cl2chan = Channel_NextMember( Chan, cl2chan );
        }


@@ -402,7 +413,8 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT
        {
                if( sock[i] )
                {
        {
                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;
                }
        }
                        if( ! ok ) break;
                }
        }


@@ -454,7 +466,7 @@ GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *F
 
 GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
 {
 
 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;
        CL2CHAN *chan_cl2chan, *cl2chan;
        CHAR buffer[1000];
        CHANNEL *chan;


@@ -498,6 +510,8 @@ GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEA
                                assert( s >= 0 );
                                assert( s < MAX_CONNECTIONS );
                                sock[s] = TRUE;
                                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 );
                }
                        }
                        cl2chan = Channel_NextMember( chan, cl2chan );
                }


@@ -511,7 +525,8 @@ GLOBAL BOOLEAN IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEA
        {
                if( sock[i] )
                {
        {
                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;
                }
        }
                        if( ! ok ) break;
                }
        }


@@ -1722,17 +1737,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];
        }
                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;
        
        /* 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;


@@ -2276,4 +2285,14 @@ LOCAL BOOLEAN Send_LUSERS( CLIENT *Client )
 } /* Send_LUSERS */
 
 
 } /* 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- */
 /* -eof- */