X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Firc.c;h=1c4212c11d0892bd3d6527f7f8e0143553c5e220;hp=2ede2e69d86726b2186eb4982c8bf2eb64e3992f;hb=3a941ae45953a0307a44848d513e87c63a630f22;hpb=574ae82ca411afb56bb1688ce3c17f254f57522f

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 2ede2e69..1c4212c1 100644
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,21 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an comBase beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.10 2001/12/26 22:48:53 alex Exp $
+ * $Id: irc.c,v 1.13 2001/12/29 03:10:06 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.13  2001/12/29 03:10:06  alex
+ * - Neue Funktion IRC_MODE() implementiert, div. Aenderungen.
+ * - neue configure-Optione "--enable-strict-rfc".
+ *
+ * Revision 1.12  2001/12/27 19:17:26  alex
+ * - neue Befehle PRIVMSG, NOTICE, PING.
+ *
+ * Revision 1.11  2001/12/27 16:55:41  alex
+ * - neu: IRC_WriteStrRelated(), Aenderungen auch in IRC_WriteStrClient().
+ *
  * Revision 1.10  2001/12/26 22:48:53  alex
  * - MOTD-Datei ist nun konfigurierbar und wird gelesen.
  *
@@ -96,31 +106,46 @@ GLOBAL BOOLEAN IRC_WriteStrClient( CLIENT *Client, CLIENT *Prefix, CHAR *Format,
 
 	CHAR buffer[1000];
 	BOOLEAN ok = CONNECTED;
+	CONN_ID send_to;
 	va_list ap;
 
 	assert( Client != NULL );
 	assert( Format != NULL );
 
 	va_start( ap, Format );
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
 
-	if( Client->conn_id != NONE )
-	{
-		/* Lokaler Client */
-		vsnprintf( buffer, 1000, Format, ap );
-		if( Prefix ) ok = Conn_WriteStr( Client->conn_id, ":%s %s", Prefix->host, buffer );
-		else ok = Conn_WriteStr( Client->conn_id, buffer );
-	}
-	else
-	{
-		/* Remote-Client */
-		Log( LOG_EMERG, "not implemented: IRC_WriteStrClient()" );
-	}
+	if( Client->conn_id != NONE ) send_to = Client->conn_id;
+	else send_to = Client->introducer->conn_id;
+
+	if( Prefix ) ok = Conn_WriteStr( Client->conn_id, ":%s %s", Client_GetID( Prefix ), buffer );
+	else ok = Conn_WriteStr( Client->conn_id, buffer );
 
-	va_end( ap );
 	return ok;
 } /* IRC_WriteStrClient */
 
 
