- Parser auf Befehlstabelle umgestellt.

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 402cfead579d5c2e3c5601ec1cff3c3c0e677e53..2b8dbde47e7c18eccfb78455e700564b792dc6fc 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.95 2002/09/16 09:14:45 alex Exp $
+ * $Id: irc.c,v 1.103 2002/11/30 15:04:57 alex Exp $
  *
  * irc.c: IRC-Befehle
  */
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "ngircd.h"
 #include "conn.h"
@@ -44,15 +45,33 @@
 GLOBAL BOOLEAN
 IRC_MOTD( CLIENT *Client, REQUEST *Req )
 {
+       CLIENT *from, *target;
+
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
        /* Falsche Anzahl Parameter? */
-       if( Req->argc != 0 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+       if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       /* From aus Prefix ermitteln */
+       if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+       else from = Client;
+       if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+       
+       if( Req->argc == 1 )
+       {
+               /* an anderen Server forwarden */
+               target = Client_Search( Req->argv[0] );
+               if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+               if( target != Client_ThisServer( ))
+               {
+                       /* Ok, anderer Server ist das Ziel: forwarden */
+                       return IRC_WriteStrClientPrefix( target, from, "MOTD %s", Req->argv[0] );
+               }
+       }
 
-       return IRC_Show_MOTD( Client );
+       return IRC_Show_MOTD( from );
 } /* IRC_MOTD */
 
 
@@ -65,8 +84,6 @@ IRC_PRIVMSG( 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 ));
-
        /* Falsche Anzahl Parameter? */
        if( Req->argc == 0 ) return IRC_WriteStrClient( Client, ERR_NORECIPIENT_MSG, Client_ID( Client ), Req->command );
        if( Req->argc == 1 ) return IRC_WriteStrClient( Client, ERR_NOTEXTTOSEND_MSG, Client_ID( Client ));
@@ -109,7 +126,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;
@@ -138,8 +155,6 @@ IRC_NAMES( 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 ));
-
        /* Falsche Anzahl Parameter? */
        if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -206,7 +221,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 ), "*", "*" );
                        }
                }
@@ -217,7 +232,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 ), "*" );
@@ -235,8 +250,6 @@ IRC_ISON( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if( Client_Type( Client ) != CLIENT_USER ) 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 );
 
@@ -259,7 +272,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 */
 
 
@@ -274,8 +287,6 @@ IRC_WHOIS( 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 ));
-
        /* Falsche Anzahl Parameter? */
        if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -325,7 +336,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 ));
                }
 
@@ -335,7 +346,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? */
@@ -361,6 +372,21 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 } /* IRC_WHOIS */
 
 
+GLOBAL BOOLEAN
+IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
+{
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       /* Falsche Anzahl Parameter? */
+       if(( Req->argc < 1 ) || ( Req->argc > 3 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       /* ... */
+
+       return CONNECTED;
+} /* IRC_WHOWAS */
+
+
 GLOBAL BOOLEAN
 IRC_WHO( CLIENT *Client, REQUEST *Req )
 {
@@ -373,8 +399,6 @@ IRC_WHO( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
        /* Falsche Anzahl Parameter? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -449,8 +473,6 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if( Client_Type( Client ) != CLIENT_USER ) 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 );
 
@@ -477,7 +499,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 */
 
 
@@ -502,8 +524,6 @@ IRC_LUSERS( 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 ));
-
        /* Falsche Anzahl Parameter? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -540,8 +560,6 @@ IRC_LINKS( 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 ));
-
        /* Falsche Anzahl Parameter? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -624,8 +642,6 @@ IRC_KILL( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       if( Client_Type( Client ) != CLIENT_SERVER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
-
        /* Falsche Anzahl Parameter? */
        if(( Req->argc != 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -663,8 +679,6 @@ IRC_ADMIN(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 ));
-
        /* Falsche Anzahl Parameter? */
        if(( Req->argc > 1 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
@@ -697,6 +711,42 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 } /* IRC_ADMIN */
 
 
+GLOBAL BOOLEAN
+IRC_TIME( CLIENT *Client, REQUEST *Req )
+{
+       CLIENT *from, *target;
+       CHAR t_str[64];
+       time_t t;
+
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       /* Falsche Anzahl Parameter? */
+       if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       /* From aus Prefix ermitteln */
+       if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
+       else from = Client;
+       if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->prefix );
+       
+       if( Req->argc == 1 )
+       {
+               /* an anderen Server forwarden */
+               target = Client_Search( Req->argv[0] );
+               if( ! target ) return IRC_WriteStrClient( Client, ERR_NOSUCHSERVER_MSG, Client_ID( Client ), Req->argv[0] );
+
+               if( target != Client_ThisServer( ))
+               {
+                       /* Ok, anderer Server ist das Ziel: forwarden */
+                       return IRC_WriteStrClientPrefix( target, from, "TIME %s", Req->argv[0] );
+               }
+       }
+
+       t = time( NULL );
+       (VOID)strftime( t_str, 60, "%A %B %d %Y -- %H:%M %z", localtime( &t ));
+       return IRC_WriteStrClient( from, RPL_TIME_MSG, Client_ID( from ), Client_ID( Client_ThisServer( )), t_str );
+} /* IRC_TIME */
+
 
 GLOBAL BOOLEAN
 IRC_Show_MOTD( CLIENT *Client )
@@ -768,7 +818,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 ));
                        }
                }
@@ -779,7 +829,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;
@@ -834,7 +884,7 @@ IRC_Send_WHO( CLIENT *Client, CHANNEL *Chan, BOOLEAN OnlyOps )
 GLOBAL BOOLEAN
 IRC_Send_LUSERS( CLIENT *Client )
 {
-       INT cnt;
+       LONG cnt;
 
        assert( Client != NULL );