X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-write.c;h=9b5b5e2185aa2e8a9b1577e5d5b5fa2ee3359bd4;hb=ecad9f32c82f50312010ab41f7702d1329bc511e;hp=02f691d85b6b086539c7532f74ac0f34230f07c3;hpb=e6f96a7a8605de5cfefa3a557dc7a6b694a0c437;p=ngircd-alex.git diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index 02f691d8..9b5b5e21 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -1,17 +1,14 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2008 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.7 2002/09/16 09:19:23 alex Exp $ - * - * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden + * Sending IRC commands over the network */ @@ -19,35 +16,45 @@ #include "imp.h" #include -#include +#ifdef PROTOTYPES +# include +#else +# include +#endif #include #include -#include "conn.h" +#include "defines.h" +#include "conn-func.h" #include "client.h" #include "channel.h" -#include "defines.h" #include "exp.h" #include "irc-write.h" -LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client )); +#define SEND_TO_USER 1 +#define SEND_TO_SERVER 2 + + +static char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); +static void cb_writeStrServersPrefixFlag PARAMS((CLIENT *Client, + CLIENT *Prefix, void *Buffer)); #ifdef PROTOTYPES -GLOBAL BOOLEAN -IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... ) +GLOBAL bool +IRC_WriteStrClient( CLIENT *Client, char *Format, ... ) #else -GLOBAL BOOLEAN +GLOBAL bool IRC_WriteStrClient( Client, Format, va_alist ) CLIENT *Client; -CHAR *Format; +char *Format; va_dcl #endif { - CHAR buffer[1000]; - BOOLEAN ok = CONNECTED; + char buffer[1000]; + bool ok = CONNECTED; va_list ap; assert( Client != NULL ); @@ -61,28 +68,28 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - /* an den Client selber */ - ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), buffer ); + /* to the client itself */ + ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), "%s", buffer ); return ok; } /* IRC_WriteStrClient */ #ifdef PROTOTYPES -GLOBAL BOOLEAN -IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... ) +GLOBAL bool +IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, char *Format, ... ) #else -GLOBAL BOOLEAN +GLOBAL bool IRC_WriteStrClientPrefix( Client, Prefix, Format, va_alist ) CLIENT *Client; CLIENT *Prefix; -CHAR *Format; +char *Format; va_dcl #endif { - /* Text an Clients, lokal bzw. remote, senden. */ + /* send text to local and remote clients */ - CHAR buffer[1000]; + char buffer[1000]; va_list ap; assert( Client != NULL ); @@ -102,19 +109,19 @@ va_dcl #ifdef PROTOTYPES -GLOBAL BOOLEAN -IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... ) +GLOBAL bool +IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, bool Remote, char *Format, ... ) #else -GLOBAL BOOLEAN +GLOBAL bool IRC_WriteStrChannel( Client, Chan, Remote, Format, va_alist ) CLIENT *Client; CHANNEL *Chan; -BOOLEAN Remote; -CHAR *Format; +bool Remote; +char *Format; va_dcl #endif { - CHAR buffer[1000]; + char buffer[1000]; va_list ap; assert( Client != NULL ); @@ -128,29 +135,34 @@ va_dcl 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 */ + +/** + * send message to all clients in the same channel, but only send message + * once per remote server. + */ #ifdef PROTOTYPES -GLOBAL BOOLEAN -IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ) +GLOBAL bool +IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, bool Remote, char *Format, ... ) #else -GLOBAL BOOLEAN +GLOBAL bool IRC_WriteStrChannelPrefix( Client, Chan, Prefix, Remote, Format, va_alist ) CLIENT *Client; CHANNEL *Chan; CLIENT *Prefix; -BOOLEAN Remote; -CHAR *Format; +bool Remote; +char *Format; va_dcl #endif { - BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED; - CHAR buffer[1000]; + bool ok = CONNECTED; + char buffer[1000]; CL2CHAN *cl2chan; + CONN_ID conn; CLIENT *c; - INT s, i; va_list ap; assert( Client != NULL ); @@ -166,10 +178,8 @@ 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 */ cl2chan = Channel_FirstMember( Chan ); while( cl2chan ) { @@ -180,46 +190,44 @@ va_dcl else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL; } if( c ) c = Client_NextHop( c ); - + 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; + /* Ok, another Client */ + 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++ ) + 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; - } + /* do we need to send data via this connection? */ + 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; + + conn = Conn_Next( conn ); } + return ok; } /* IRC_WriteStrChannelPrefix */ #ifdef PROTOTYPES -GLOBAL VOID -IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... ) +GLOBAL void +IRC_WriteStrServers( CLIENT *ExceptOf, char *Format, ... ) #else -GLOBAL VOID +GLOBAL void IRC_WriteStrServers( ExceptOf, Format, va_alist ) CLIENT *ExceptOf; -CHAR *Format; +char *Format; va_dcl #endif { - CHAR buffer[1000]; + char buffer[1000]; va_list ap; assert( Format != NULL ); @@ -232,24 +240,23 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - /* an den Client selber */ - IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), buffer ); + IRC_WriteStrServersPrefix( ExceptOf, Client_ThisServer( ), "%s", buffer ); } /* IRC_WriteStrServers */ #ifdef PROTOTYPES -GLOBAL VOID -IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... ) +GLOBAL void +IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, char *Format, ... ) #else -GLOBAL VOID +GLOBAL void IRC_WriteStrServersPrefix( ExceptOf, Prefix, Format, va_alist ) CLIENT *ExceptOf; CLIENT *Prefix; -CHAR *Format; +char *Format; va_dcl #endif { - CHAR buffer[1000]; + char buffer[1000]; va_list ap; assert( Format != NULL ); @@ -263,27 +270,26 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - return; + IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, '\0', "%s", buffer ); } /* IRC_WriteStrServersPrefix */ - + #ifdef PROTOTYPES -GLOBAL VOID -IRC_WriteStrServersPrefixFlag( CLIENT *ExceptOf, CLIENT *Prefix, CHAR Flag, CHAR *Format, ... ) +GLOBAL void +IRC_WriteStrServersPrefixFlag( CLIENT *ExceptOf, CLIENT *Prefix, char Flag, char *Format, ... ) #else -GLOBAL VOID +GLOBAL void IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, Flag, Format, va_alist ) CLIENT *ExceptOf; CLIENT *Prefix; -CHAR Flag; -CHAR *Format; +char Flag; +char *Format; va_dcl #endif { - CHAR buffer[1000]; - CLIENT *c; + char buffer[1000]; va_list ap; - + assert( Format != NULL ); assert( Prefix != NULL ); @@ -294,40 +300,55 @@ va_dcl #endif vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - - c = Client_First( ); - while( c ) - { - 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 ); + + IRC_WriteStrServersPrefixFlag_CB(ExceptOf, Prefix, Flag, + cb_writeStrServersPrefixFlag, buffer); +} /* IRC_WriteStrServersPrefixFlag */ + + +GLOBAL void +IRC_WriteStrServersPrefixFlag_CB(CLIENT *ExceptOf, CLIENT *Prefix, char Flag, + void (*callback)(CLIENT *, CLIENT *, void *), void *cb_data) +{ + CLIENT *c; + + c = Client_First(); + while(c) { + if (Client_Type(c) == CLIENT_SERVER && Client_Conn(c) > NONE && + c != Client_ThisServer() && c != ExceptOf) { + /* Found a target server, do the flags match? */ + if (Flag == '\0' || strchr(Client_Flags(c), Flag)) + callback(c, Prefix, cb_data); } - c = Client_Next( c ); + c = Client_Next(c); } } /* IRC_WriteStrServersPrefixFlag */ +/** + * send message to all clients that are in the same channels as the client sending this message. + * only send message once per reote server. + */ #ifdef PROTOTYPES -GLOBAL BOOLEAN -IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... ) +GLOBAL bool +IRC_WriteStrRelatedPrefix( CLIENT *Client, CLIENT *Prefix, bool Remote, char *Format, ... ) #else -GLOBAL BOOLEAN +GLOBAL bool IRC_WriteStrRelatedPrefix( Client, Prefix, Remote, Format, va_alist ) CLIENT *Client; CLIENT *Prefix; -BOOLEAN Remote; -CHAR *Format; +bool Remote; +char *Format; va_dcl #endif { - BOOLEAN sock[MAX_CONNECTIONS], is_server[MAX_CONNECTIONS], ok = CONNECTED; + bool ok = CONNECTED; CL2CHAN *chan_cl2chan, *cl2chan; - CHAR buffer[1000]; + char buffer[1000]; CHANNEL *chan; + CONN_ID conn; va_list ap; CLIENT *c; - INT i, s; assert( Client != NULL ); assert( Prefix != NULL ); @@ -341,15 +362,11 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); 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. */ chan_cl2chan = Channel_FirstChannelOf( Client ); while( chan_cl2chan ) { - /* Channel des Users durchsuchen */ chan = Channel_GetChannel( chan_cl2chan ); cl2chan = Channel_FirstMember( chan ); while( cl2chan ) @@ -364,36 +381,94 @@ 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 ); } - - /* naechsten Channel */ + chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); } - /* Senden ... */ - for( i = 0; i < MAX_CONNECTIONS; i++ ) + 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; - } + /* send data via this connection? */ + 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; + + conn = Conn_Next( conn ); } return ok; } /* IRC_WriteStrRelatedPrefix */ -LOCAL CHAR * +/** + * Send WALLOPS message. + */ +#ifdef PROTOTYPES +GLOBAL void +IRC_SendWallops(CLIENT *Client, CLIENT *From, const char *Format, ...) +#else +GLOBAL void +IRC_SendWallops(Client, From, Format, va_alist ) +CLIENT *Client; +CLIENT *From; +char *Format; +va_dcl +#endif +{ + va_list ap; + char msg[1000]; + CLIENT *to; + +#ifdef PROTOTYPES + va_start(ap, Format); +#else + va_start(ap); +#endif + vsnprintf(msg, 1000, Format, ap); + va_end(ap); + + for (to=Client_First(); to != NULL; to=Client_Next(to)) { + if (Client_Conn(to) == NONE) /* no local connection */ + continue; + + switch (Client_Type(to)) { + case CLIENT_USER: + if (Client_HasMode(to, 'w')) + IRC_WriteStrClientPrefix(to, From, + "WALLOPS :%s", msg); + break; + case CLIENT_SERVER: + if (to != Client) + IRC_WriteStrClientPrefix(to, From, + "WALLOPS :%s", msg); + break; + } + } +} /* IRC_SendWallops */ + + +GLOBAL void +IRC_SetPenalty( CLIENT *Client, time_t Seconds ) +{ + CONN_ID c; + + assert( Client != NULL ); + assert( Seconds > 0 ); + + if( Client_Type( Client ) == CLIENT_SERVER ) return; + + c = Client_Conn( Client ); + if (c > NONE) + Conn_SetPenalty(c, Seconds); +} /* IRC_SetPenalty */ + + +static char * Get_Prefix( CLIENT *Target, CLIENT *Client ) { assert( Target != NULL ); @@ -404,4 +479,11 @@ Get_Prefix( CLIENT *Target, CLIENT *Client ) } /* Get_Prefix */ +static void +cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer) +{ + IRC_WriteStrClientPrefix(Client, Prefix, "%s", Buffer); +} /* cb_writeStrServersPrefixFlag */ + + /* -eof- */