* ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
*
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
*
- * $Id: irc-write.c,v 1.6 2002/09/03 23:56:06 alex Exp $
- *
- * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
+ * Sending IRC commands over the network
*/
#include "portab.h"
+static char UNUSED id[] = "$Id: irc-write.c,v 1.14 2002/12/30 17:15:42 alex Exp $";
+
#include "imp.h"
#include <assert.h>
#include <stdarg.h>
#include <stdio.h>
#include <string.h>
-#include "conn.h"
+#include "conn-func.h"
#include "client.h"
#include "channel.h"
#include "defines.h"
#include "irc-write.h"
+#define SEND_TO_USER 1
+#define SEND_TO_SERVER 2
+
+
LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
va_end( ap );
/* an den Client selber */
- ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), buffer );
+ ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), "%s", buffer );
return ok;
} /* IRC_WriteStrClient */
vsnprintf( buffer, 1000, Format, ap );
va_end( ap );
- return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, buffer );
+ return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, "%s", buffer );
} /* IRC_WriteStrChannel */
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 );
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 */
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 */
va_end( ap );
/* an den Client selber */
- IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer );
+ IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), "%s", buffer );
} /* IRC_WriteStrServers */
vsnprintf( buffer, 1000, Format, ap );
va_end( ap );
- return IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', buffer );
+ IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', "%s", buffer );
} /* IRC_WriteStrServersPrefix */
if(( Client_Type( c ) == CLIENT_SERVER ) && ( Client_Conn( c ) > NONE ) && ( c != Client_ThisServer( )) && ( c != ExceptOf ))
{
/* Ziel-Server gefunden. Nun noch pruefen, ob Flags stimmen */
- if(( Flag == '\0' ) || ( strchr( Client_Flags( c ), Flag ) != NULL )) IRC_WriteStrClientPrefix( c, Prefix, buffer );
+ if(( Flag == '\0' ) || ( strchr( Client_Flags( c ), Flag ) != NULL )) IRC_WriteStrClientPrefix( c, Prefix, "%s", buffer );
}
c = Client_Next( c );
}
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 );
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. */
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 );
}
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_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
+ if( ! ok ) break;
+
+ /* naechste Verbindung testen */
+ conn = Conn_Next( conn );
}
return ok;
} /* IRC_WriteStrRelatedPrefix */
projects / ngircd-alex.git / blobdiff