X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=cbec071c72bae4945406e7261ec73174beb40172;hp=4c4db01023a1feae06a11861660927256f268af4;hb=03d971d99481244e7039bc960cfb962795fbe905;hpb=804b1ec4987ed3beb4759cc480b2c6c911627b7e

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 4c4db010..cbec071c 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001 by Alexander Barton (alex@barton.de)
+ * 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
@@ -9,11 +9,18 @@
  * 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.16 2001/12/31 02:18:51 alex Exp $
+ * $Id: irc.c,v 1.18 2002/01/02 02:44:36 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.18  2002/01/02 02:44:36  alex
+ * - neue Defines fuer max. Anzahl Server und Operatoren.
+ *
+ * Revision 1.17  2001/12/31 15:33:13  alex
+ * - neuer Befehl NAMES, kleinere Bugfixes.
+ * - Bug bei PING behoben: war zu restriktiv implementiert :-)
+ *
  * Revision 1.16  2001/12/31 02:18:51  alex
  * - viele neue Befehle (WHOIS, ISON, OPER, DIE, RESTART),
  * - neuen Header "defines.h" mit (fast) allen Konstanten.
@@ -276,8 +283,6 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
 {
-	CLIENT *to;
-	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
@@ -287,10 +292,7 @@ GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
 	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOORIGIN_MSG, Client_Nick( Client ));
 	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
 
-	to = Client_Search( Req->argv[0] );
-	
-	if( to ) return IRC_WriteStrClient( Client, This_Server, "PONG :%s", Client_Nick( Client ));
-	else return IRC_WriteStrClient( Client, This_Server, ERR_NOSUCHNICK_MSG, Client_Nick( Client ), Req->argv[0] );
+	return IRC_WriteStrClient( Client, This_Server, "PONG %s :%s", Client_Nick( This_Server), Client_Nick( Client ));
 } /* IRC_PING */
 
 
@@ -481,6 +483,8 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req )
 {
+	INT i;
+	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
@@ -488,12 +492,16 @@ GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req )
 	
 	/* Falsche Anzahl Parameter? */
 	if( Req->argc != 2 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
-	
-	/* Ist ueberhaupt ein Operator gesetzt? */
-	if(( ! Conf_Oper[0] ) || ( ! Conf_OperPwd[0] )) return IRC_WriteStrClient( Client, This_Server, ERR_PASSWDMISMATCH_MSG, Client_Nick( Client ));
+
+	/* Operator suchen */
+	for( i = 0; i < Conf_Oper_Count; i++)
+	{
+		if( Conf_Oper[i].name[0] && Conf_Oper[i].pwd[0] && ( strcmp( Conf_Oper[i].name, Req->argv[0] ) == 0 )) break;
+	}
+	if( i >= Conf_Oper_Count ) return IRC_WriteStrClient( Client, This_Server, ERR_PASSWDMISMATCH_MSG, Client_Nick( Client ));
 
 	/* Stimmt der Name und das Passwort? */
-	if(( strcmp( Conf_Oper, Req->argv[0] ) != 0 ) || ( strcmp( Conf_OperPwd, Req->argv[1] ) != 0 )) return IRC_WriteStrClient( Client, This_Server, ERR_PASSWDMISMATCH_MSG, Client_Nick( Client ));
+	if(( strcmp( Conf_Oper[i].name, Req->argv[0] ) != 0 ) || ( strcmp( Conf_Oper[i].pwd, Req->argv[1] ) != 0 )) return IRC_WriteStrClient( Client, This_Server, ERR_PASSWDMISMATCH_MSG, Client_Nick( Client ));
 	
 	if( ! strchr( Client->modes, 'o' ))
 	{
@@ -545,6 +553,51 @@ GLOBAL BOOLEAN IRC_RESTART( CLIENT *Client, REQUEST *Req )
 } /* IRC_RESTART */
 
 
+GLOBAL BOOLEAN IRC_NAMES( CLIENT *Client, REQUEST *Req )
+{
+	CHAR rpl[COMMAND_LEN];
+	CLIENT *c;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if( ! Check_Valid_User( Client )) return CONNECTED;
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 0 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Nick( Client ), Req->command );
+
+	/* Noch alle User ausgeben, die in keinem Channel sind */
+	rpl[0] = '\0';
+	c = Client_First( );
+	while( c )
+	{
+		if( c->type == CLIENT_USER )
+		{
+			/* Okay, das ist ein User */
+			strcat( rpl, Client_Nick( c ));
+			strcat( rpl, " " );
+		}
+
+		/* Antwort zu lang? Splitten. */
+		if( strlen( rpl ) > 480 )
+		{
+			if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
+			if( ! IRC_WriteStrClient( Client, This_Server, RPL_NAMREPLY_MSG, Client_Nick( Client ), "*", "*", rpl )) return DISCONNECTED;
+			rpl[0] = '\0';
+		}
+		
+		c = Client_Next( c );
+	}
+	if( rpl[0] )
+	{
+		/* es wurden User gefunden */
+		if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
+		if( ! IRC_WriteStrClient( Client, This_Server, RPL_NAMREPLY_MSG, Client_Nick( Client ), "*", "*", rpl )) return DISCONNECTED;
+	}
+	return IRC_WriteStrClient( Client, This_Server, RPL_ENDOFNAMES_MSG, Client_Nick( Client ), "*" );
+} /* IRC_NAMES */
+
+
 GLOBAL BOOLEAN IRC_ISON( CLIENT *Client, REQUEST *Req )
 {
 	CHAR rpl[COMMAND_LEN];
@@ -660,7 +713,19 @@ GLOBAL BOOLEAN IRC_USERHOST( CLIENT *Client, REQUEST *Req )
 	if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
 	return IRC_WriteStrClient( Client, This_Server, rpl, Client->nick );
-} /* IRC_USERHOST */	
+} /* IRC_USERHOST */
+
+
+GLOBAL BOOLEAN IRC_ERROR( CLIENT *Client, REQUEST *Req )
+{
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if( Req->argc < 1 ) Log( LOG_NOTICE, "Got ERROR from \"%s!%s@%s\"!", Client_Nick( Client ), Client->user, Client->host );
+	else Log( LOG_NOTICE, "Got ERROR from \"%s!%s@%s\": %s!", Client_Nick( Client ), Client->user, Client->host, Req->argv[0] );
+
+	return CONNECTED;
+} /* IRC_ERROR */
 
 
 LOCAL BOOLEAN Check_Valid_User( CLIENT *Client )