- Server und "normale" Clients werden wieder korrekt unterschieden.

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

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index 50a555935c4bed5238680abd927de9d1a576b67f..ce26afeda259cfc4903d444d2e8971eccf317b51 100644 (file)
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -9,7 +9,7 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc-write.c,v 1.9 2002/10/04 11:21:46 alex Exp $
+ * $Id: irc-write.c,v 1.11 2002/11/04 12:34:22 alex Exp $
  *
  * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
  */
@@ -32,6 +32,10 @@
 #include "irc-write.h"
 
 
+#define SEND_TO_USER 1
+#define SEND_TO_SERVER 2
+
+
 LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
 
 
@@ -146,11 +150,11 @@ CHAR *Format;
 va_dcl
 #endif
 {
-       BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
+       BOOLEAN ok = CONNECTED;
        CHAR buffer[1000];
        CL2CHAN *cl2chan;
+       CONN_ID conn;
        CLIENT *c;
-       INT s, i;
        va_list ap;
 
        assert( Client != NULL );
@@ -166,7 +170,7 @@ va_dcl
        vsnprintf( buffer, 1000, Format, ap );
        va_end( ap );
 
-       for( i = 0; i < MAX_CONNECTIONS; i++ ) sock[i] = FALSE;
+       Conn_ClearFlags( );
 
        /* An alle Clients, die in den selben Channels sind.
         * Dabei aber nur einmal je Remote-Server */
@@ -184,26 +188,26 @@ va_dcl
                if( c && ( c != Client ))
                {
                        /* Ok, anderer Client */
-                       s = Client_Conn( c );
-                       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;
+                       conn = Client_Conn( c );
+                       if( Client_Type( c ) == CLIENT_SERVER ) Conn_SetFlag( conn, SEND_TO_SERVER );
+                       else Conn_SetFlag( conn, SEND_TO_USER );
                }
                cl2chan = Channel_NextMember( Chan, cl2chan );
        }
 
-       /* Senden ... */
-       for( i = 0; i < MAX_CONNECTIONS; i++ )
+       /* Senden: alle Verbindungen durchgehen ... */
+       conn = Conn_First( );
+       while( conn != NONE )
        {
-               if( sock[i] )
-               {
-                       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;
-               }
+               /* muessen Daten ueber diese Verbindung verschickt werden? */
+               if( Conn_Flag( conn ) == SEND_TO_SERVER) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer );
+               else if( Conn_Flag( conn ) == SEND_TO_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
+               if( ! ok ) break;
+
+               /* naechste Verbindung testen */
+               conn = Conn_Next( conn );
        }
+
        return ok;
 } /* IRC_WriteStrChannelPrefix */
 
@@ -321,13 +325,13 @@ CHAR *Format;
 va_dcl
 #endif
 {
-       BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED;
+       BOOLEAN ok = CONNECTED;
        CL2CHAN *chan_cl2chan, *cl2chan;
        CHAR buffer[1000];
        CHANNEL *chan;
+       CONN_ID conn;
        va_list ap;
        CLIENT *c;
-       INT i, s;
 
        assert( Client != NULL );
        assert( Prefix != NULL );
@@ -342,7 +346,7 @@ va_dcl
        va_end( ap );
 
        /* initialisieren */
-       for( i = 0; i < MAX_CONNECTIONS; i++ ) sock[i] = FALSE;
+       Conn_ClearFlags( );
 
        /* An alle Clients, die in einem Channel mit dem "Ausloeser" sind,
         * den Text schicken. An Remote-Server aber jeweils nur einmal. */
@@ -365,12 +369,9 @@ va_dcl
                        if( c && ( c != Client ))
                        {
                                /* Ok, anderer Client */
-                               s = Client_Conn( c );
-                               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;
+                               conn = Client_Conn( c );
+                               if( Client_Type( c ) == CLIENT_SERVER ) Conn_SetFlag( conn, SEND_TO_SERVER );
+                               else Conn_SetFlag( conn, SEND_TO_USER );
                        }
                        cl2chan = Channel_NextMember( chan, cl2chan );
                }
@@ -379,15 +380,17 @@ va_dcl
                chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan );
        }
 
-       /* Senden ... */
-       for( i = 0; i < MAX_CONNECTIONS; i++ )
+       /* Senden: alle Verbindungen durchgehen ... */
+       conn = Conn_First( );
+       while( conn != NONE )
        {
-               if( sock[i] )
-               {
-                       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;
-               }
+               /* muessen ueber diese Verbindung Daten gesendet werden? */
+               if( Conn_Flag( conn ) == SEND_TO_SERVER ) ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer );
+               else if( Conn_Flag( conn ) == SEND_TO_SERVER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
+               if( ! ok ) break;
+
+               /* naechste Verbindung testen */
+               conn = Conn_Next( conn );
        }
        return ok;
 } /* IRC_WriteStrRelatedPrefix */