Implement the IRC command "SERVLIST"

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

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index b8a5e28d6eaa1095f5291e6c478a09c539638a95..8239c150cadba6f14a111cf2827b5c641b06730f 100644 (file)
--- 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,22 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-write.c,v 1.14 2002/12/30 17:15:42 alex Exp $";
+static char UNUSED id[] = "$Id: irc-write.c,v 1.21 2006/08/12 11:56:24 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
-#include <stdarg.h>
+#ifdef PROTOTYPES
+#      include <stdarg.h>
+#else
+#      include <varargs.h>
+#endif
 #include <stdio.h>
 #include <string.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 +39,24 @@ static char UNUSED id[] = "$Id: irc-write.c,v 1.14 2002/12/30 17:15:42 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 );
@@ -72,20 +78,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. */
 
-       CHAR buffer[1000];
+       char buffer[1000];
        va_list ap;
 
        assert( Client != NULL );
@@ -105,19 +111,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 );
@@ -136,21 +142,21 @@ va_dcl
 
 
 #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;
@@ -183,7 +189,7 @@ va_dcl
                        else if( Client_Type( c ) == CLIENT_SERVER ) c = NULL;
                }
                if( c ) c = Client_NextHop( c );
-                       
+
                if( c && ( c != Client ))
                {
                        /* Ok, anderer Client */
@@ -212,17 +218,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 );
@@ -241,18 +247,18 @@ va_dcl
 
 
 #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 +274,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 +302,47 @@ 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 */
 
 
 #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;
@@ -374,7 +390,7 @@ va_dcl
                        }
                        cl2chan = Channel_NextMember( chan, cl2chan );
                }
-               
+
                /* naechsten Channel */
                chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan );
        }
@@ -395,7 +411,23 @@ va_dcl
 } /* 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 +438,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- */