commit d14588f3689f4cf7f4132afc491bf77236a43c6d
from: Alexander Barton <alex@barton.de>
date: Sun Jan 27 17:15:49 2002 UTC

- anderungen an den Funktions-Prototypen von IRC_WriteStrChannel() und
  IRC_WriteStrChannelPrefix(),
- neue: IRC_WriteStrClientPrefixID() und IRC_WriteStrServersPrefixID().

commit - d569c9246eb3e57981c102f93ddb9fc14c0f61d6
commit + d14588f3689f4cf7f4132afc491bf77236a43c6d
blob - 58efe4f17af5d8b33e72cb2d1d06d8f3405fb0fe
blob + 3f818155aa97d5bee3f01e4d8e4bd88c02f0b645
--- src/ngircd/irc.c
+++ src/ngircd/irc.c
@@ -9,11 +9,16 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.40 2002/01/26 18:43:11 alex Exp $
+ * $Id: irc.c,v 1.41 2002/01/27 17:15:49 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.41  2002/01/27 17:15:49  alex
+ * - anderungen an den Funktions-Prototypen von IRC_WriteStrChannel() und
+ *   IRC_WriteStrChannelPrefix(),
+ * - neue: IRC_WriteStrClientPrefixID() und IRC_WriteStrServersPrefixID().
+ *
  * Revision 1.40  2002/01/26 18:43:11  alex
  * - neue Funktionen IRC_WriteStrChannelPrefix() und IRC_WriteStrChannel(),
  *   die IRC_Write_xxx_Related() sind dafuer entfallen.
@@ -242,28 +247,48 @@ GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Clien
 } /* IRC_WriteStrClientPrefix */
 
 
-GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, CHAR *Format, ... )
+GLOBAL BOOLEAN IRC_WriteStrClientPrefixID( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... )
 {
+	/* Text an Clients, lokal bzw. remote, senden. */
+
 	CHAR buffer[1000];
 	va_list ap;
 
 	assert( Client != NULL );
 	assert( Format != NULL );
+	assert( Prefix != NULL );
 
 	va_start( ap, Format );
 	vsnprintf( buffer, 1000, Format, ap );
 	va_end( ap );
 
-	return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), buffer );
+	return Conn_WriteStr( Client_Conn( Client_NextHop( Client )), ":%s %s", Client_ID( Prefix ), buffer );
+} /* IRC_WriteStrClientPrefixID */
+
+
+GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... )
+{
+	CHAR buffer[1000];
+	va_list ap;
+
+	assert( Client != NULL );
+	assert( Format != NULL );
+
+	va_start( ap, Format );
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	return IRC_WriteStrChannelPrefix( Client, Chan, Client_ThisServer( ), Remote, buffer );
 } /* IRC_WriteStrChannel */
 
 
-GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, CHAR *Format, ... )
+GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... )
 {
 	CHAR buffer[1000];
 	BOOLEAN sock[MAX_CONNECTIONS], ok = CONNECTED, i;
 	CL2CHAN *cl2chan;
 	CLIENT *c;
+	INT s;
 	va_list ap;
 
 	assert( Client != NULL );
@@ -282,11 +307,20 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Clie
 	cl2chan = Channel_FirstMember( Chan );
 	while( cl2chan )
 	{
-		c = Channel_GetClient( cl2chan );
-		if( c != Client )
+		if( Remote ) c = Client_NextHop( Channel_GetClient( cl2chan ));
+		else
 		{
+			c = Channel_GetClient( cl2chan );
+			if( Client_Conn( c ) <= NONE ) c = NULL;
+		}
+			
+		if( c && ( c != Client ))
+		{
 			/* Ok, anderer Client */
-			if( Client_Conn( c ) > NONE ) sock[Client_Conn( c )] = TRUE;
+			s = Client_Conn( c );
+			assert( s >= 0 );
+			assert( s < MAX_CONNECTIONS );
+			sock[s] = TRUE;
 		}
 		cl2chan = Channel_NextMember( Chan, cl2chan );
 	}
@@ -296,7 +330,7 @@ GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Clie
 	{
 		if( sock[i] )
 		{
-			ok = Conn_WriteStr( i, ":%s %s", Client_Mask( Prefix ), buffer );
+			ok = Conn_WriteStr( i, ":%s %s", Client_ID( Prefix ), buffer );
 			if( ! ok ) break;
 		}
 	}
@@ -346,6 +380,32 @@ GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptO
 } /* IRC_WriteStrServersPrefix */
 
 
