X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-write.c;h=ea0f5f8a288158531e55952212197b360690102e;hb=44acf41cc172e8131c3a987d430b9f948afd26ad;hp=b1df7b8e01754c7396749da612cb39783f0004aa;hpb=490f28ffd1b42ee2076ce89c62d0e672ee7e541e;p=ngircd-alex.git diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index b1df7b8e..ea0f5f8a 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -1,6 +1,6 @@ /* * ngIRCd -- The Next Generation IRC Daemon - * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de) + * Copyright (c)2001-2005 by Alexander Barton (alex@barton.de) * * 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 @@ -14,18 +14,20 @@ #include "portab.h" -static char UNUSED id[] = "$Id: irc-write.c,v 1.13 2002/12/12 12:24:18 alex Exp $"; - #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" @@ -35,22 +37,24 @@ static char UNUSED id[] = "$Id: irc-write.c,v 1.13 2002/12/12 12:24:18 alex Exp #define SEND_TO_SERVER 2 -LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client )); +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 ); @@ -64,7 +68,7 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - /* an den Client selber */ + /* to the client itself */ ok = IRC_WriteStrClientPrefix( Client, Client_ThisServer( ), "%s", buffer ); return ok; @@ -72,20 +76,20 @@ va_dcl #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 ); @@ -105,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 ); @@ -135,22 +139,27 @@ va_dcl } /* 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 ok = CONNECTED; - CHAR buffer[1000]; + bool ok = CONNECTED; + char buffer[1000]; CL2CHAN *cl2chan; CONN_ID conn; CLIENT *c; @@ -171,8 +180,6 @@ va_dcl Conn_ClearFlags( ); - /* An alle Clients, die in den selben Channels sind. - * Dabei aber nur einmal je Remote-Server */ cl2chan = Channel_FirstMember( Chan ); while( cl2chan ) { @@ -183,10 +190,10 @@ va_dcl else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL; } if( c ) c = Client_NextHop( c ); - + if( c && ( c != Client )) { - /* Ok, anderer Client */ + /* 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 ); @@ -194,16 +201,14 @@ va_dcl cl2chan = Channel_NextMember( Chan, cl2chan ); } - /* Senden: alle Verbindungen durchgehen ... */ conn = Conn_First( ); while( conn != NONE ) { - /* muessen Daten ueber diese Verbindung verschickt werden? */ + /* 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; - /* naechste Verbindung testen */ conn = Conn_Next( conn ); } @@ -212,17 +217,17 @@ va_dcl #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 ); @@ -235,24 +240,23 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - /* an den Client selber */ 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 ); @@ -268,25 +272,24 @@ va_dcl 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 ); @@ -297,36 +300,51 @@ 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, "%s", 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 ok = CONNECTED; + bool ok = CONNECTED; CL2CHAN *chan_cl2chan, *cl2chan; - CHAR buffer[1000]; + char buffer[1000]; CHANNEL *chan; CONN_ID conn; va_list ap; @@ -344,15 +362,11 @@ va_dcl vsnprintf( buffer, 1000, Format, ap ); va_end( ap ); - /* initialisieren */ 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 ) @@ -367,35 +381,47 @@ va_dcl if( c && ( c != Client )) { - /* Ok, anderer 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 ); } - - /* naechsten Channel */ + chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); } - /* Senden: alle Verbindungen durchgehen ... */ conn = Conn_First( ); while( conn != NONE ) { - /* muessen ueber diese Verbindung Daten gesendet werden? */ + /* 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; - /* naechste Verbindung testen */ conn = Conn_Next( conn ); } return ok; } /* IRC_WriteStrRelatedPrefix */ -LOCAL CHAR * +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 ); @@ -406,4 +432,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- */