X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc-write.c;h=16aac9a081859aa27904e116252d009ba02d3176;hp=ce26afeda259cfc4903d444d2e8971eccf317b51;hb=25dd193e9b49b38db39cf549f94df4ba11812fe9;hpb=4c870f4be93862fb417e57cbd4b7a1800ddb990e

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index ce26afed..16aac9a0 100644
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -1,32 +1,34 @@
 /*
  * 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.
- *
- * $Id: irc-write.c,v 1.11 2002/11/04 12:34:22 alex Exp $
- *
- * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
+ * 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.
  */
 
-
 #include "portab.h"
 
+/**
+ * @file
+ * Sending IRC commands over the network
+ */
+
 #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 "conn.h"
-#include "client.h"
-#include "channel.h"
 #include "defines.h"
+#include "conn-func.h"
+#include "channel.h"
 
 #include "exp.h"
 #include "irc-write.h"
@@ -36,22 +38,25 @@
 #define SEND_TO_SERVER 2
 
 
-LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
+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
-GLOBAL BOOLEAN
-IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... )
+GLOBAL bool
+IRC_WriteStrClient( CLIENT *Client, const char *Format, ... )
 #else
-GLOBAL BOOLEAN
+GLOBAL bool
 IRC_WriteStrClient( Client, Format, va_alist )
 CLIENT *Client;
-CHAR *Format;
+const char *Format;
 va_dcl
 #endif
 {
-	CHAR buffer[1000];
-	BOOLEAN ok = CONNECTED;
+	char buffer[1000];
+	bool ok = CONNECTED;
 	va_list ap;
 
 	assert( Client != NULL );
@@ -65,7 +70,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;
@@ -73,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, const char *Format, ...)
 #else
-GLOBAL BOOLEAN
-IRC_WriteStrClientPrefix( Client, Prefix, Format, va_alist )
+GLOBAL bool
+IRC_WriteStrClientPrefix(Client, Prefix, Format, va_alist)
 CLIENT *Client;
 CLIENT *Prefix;
-CHAR *Format;
+const 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 );
@@ -101,24 +106,26 @@ va_dcl
 	vsnprintf( buffer, 1000, Format, ap );
 	va_end( ap );
 
-	return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Get_Prefix( Client_NextHop( Client ), Prefix ), buffer );
+	return Conn_WriteStr(Client_Conn(Client_NextHop(Client)), ":%s %s",
+			Get_Prefix(Client_NextHop(Client), Prefix), buffer);
 } /* IRC_WriteStrClientPrefix */
 
 
 #ifdef PROTOTYPES
-GLOBAL BOOLEAN
-IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... )
+GLOBAL bool
+IRC_WriteStrChannel(CLIENT *Client, CHANNEL *Chan, bool Remote,
+		    const char *Format, ...)
 #else
-GLOBAL BOOLEAN
-IRC_WriteStrChannel( Client, Chan, Remote, Format, va_alist )
+GLOBAL bool
+IRC_WriteStrChannel(Client, Chan, Remote, Format, va_alist)
 CLIENT *Client;
 CHANNEL *Chan;
-BOOLEAN Remote;
-CHAR *Format;
+bool Remote;
+const char *Format;
 va_dcl
 #endif
 {
-	CHAR buffer[1000];
+	char buffer[1000];
 	va_list ap;
 
 	assert( Client != NULL );
@@ -136,22 +143,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, const char *Format, ...)
 #else
-GLOBAL BOOLEAN
-IRC_WriteStrChannelPrefix( Client, Chan, Prefix, Remote, Format, va_alist )
+GLOBAL bool
+IRC_WriteStrChannelPrefix(Client, Chan, Prefix, Remote, Format, va_alist)
 CLIENT *Client;
 CHANNEL *Chan;
 CLIENT *Prefix;
-BOOLEAN Remote;
-CHAR *Format;
+bool Remote;
+const char *Format;
 va_dcl
 #endif
 {
-	BOOLEAN ok = CONNECTED;
-	CHAR buffer[1000];
+	char buffer[1000];
 	CL2CHAN *cl2chan;
 	CONN_ID conn;
 	CLIENT *c;
@@ -172,8 +184,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 )
 	{
@@ -184,46 +194,32 @@ 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 );
 		}
 		cl2chan = Channel_NextMember( Chan, cl2chan );
 	}
