X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Firc-write.c;h=b8a5e28d6eaa1095f5291e6c478a09c539638a95;hb=0f3e84f4154676dc05a09bd0b1ad9d3d43574d48;hp=d4b26fcc809aed5e991efc3da1ffab063c5b5279;hpb=601f0ede6106126a1f700f5bac042ecebfea7011;p=ngircd-alex.git

diff --git a/src/ngircd/irc-write.c b/src/ngircd/irc-write.c
index d4b26fcc..b8a5e28d 100644
--- a/src/ngircd/irc-write.c
+++ b/src/ngircd/irc-write.c
@@ -2,28 +2,27 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by 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.10 2002/11/02 22:59:41 alex Exp $
- *
- * irc-write.c: IRC-Texte und Befehle ueber Netzwerk versenden
+ * Sending IRC commands over the network
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: irc-write.c,v 1.14 2002/12/30 17:15:42 alex Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
 
-#include "conn.h"
+#include "conn-func.h"
 #include "client.h"
 #include "channel.h"
 #include "defines.h"
@@ -32,6 +31,10 @@
 #include "irc-write.h"
 
 
+#define SEND_TO_USER 1
+#define SEND_TO_SERVER 2
+
+
 LOCAL CHAR *Get_Prefix PARAMS(( CLIENT *Target, CLIENT *Client ));
 
 
@@ -185,25 +188,22 @@ va_dcl
 		{
 			/* Ok, anderer Client */
 			conn = Client_Conn( c );
-			Conn_SetFlag( conn );
+			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 ... */
+	/* Senden: alle Verbindungen durchgehen ... */
 	conn = Conn_First( );
 	while( conn != NONE )
 	{
-		if( Conn_Flag( conn ))
-		{
-			if( Client_Type( Client_GetFromConn( conn )) == CLIENT_SERVER )
-			{
-				/* Ziel-Client ist ein anderer Server */
-				ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer );
-			}
-			else ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
-			if( ! ok ) break;
-		}
+		/* 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 );
 	}
 
@@ -369,7 +369,8 @@ va_dcl
 			{
 				/* Ok, anderer Client */
 				conn = Client_Conn( c );
-				Conn_Flag( conn );
+				if( Client_Type( c ) == CLIENT_SERVER ) Conn_SetFlag( conn, SEND_TO_SERVER );
+				else Conn_SetFlag( conn, SEND_TO_USER );
 			}
 			cl2chan = Channel_NextMember( chan, cl2chan );
 		}
@@ -378,20 +379,16 @@ va_dcl
 		chan_cl2chan = Channel_NextChannelOf( Client, chan_cl2chan );
 	}
 
-	/* Senden ... */
+	/* Senden: alle Verbindungen durchgehen ... */
 	conn = Conn_First( );
 	while( conn != NONE )
 	{
-		if( Conn_Flag( conn ))
-		{
-			if( Client_Type( Client_GetFromConn( conn )) == CLIENT_SERVER )
-			{
-				/* Ziel ist ein anderer Server */
-				ok = Conn_WriteStr( conn, ":%s %s", Client_ID( Prefix ), buffer );
-			}
-			else ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
-			if( ! ok ) break;
-		}
+		/* 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_USER ) ok = Conn_WriteStr( conn, ":%s %s", Client_Mask( Prefix ), buffer );
+		if( ! ok ) break;
+
+		/* naechste Verbindung testen */
 		conn = Conn_Next( conn );
 	}
 	return ok;