+GLOBAL BOOLEAN IRC_WriteStrRelated( CLIENT *Client, CHAR *Format, ... )
+{
+	CHAR buffer[1000];
+	BOOLEAN ok = CONNECTED;
+	va_list ap;
+
+	assert( Client != NULL );
+	assert( Format != NULL );
+
+	va_start( ap, Format );
+	vsnprintf( buffer, 1000, Format, ap );
+	va_end( ap );
+
+	/* an den Client selber */
+	ok = IRC_WriteStrClient( Client, Client, buffer );
+
+	return ok;
+} /* IRC_WriteStrRelated */
+
+
 GLOBAL BOOLEAN IRC_PASS( CLIENT *Client, REQUEST *Req )
 {
 	assert( Client != NULL );
@@ -140,14 +165,36 @@ GLOBAL BOOLEAN IRC_NICK( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( Client->type != CLIENT_SERVER && Client->type != CLIENT_SERVICE )
+	/* Zumindest BitchX sendet NICK-USER in der falschen Reihenfolge. */
+#ifndef STRICT_RFC
+	if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTPASS || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTUSER || Client->type == CLIENT_USER )
+#else
+	if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTPASS || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_USER  )
+#endif
 	{
 		/* Falsche Anzahl Parameter? */
 		if( Req->argc != 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
 
+		/* Ist der Client "restricted"? */
+		if( strchr( Client->modes, 'r' )) return IRC_WriteStrClient( Client, This_Server, ERR_RESTRICTED_MSG, Client_Name( Client ));
+
+		/* Wenn der Client zu seinem eigenen Nick wechseln will, so machen
+		 * wir nichts. So macht es das Original und mind. Snak hat probleme,
+		 * wenn wir es nicht so machen. Ob es so okay ist? Hm ... */
+#ifndef STRICT_RFC
+		if( strcasecmp( Client->nick, Req->argv[0] ) == 0 ) return CONNECTED;
+#endif
+		
 		/* pruefen, ob Nick bereits vergeben */
 		if( ! Client_CheckNick( Client, Req->argv[0] )) return CONNECTED;
 
+		if( Client->type == CLIENT_USER )
+		{
+			/* Nick-Aenderung: allen mitteilen! */
+			Log( LOG_INFO, "User \"%s!%s@%s\" changed nick: \"%s\" -> \"%s\".", Client->nick, Client->user, Client->host, Client->nick, Req->argv[0] );
+			IRC_WriteStrRelated( Client, "NICK :%s", Req->argv[0] );
+		}
+		
 		/* Client-Nick registrieren */
 		strcpy( Client->nick, Req->argv[0] );
 
@@ -169,7 +216,11 @@ GLOBAL BOOLEAN IRC_USER( CLIENT *Client, REQUEST *Req )
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	if( Client->type == CLIENT_UNKNOWN || Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS )
+#ifndef STRICT_RFC
+	if( Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS || Client->type == CLIENT_UNKNOWN )
+#else
+	if( Client->type == CLIENT_GOTNICK || Client->type == CLIENT_GOTPASS )
+#endif
 	{
 		/* Falsche Anzahl Parameter? */
 		if( Req->argc != 4 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
@@ -211,10 +262,21 @@ GLOBAL BOOLEAN IRC_QUIT( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_PING( CLIENT *Client, REQUEST *Req )
 {
+	CLIENT *to;
+	
 	assert( Client != NULL );
 	assert( Req != NULL );
 
-	return IRC_WriteStrClient( Client, This_Server, ERR_UNKNOWNCOMMAND_MSG, Client_Name( Client ), Req->command );
+	if( ! Check_Valid_User( Client )) return CONNECTED;
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc < 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOORIGIN_MSG, Client_Name( Client ));
+	if( Req->argc > 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
+
+	to = Client_Search( Req->argv[0] );
+	
+	if( to ) return IRC_WriteStrClient( Client, This_Server, "PONG :%s", Client_Name( Client ));
+	else return IRC_WriteStrClient( Client, This_Server, ERR_NOSUCHNICK_MSG, Client_Name( Client ), Req->argv[0] );
 } /* IRC_PING */
 
 
@@ -251,6 +313,148 @@ GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req )
 } /* IRC_MOTD */
 
 
+GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *to;
+	
+	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_NORECIPIENT_MSG, Client_Name( Client ), Req->command );
+	if( Req->argc == 1 ) return IRC_WriteStrClient( Client, This_Server, ERR_NOTEXTTOSEND_MSG, Client_Name( Client ));
+	if( Req->argc > 2 ) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
+
+	to = Client_Search( Req->argv[0] );
+	if( to )
+	{
+		/* Okay, Ziel ist ein User */
+		return IRC_WriteStrClient( to, Client, "PRIVMSG %s :%s", to->nick, Req->argv[1] );
+	}
+
+	return IRC_WriteStrClient( Client, This_Server, ERR_NOSUCHNICK_MSG, Client_Name( Client ), Req->argv[0] );
+} /* IRC_PRIVMSG */
+
+
+GLOBAL BOOLEAN IRC_NOTICE( CLIENT *Client, REQUEST *Req )
+{
+	CLIENT *to;
+
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if( ! Check_Valid_User( Client )) return CONNECTED;
+
+	/* Falsche Anzahl Parameter? */
+	if( Req->argc != 2 ) return CONNECTED;
+
+	to = Client_Search( Req->argv[0] );
+	if( to )
+	{
+		/* Okay, Ziel ist ein User */
+		return IRC_WriteStrClient( to, Client, "NOTICE %s :%s", to->nick, Req->argv[1] );
+	}
+
+	return CONNECTED;
+} /* IRC_NOTICE */
+
+
+GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
+{
+	CHAR x[2], new_modes[CLIENT_MODE_LEN], *ptr, *p;
+	BOOLEAN set, ok;
+	
+	assert( Client != NULL );
+	assert( Req != NULL );
+
+	if( ! Check_Valid_User( Client )) return CONNECTED;
+
+	/* Falsche Anzahl Parameter? */
+	if(( Req->argc > 2 ) || ( Req->argc < 1 )) return IRC_WriteStrClient( Client, This_Server, ERR_NEEDMOREPARAMS_MSG, Client_Name( Client ), Req->command );
+
+	/* MODE ist nur fuer sich selber zulaessig */
+	if( Client_Search( Req->argv[0] ) != Client ) return IRC_WriteStrClient( Client, This_Server, ERR_USERSDONTMATCH_MSG, Client_Name( Client ));
+
+	/* Werden die Modes erfragt? */
+	if( Req->argc == 1 ) return IRC_WriteStrClient( Client, This_Server, RPL_UMODEIS_MSG, Client_Name( Client ), Client->modes );
+
+	ptr = Req->argv[1];
+
+	/* Sollen Modes gesetzt oder geloescht werden? */
+	if( *ptr == '+' ) set = TRUE;
+	else if( *ptr == '-' ) set = FALSE;
+	else return IRC_WriteStrClient( Client, This_Server, ERR_UMODEUNKNOWNFLAG_MSG, Client_Name( Client ));
+
+	/* Reply-String mit Aenderungen vorbereiten */
+	if( set ) strcpy( new_modes, "+" );
+	else strcpy( new_modes, "-" );
+
+	ptr++;
+	ok = TRUE;
+	x[1] = '\0';
+	while( *ptr )
+	{
+		x[0] = '\0';
+		switch( *ptr )
+		{
+			case 'i':
+				/* invisible */
+				x[0] = 'i';
+				break;
+			case 'r':
+				/* restricted (kann nur gesetzt werden) */
+				if( set ) x[0] = 'r';
+				else ok = IRC_WriteStrClient( Client, This_Server, ERR_RESTRICTED_MSG, Client_Name( Client ));
+				break;
+			default:
+				ok = IRC_WriteStrClient( Client, This_Server, ERR_UMODEUNKNOWNFLAG_MSG, Client_Name( Client ));
+				x[0] = '\0';
+		}
+		if( ! ok ) break;
+
+		ptr++;
+		if( ! x[0] ) continue;
+
+		/* Okay, gueltigen Mode gefunden */
+		if( set )
+		{
+			/* Modes sollen gesetzt werden */
+			if( ! strchr( Client->modes, x[0] ))
+			{
+				/* Client hat den Mode noch nicht -> setzen */
+				strcat( Client->modes, x );
+				strcat( new_modes, x );
+			}
+		}
+		else
+		{
+			/* Modes sollen geloescht werden */
+			p = strchr( Client->modes, x[0] );
+			if( p )
+			{
+				/* Client hat den Mode -> loeschen */
+				while( *p )
+				{
+					*p = *(p + 1);
+					p++;
+				}
+				strcat( new_modes, x );
+			}
+		}
+	}
+	
+	/* Geanderte Modes? */
+	if( new_modes[1] && ok )
+	{
+		ok = IRC_WriteStrRelated( Client, "MODE %s :%s", Client->nick, new_modes );
+		Log( LOG_DEBUG, "User \"%s!%s@%s\": Mode change, now \"%s\".", Client->nick, Client->user, Client->host, Client->modes );
+	}
+	return ok;
+} /* IRC_MODE */
+
+
 LOCAL BOOLEAN Check_Valid_User( CLIENT *Client )
 {
 	assert( Client != NULL );
@@ -269,9 +473,9 @@ LOCAL BOOLEAN Hello_User( CLIENT *Client )
 	assert( Client != NULL );
 	assert( Client->nick[0] );
 	
-	Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered.", Client->nick, Client->user, Client->host, Client->name );
+	Log( LOG_NOTICE, "User \"%s!%s@%s\" (%s) registered (connection %d).", Client->nick, Client->user, Client->host, Client->name, Client->conn_id );
 
-	IRC_WriteStrClient( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client->nick, Client->user, Client->host );
+	IRC_WriteStrClient( Client, This_Server, RPL_WELCOME_MSG, Client->nick, Client_GetID( Client ));
 	IRC_WriteStrClient( Client, This_Server, RPL_YOURHOST_MSG, Client->nick, This_Server->host );
 	IRC_WriteStrClient( Client, This_Server, RPL_CREATED_MSG, Client->nick );
 	IRC_WriteStrClient( Client, This_Server, RPL_MYINFO_MSG, Client->nick, This_Server->host );