-
-	/* Senden: alle Verbindungen durchgehen ... */
-	conn = Conn_First( );
-	while( conn != NONE )
-	{
-		/* 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;
+	return Send_Marked_Connections(Prefix, buffer);
 } /* IRC_WriteStrChannelPrefix */
 
 
 #ifdef PROTOTYPES
-GLOBAL VOID
-IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... )
+GLOBAL void
+IRC_WriteStrServers(CLIENT *ExceptOf, const char *Format, ...)
 #else
-GLOBAL VOID
-IRC_WriteStrServers( ExceptOf, Format, va_alist )
+GLOBAL void
+IRC_WriteStrServers(ExceptOf, Format, va_alist)
 CLIENT *ExceptOf;
-CHAR *Format;
+const char *Format;
 va_dcl
 #endif
 {
-	CHAR buffer[1000];
+	char buffer[1000];
 	va_list ap;
 
 	assert( Format != NULL );
@@ -236,24 +232,24 @@ 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,
+			  const char *Format, ...)
 #else
-GLOBAL VOID
-IRC_WriteStrServersPrefix( ExceptOf, Prefix, Format, va_alist )
+GLOBAL void
+IRC_WriteStrServersPrefix(ExceptOf, Prefix, Format, va_alist)
 CLIENT *ExceptOf;
 CLIENT *Prefix;
-CHAR *Format;
+const char *Format;
 va_dcl
 #endif
 {
-	CHAR buffer[1000];
+	char buffer[1000];
 	va_list ap;
 
 	assert( Format != NULL );
@@ -269,25 +265,25 @@ 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,
+			      const char *Format, ...)
 #else
-GLOBAL VOID
-IRC_WriteStrServersPrefixFlag( ExceptOf, Prefix, Flag, Format, va_alist )
+GLOBAL void
+IRC_WriteStrServersPrefixFlag(ExceptOf, Prefix, Flag, Format, va_alist)
 CLIENT *ExceptOf;
 CLIENT *Prefix;
-CHAR Flag;
-CHAR *Format;
+char Flag;
+const char *Format;
 va_dcl
 #endif
 {
-	CHAR buffer[1000];
-	CLIENT *c;
+	char buffer[1000];
 	va_list ap;
-	
+
 	assert( Format != NULL );
 	assert( Prefix != NULL );
 
@@ -298,36 +294,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,
+			  const char *Format, ...)
 #else
-GLOBAL BOOLEAN
-IRC_WriteStrRelatedPrefix( Client, Prefix, Remote, Format, va_alist )
+GLOBAL bool
+IRC_WriteStrRelatedPrefix(Client, Prefix, Remote, Format, va_alist)
 CLIENT *Client;
 CLIENT *Prefix;
-BOOLEAN Remote;
-CHAR *Format;
+bool Remote;
+const char *Format;
 va_dcl
 #endif
 {
-	BOOLEAN ok = CONNECTED;
 	CL2CHAN *chan_cl2chan, *cl2chan;
-	CHAR buffer[1000];
+	char buffer[1000];
 	CHANNEL *chan;
 	CONN_ID conn;
 	va_list ap;
@@ -345,15 +356,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 )
@@ -368,43 +375,125 @@ 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 );
 	}
+	return Send_Marked_Connections(Prefix, buffer);
+} /* IRC_WriteStrRelatedPrefix */
 
-	/* Senden: alle Verbindungen durchgehen ... */
-	conn = Conn_First( );
-	while( conn != NONE )
-	{
-		/* 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_SERVER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
-		if( ! ok ) break;
 
-		/* naechste Verbindung testen */
-		conn = Conn_Next( conn );
+/**
+ * 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;
+const 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;
+		}
 	}
-	return ok;
-} /* IRC_WriteStrRelatedPrefix */
+} /* IRC_SendWallops */
 
 
-LOCAL CHAR *
-Get_Prefix( CLIENT *Target, CLIENT *Client )
+GLOBAL void
+IRC_SetPenalty( CLIENT *Client, time_t Seconds )
 {
-	assert( Target != NULL );
+	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 */
+
 
-	if( Client_Type( Target ) == CLIENT_SERVER ) return Client_ID( Client );
-	else return Client_Mask( Client );
+static const char *
+Get_Prefix(CLIENT *Target, CLIENT *Client)
+{
+	assert (Target != NULL);
+	assert (Client != NULL);
+
+	if (Client_Type(Target) == CLIENT_SERVER)
+		return Client_ID(Client);
+	else
+		return Client_MaskCloaked(Client);
 } /* Get_Prefix */
 
 
+static void
+cb_writeStrServersPrefixFlag(CLIENT *Client, CLIENT *Prefix, void *Buffer)
+{
+	IRC_WriteStrClientPrefix(Client, Prefix, "%s", 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- */