Module: ngircd.git Branch: master Commit: fd4dfccc30fdbb61120e3c51f4b987cc725b603d URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=fd4df...

Author: Alexander Barton alex@barton.de Date: Tue Aug 17 21:11:37 2010 +0200

Refactor IRC_WriteStr{Channel|Related}Prefix(); support cloaking

Move common code to new local function Send_Marked_Connections() and respect hostname cloaking.

---

src/ngircd/irc-write.c | 55 ++++++++++++++++++++++++----------------------- 1 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c index dd592f0..fdc0488 100644 --- a/src/ngircd/irc-write.c +++ b/src/ngircd/irc-write.c @@ -39,6 +39,7 @@ static const char *Get_Prefix PARAMS((CLIENT *Target, CLIENT *Client)); static void cb_writeStrServersPrefixFlag PARAMS((CLIENT *Client, CLIENT *Prefix, void *Buffer)); +static bool Send_Marked_Connections PARAMS((CLIENT *Prefix, const char *Buffer));

#ifdef PROTOTYPES @@ -159,7 +160,6 @@ const char *Format; va_dcl #endif { - bool ok = CONNECTED; char buffer[1000]; CL2CHAN *cl2chan; CONN_ID conn; @@ -201,19 +201,7 @@ va_dcl } cl2chan = Channel_NextMember( Chan, cl2chan ); } - - conn = Conn_First( ); - while( conn != NONE ) - { - /* 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; + return Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrChannelPrefix */

@@ -346,7 +334,6 @@ const char *Format; va_dcl #endif { - bool ok = CONNECTED; CL2CHAN *chan_cl2chan, *cl2chan; char buffer[1000]; CHANNEL *chan; @@ -394,18 +381,7 @@ va_dcl

chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan ); } - - conn = Conn_First( ); - while( conn != NONE ) - { - /* 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; + return Send_Marked_Connections(Prefix, buffer); } /* IRC_WriteStrRelatedPrefix */

@@ -490,4 +466,29 @@ cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer) } /* cb_writeStrServersPrefixFlag */

+static bool +Send_Marked_Connections(CLIENT *Prefix, const char *Buffer) +{ + CONN_ID conn; + bool ok = CONNECTED; + + assert(Prefix != NULL); + assert(Buffer != NULL); + + conn = Conn_First(); + while (conn != NONE) { + 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_MaskCloaked(Prefix), Buffer); + if (!ok) + break; + conn = Conn_Next( conn ); + } + return ok; +} + + /* -eof- */