- fehlenden Return-Wert ergaenzt (ich Dubel).

[ngircd-alex.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index eadfe1543f108468c6ccd41b69dbe8907e168095..ff75b0343cfed4819ee8b2063e7c736b82798fbe 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,7 +9,7 @@
  * 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.90 2002/05/27 13:09:27 alex Exp $
+ * $Id: irc.c,v 1.98 2002/10/09 13:35:32 alex Exp $
  *
  * irc.c: IRC-Befehle
  */
@@ -79,6 +79,9 @@ IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
        cl = Client_Search( Req->argv[0] );
        if( cl )
        {
+               /* Okay, Ziel ist ein Client. Aber ist es auch ein User? */
+               if( Client_Type( cl ) != CLIENT_USER ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( from ), Req->argv[0] );
+
                /* Okay, Ziel ist ein User */
                if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' )))
                {
@@ -106,7 +109,7 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+       if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return CONNECTED;
 
        /* Falsche Anzahl Parameter? */
        if( Req->argc != 2 ) return CONNECTED;
@@ -116,7 +119,7 @@ IRC_NOTICE( CLIENT *Client, REQUEST *Req )
        if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        to = Client_Search( Req->argv[0] );
-       if( to )
+       if(( to ) && ( Client_Type( to ) == CLIENT_USER ))
        {
                /* Okay, Ziel ist ein User */
                return IRC_WriteStrClientPrefix( to, from, "NOTICE %s :%s", Client_ID( to ), Req->argv[1] );
@@ -203,7 +206,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
                        if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
                                /* Zeile wird zu lang: senden! */
-                               if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+                               if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
                                sprintf( rpl, RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
                        }
                }
@@ -214,7 +217,7 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
        if( rpl[strlen( rpl ) - 1] != ':')
        {
                /* es wurden User gefunden */
-               if( ! IRC_WriteStrClient( from, rpl )) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
        }
        
        return IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), "*" );
@@ -256,7 +259,7 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        }
        if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
-       return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+       return IRC_WriteStrClient( Client, "%s", rpl, Client_ID( Client ) );
 } /* IRC_ISON */
 
 
@@ -322,7 +325,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                if( strlen( str ) > ( LINE_LEN - CHANNEL_NAME_LEN - 4 ))
                {
                        /* Zeile wird zu lang: senden! */
-                       if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+                       if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
                        sprintf( str, RPL_WHOISCHANNELS_MSG, Client_ID( from ), Client_ID( c ));
                }
 
@@ -332,7 +335,7 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
        if( str[strlen( str ) - 1] != ':')
        {
                /* Es sind noch Daten da, die gesendet werden muessen */
-               if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
        }
        
        /* IRC-Operator? */
@@ -474,7 +477,7 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
        }
        if( rpl[strlen( rpl ) - 1] == ' ' ) rpl[strlen( rpl ) - 1] = '\0';
 
-       return IRC_WriteStrClient( Client, rpl, Client_ID( Client ) );
+       return IRC_WriteStrClient( Client, "%s", rpl, Client_ID( Client ) );
 } /* IRC_USERHOST */
 
 
@@ -609,7 +612,7 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
        }
 
        /* mit Versionsinfo antworten */
-       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
+       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE, VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition( ));
 } /* IRC_VERSION */
 
 
@@ -640,12 +643,61 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
 
        /* haben wir selber einen solchen Client? */
        c = Client_Search( Req->argv[0] );
-       if( c && ( Client_Conn( c ) != NONE )) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
-       
+       if( c )
+       {
+               /* Ja, wir haben einen solchen Client */
+               if( Client_Conn( c ) != NONE ) Conn_Close( Client_Conn( c ), NULL, Req->argv[1], TRUE );
+               else Client_Destroy( c, NULL, Req->argv[1], TRUE );
+       }
+       else Log( LOG_NOTICE, "Client with nick \"%s\" is unknown here.", Req->argv[0] );
+
        return CONNECTED;
 } /* IRC_KILL */
 
 
+GLOBAL BOOLEAN
+IRC_ADMIN(CLIENT *Client, REQUEST *Req )
+{
+       CLIENT *target, *prefix;
+
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+       /* Falsche Anzahl Parameter? */
+       if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       /* Ziel suchen */
+       if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
+       else target = Client_ThisServer( );
+
+       /* Prefix ermitteln */
+       if( Client_Type( Client ) == CLIENT_SERVER ) prefix = Client_Search( Req->prefix );
+       else prefix = Client;
+       if( ! prefix ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+
+       /* An anderen Server weiterleiten? */
+       if( target != Client_ThisServer( ))
+       {
+               if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+               /* forwarden */
+               IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
+               return CONNECTED;
+       }
+
+       /* mit Versionsinfo antworten */
+       if( ! IRC_WriteStrClient( Client, RPL_ADMINME_MSG, Client_ID( prefix ), Conf_ServerName )) return DISCONNECTED;
+       if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC1_MSG, Client_ID( prefix ), Conf_ServerAdmin1 )) return DISCONNECTED;
+       if( ! IRC_WriteStrClient( Client, RPL_ADMINLOC2_MSG, Client_ID( prefix ), Conf_ServerAdmin2 )) return DISCONNECTED;
+       if( ! IRC_WriteStrClient( Client, RPL_ADMINEMAIL_MSG, Client_ID( prefix ), Conf_ServerAdminMail )) return DISCONNECTED;
+
+       return CONNECTED;
+} /* IRC_ADMIN */
+
+
+
 GLOBAL BOOLEAN
 IRC_Show_MOTD( CLIENT *Client )
 {
@@ -716,7 +768,7 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
                        if( strlen( str ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
                                /* Zeile wird zu lang: senden! */
-                               if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+                               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
                                sprintf( str, RPL_NAMREPLY_MSG, Client_ID( Client ), "=", Channel_Name( Chan ));
                        }
                }
@@ -727,7 +779,7 @@ IRC_Send_NAMES( CLIENT *Client, CHANNEL *Chan )
        if( str[strlen( str ) - 1] != ':')
        {
                /* Es sind noch Daten da, die gesendet werden muessen */
-               if( ! IRC_WriteStrClient( Client, str )) return DISCONNECTED;
+               if( ! IRC_WriteStrClient( Client, "%s", str )) return DISCONNECTED;
        }
 
        return CONNECTED;