+GLOBAL VOID IRC_WriteStrServersPrefixID( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... )
+{
+	CHAR buffer[1000];
+	CLIENT *c;
+	va_list ap;
+
+	assert( Format != NULL );
+	assert( Prefix != NULL );
+
+	va_start( ap, Format );
+	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 */
+			IRC_WriteStrClientPrefixID( c, Prefix, buffer );
+		}
+		c = Client_Next( c );
+	}
+} /* IRC_WriteStrServersPrefixID */
+
+
 GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
 {
 	assert( Client != NULL );
@@ -523,11 +583,32 @@ GLOBAL BOOLEAN IRC_SERVER( CLIENT *Client, REQUEST *Re
 
 GLOBAL BOOLEAN IRC_NJOIN( CLIENT *Client, REQUEST *Req )
 {
+	CHAR *chan, *ptr;
+	CLIENT *c;
+	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
 	if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTEREDSERVER_MSG, Client_ID( Client ));
 
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+	chan = Req->argv[0];
+	ptr = strtok( Req->argv[1], "," );
+	while( ptr )
+	{
+		/* Prefixe abschneiden */
+		while(( *ptr == '@' ) || ( *ptr == '+' )) ptr++;
+
+		c = Client_GetFromID( ptr );
+		if( c ) Channel_Join( c, chan );
+		else Log( LOG_ERR, "Got NJOIN for unknown nick \"%s\" for channel \"%s\"!", ptr, chan );
+		
+		/* naechsten Nick suchen */
+		ptr = strtok( NULL, "," );
+	}
+	
 	return CONNECTED;
 } /* IRC_NJOIN */
 
@@ -852,7 +933,7 @@ GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *R
 	{
 		/* Okay, Ziel ist ein Channel */
 		if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from ));
-		return IRC_WriteStrChannelPrefix( Client, chan, from, "PRIVMSG %s :%s", Req->argv[0], Req->argv[1] );
+		return IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "PRIVMSG %s :%s", Req->argv[0], Req->argv[1] );
 	}
 
 	return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
@@ -1396,7 +1477,7 @@ GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req
 GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
 {
 	CLIENT *target;
-	CHAR *chan;
+	CHAR *chan, *flags;
 	
 	assert( Client != NULL );
 	assert( Req != NULL );
@@ -1415,6 +1496,14 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req 
 	chan = strtok( Req->argv[0], "," );
 	while( chan )
 	{
+		if( Client_Type( Client ) == CLIENT_SERVER )
+		{
+			/* Channel-Flags extrahieren */
+			flags = strchr( chan, 0x7 );
+			if( flags ) *flags++ = '\0';
+		}
+		else flags = NULL;
+		
 		if( ! Channel_Join( target, chan ))
 		{
 			/* naechsten Namen ermitteln */
@@ -1423,11 +1512,15 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req 
 		}
 
 		/* An andere Server weiterleiten, an Client bestaetigen */
-		IRC_WriteStrServersPrefix( Client, target, "JOIN :%s", chan );
+		IRC_WriteStrServersPrefixID( Client, target, "JOIN :%s", chan );
 		IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", chan );
-		IRC_WriteStrChannelPrefix( Client, Channel_Search( chan ), target, "JOIN :%s", chan );
+		IRC_WriteStrChannelPrefix( Client, Channel_Search( chan ), target, FALSE, "JOIN :%s", chan );
 
-		Log( LOG_DEBUG, "User \"%s\" joined channel \"%s\".", Client_Mask( target ), Req->argv[0] );
+		if( Client_Type( Client ) == CLIENT_USER )
+		{
+			/* Topic an Client schicken */
+			IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), chan, "What a wonderful channel!" );
+		}
 		
 		/* naechsten Namen ermitteln */
 		chan = strtok( NULL, "," );
blob - e0dadfe86fe542fd2cefd25d4d9f706c5513c07d
blob + ee191bf57edfe8db9204d9d115dc2a236123cd34
--- src/ngircd/irc.h
+++ src/ngircd/irc.h
@@ -9,11 +9,16 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.h,v 1.19 2002/01/26 18:43:11 alex Exp $
+ * $Id: irc.h,v 1.20 2002/01/27 17:15:49 alex Exp $
  *
  * irc.h: IRC-Befehle (Header)
  *
  * $Log: irc.h,v $
+ * Revision 1.20  2002/01/27 17:15:49  alex
+ * - anderungen an den Funktions-Prototypen von IRC_WriteStrChannel() und
+ *   IRC_WriteStrChannelPrefix(),
+ * - neue: IRC_WriteStrClientPrefixID() und IRC_WriteStrServersPrefixID().
+ *
  * Revision 1.19  2002/01/26 18:43:11  alex
  * - neue Funktionen IRC_WriteStrChannelPrefix() und IRC_WriteStrChannel(),
  *   die IRC_Write_xxx_Related() sind dafuer entfallen.
@@ -92,10 +97,12 @@ GLOBAL VOID IRC_Exit( VOID );
 
 GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CHAR *Format, ... );
 GLOBAL BOOLEAN IRC_WriteStrClientPrefix( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... );
-GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, CHAR *Format, ... );
-GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, CHAR *Format, ... );
+GLOBAL BOOLEAN IRC_WriteStrClientPrefixID( CLIENT *Client, CLIENT *Prefix, CHAR *Format, ... );
+GLOBAL BOOLEAN IRC_WriteStrChannel( CLIENT *Client, CHANNEL *Chan, BOOLEAN Remote, CHAR *Format, ... );
+GLOBAL BOOLEAN IRC_WriteStrChannelPrefix( CLIENT *Client, CHANNEL *Chan, CLIENT *Prefix, BOOLEAN Remote, CHAR *Format, ... );
 GLOBAL VOID IRC_WriteStrServers( CLIENT *ExceptOf, CHAR *Format, ... );
 GLOBAL VOID IRC_WriteStrServersPrefix( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... );
+GLOBAL VOID IRC_WriteStrServersPrefixID( CLIENT *ExceptOf, CLIENT *Prefix, CHAR *Format, ... );
 
 GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req );
 GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req );