]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-info.c
Merge commit 'aad49bd260494878aed6795c7a897ad1d28c3082'
[ngircd-alex.git] / src / ngircd / irc-info.c
index 7878c5d4ab2a3459b580505df2b53b81e0f1b2e2..43f2c1b6e4c1949724fa2e6281b70a11375a3ea3 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2005 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,6 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: irc-info.c,v 1.43 2008/02/17 00:00:12 fw Exp $";
-
 #include "imp.h"
 #include <assert.h>
 #include <errno.h>
@@ -25,7 +23,6 @@ static char UNUSED id[] = "$Id: irc-info.c,v 1.43 2008/02/17 00:00:12 fw Exp $";
 #include <strings.h>
 
 #include "ngircd.h"
-#include "cvs-version.h"
 #include "conn-func.h"
 #include "conn-zip.h"
 #include "client.h"
@@ -85,6 +82,71 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
 } /* IRC_ADMIN */
 
 
+/**
+ * Handler for the IRC command "INFO".
+ * See RFC 2812 section 3.4.10.
+ */
+GLOBAL bool
+IRC_INFO(CLIENT * Client, REQUEST * Req)
+{
+       CLIENT *target, *prefix;
+       char msg[510];
+
+       assert(Client != NULL);
+       assert(Req != NULL);
+
+       /* Wrong number of parameters? */
+       if (Req->argc > 1)
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
+
+       /* Determine prefix */
+       if (Client_Type(Client) == CLIENT_SERVER)
+               prefix = Client_Search(Req->prefix);
+       else
+               prefix = Client;
+       if (!prefix)
+               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+                                         Client_ID(Client), Req->prefix);
+
+       /* Look for a target */
+       if (Req->argc > 0)
+               target = Client_Search(Req->argv[0]);
+       else
+               target = Client_ThisServer();
+       
+       /* Make sure that the target is a server */
+       if (target && Client_Type(target) != CLIENT_SERVER)
+               target = Client_Introducer(target);
+
+       if (!target)
+               return IRC_WriteStrClient(prefix, ERR_NOSUCHSERVER_MSG,
+                                         Client_ID(prefix), Req->argv[0]);
+
+       /* Pass on to another server? */
+       if (target != Client_ThisServer()) {
+               IRC_WriteStrClientPrefix(target, prefix, "INFO %s",
+                                        Req->argv[0]);
+               return CONNECTED;
+       }
+
+       if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix),
+                               NGIRCd_Version))
+               return DISCONNECTED;
+       
+       strlcpy(msg, "Server has been started ", sizeof(msg));
+       strlcat(msg, NGIRCd_StartStr, sizeof(msg));
+       if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg))
+               return DISCONNECTED;
+
+       if (!IRC_WriteStrClient(Client, RPL_ENDOFINFO_MSG, Client_ID(prefix)))
+               return DISCONNECTED;
+
+       IRC_SetPenalty(Client, 2);
+       return CONNECTED;
+} /* IRC_INFO */
+
+
 GLOBAL bool
 IRC_ISON( CLIENT *Client, REQUEST *Req )
 {
@@ -207,6 +269,26 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 } /* IRC_LUSERS */
 
 
+/**
+ * List registered services.
+ * This function is a dummy that immediately returns RPL_SERVLISTEND.
+ */
+GLOBAL bool
+IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
+{
+       assert(Client != NULL);
+       assert(Req != NULL);
+
+       if (Req->argc > 2)
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
+
+       return IRC_WriteStrClient(Client, RPL_SERVLISTEND_MSG, Client_ID(Client),
+                                 Req->argc > 0 ? Req->argv[0] : "*",
+                                 Req->argc > 1 ? Req->argv[1] : "0");
+} /* IRC_SERVLIST */
+
+
 GLOBAL bool
 IRC_MOTD( CLIENT *Client, REQUEST *Req )
 {
@@ -469,6 +551,19 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
 } /* IRC_STATS */
 
 
+/**
+ * Handler for the IRC command "SUMMON".
+ * See RFC 2812 section 4.5. ngIRCd doesn't implement this functionality and
+ * therefore answers with ERR_SUMMONDISABLED.
+ */
+GLOBAL bool
+IRC_SUMMON(CLIENT * Client, REQUEST * Req)
+{
+       return IRC_WriteStrClient(Client, ERR_SUMMONDISABLED_MSG,
+                                 Client_ID(Client), Req->command);
+} /* IRC_SUMMON */
+
+
 GLOBAL bool
 IRC_TIME( CLIENT *Client, REQUEST *Req )
 {
@@ -546,13 +641,22 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
 } /* IRC_USERHOST */
 
 
+/**
+ * Handler for the IRC command "USERS".
+ * See RFC 2812 section 4.6. As suggested there the command is disabled.
+ */
+GLOBAL bool
+IRC_USERS(CLIENT * Client, REQUEST * Req)
+{
+       return IRC_WriteStrClient(Client, ERR_USERSDISABLED_MSG,
+                                 Client_ID(Client), Req->command);
+} /* IRC_USERS */
+
+
 GLOBAL bool
 IRC_VERSION( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *prefix;
-#ifdef CVSDATE
-       char ver[12], vertxt[30];
-#endif
 
        assert( Client != NULL );
        assert( Req != NULL );
@@ -579,21 +683,15 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
                return CONNECTED;
        }
 
-       /* mit Versionsinfo antworten */
-       IRC_SetPenalty( Client, 1 );
-#ifdef CVSDATE
-       strlcpy( ver, CVSDATE, sizeof( ver ));
-       strncpy( ver + 4, ver + 5, 2 );
-       strncpy( ver + 6, ver + 8, 3 );
-       snprintf( vertxt, sizeof( vertxt ), "%s(%s)", PACKAGE_VERSION, ver );
-       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, vertxt, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition );
-#else
-       return IRC_WriteStrClient( Client, RPL_VERSION_MSG, Client_ID( prefix ), PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_DebugLevel, Conf_ServerName, NGIRCd_VersionAddition );
-#endif
+       /* send version information */
+       IRC_SetPenalty(Client, 1);
+       return IRC_WriteStrClient(Client, RPL_VERSION_MSG, Client_ID(prefix),
+                                 PACKAGE_NAME, PACKAGE_VERSION,
+                                 NGIRCd_DebugLevel, Conf_ServerName,
+                                 NGIRCd_VersionAddition);
 } /* IRC_VERSION */
 
 
-
 static bool
 write_whoreply(CLIENT *Client, CLIENT *c, const char *channelname, const char *flags)
 {
@@ -640,7 +738,7 @@ IRC_Send_WHO(CLIENT *Client, CHANNEL *Chan, bool OnlyOps)
 
        /* Secret channel? */
        if (!is_member && strchr(Channel_Modes(Chan), 's'))
-               return CONNECTED;
+               return IRC_WriteStrClient(Client, RPL_ENDOFWHO_MSG, Client_ID(Client), Channel_Name(Chan));
 
        cl2chan = Channel_FirstMember(Chan);
        for (; cl2chan ; cl2chan = Channel_NextMember(Chan, cl2chan)) {
@@ -896,6 +994,22 @@ IRC_WHOIS( CLIENT *Client, REQUEST *Req )
 } /* IRC_WHOIS */
 
 
+static bool
+WHOWAS_EntryWrite(CLIENT *prefix, WHOWAS *entry)
+{
+       char t_str[60];
+
+       (void)strftime(t_str, sizeof(t_str), "%a %b %d %H:%M:%S %Y",
+                                       localtime(&entry->time));
+
+       if (!IRC_WriteStrClient(prefix, RPL_WHOWASUSER_MSG, Client_ID(prefix),
+                       entry->id, entry->user, entry->host, entry->info))
+                               return DISCONNECTED;
+
+       return IRC_WriteStrClient(prefix, RPL_WHOISSERVER_MSG, Client_ID(prefix),
+                 entry->id, entry->server, t_str);
+}
+
 /**
  * IRC "WHOWAS" function.
  * This function implements the IRC command "WHOWHAS". It handles local
@@ -906,40 +1020,41 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *prefix;
        WHOWAS *whowas;
-       int max, last, count, i;
-       char t_str[60];
-       
+       char tok_buf[COMMAND_LEN];
+       int max, last, count, i, nc;
+       const char *nick;
+
        assert( Client != NULL );
        assert( Req != NULL );
 
        /* Wrong number of parameters? */
-       if(( Req->argc < 1 ) || ( Req->argc > 3 ))
-               return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG,
-                                          Client_ID( Client ), Req->command );
-
-       /* Search taget */
-       if( Req->argc == 3 )
-               target = Client_Search( Req->argv[2] );
+       if (Req->argc > 3)
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                       Client_ID(Client), Req->command);
+       if (Req->argc < 1)
+               return IRC_WriteStrClient(Client, ERR_NONICKNAMEGIVEN_MSG, Client_ID(Client));
+
+       /* Search target */
+       if (Req->argc == 3)
+               target = Client_Search(Req->argv[2]);
        else
-               target = Client_ThisServer( );
+               target = Client_ThisServer();
 
        /* Get prefix */
-       if( Client_Type( Client ) == CLIENT_SERVER )
-               prefix = Client_Search( Req->prefix );
+       if (Client_Type(Client) == CLIENT_SERVER)
+               prefix = Client_Search(Req->prefix);
        else
                prefix = Client;
 
-       if( ! prefix )
-               return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG,
-                                          Client_ID( Client ), Req->prefix );
+       if (!prefix)
+               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+                                               Client_ID(Client), Req->prefix);
 
        /* Forward to other server? */
-       if( target != Client_ThisServer( ))
-       {
-               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
-                       return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG,
-                                                  Client_ID( prefix ),
-                                                  Req->argv[2] );
+       if (target != Client_ThisServer()) {
+               if (!target || (Client_Type(target) != CLIENT_SERVER))
+                       return IRC_WriteStrClient(prefix, ERR_NOSUCHSERVER_MSG,
+                                       Client_ID(prefix), Req->argv[2]);
 
                /* Forward */
                IRC_WriteStrClientPrefix( target, prefix, "WHOWAS %s %s %s",
@@ -947,58 +1062,52 @@ IRC_WHOWAS( CLIENT *Client, REQUEST *Req )
                                          Req->argv[2] );
                return CONNECTED;
        }
-       
+
        whowas = Client_GetWhowas( );
        last = Client_GetLastWhowasIndex( );
-       if( last < 0 ) last = 0;
-       
-       if( Req->argc > 1 )
-       {
-               max = atoi( Req->argv[1] );
-               if( max < 1 ) max = MAX_WHOWAS;
+       if (last < 0)
+               last = 0;
+
+       max = DEFAULT_WHOWAS;
+       if (Req->argc > 1) {
+               max = atoi(Req->argv[1]);
+               if (max < 1)
+                       max = MAX_WHOWAS;
        }
-       else
-               max = DEFAULT_WHOWAS;
-       
-       i = last;
-       count = 0;
-       do
-       {
-               /* Used entry? */
-               if( whowas[i].time > 0 &&
-                   strcasecmp( Req->argv[0], whowas[i].id ) == 0 )
-               {
-                       (void)strftime( t_str, sizeof(t_str),
-                                       "%a %b %d %H:%M:%S %Y",
-                                       localtime( &whowas[i].time ));
-               
-                       if( ! IRC_WriteStrClient( prefix, RPL_WHOWASUSER_MSG,
-                                                 Client_ID( prefix ),
-                                                 whowas[i].id,
-                                                 whowas[i].user,
-                                                 whowas[i].host, 
-                                                 whowas[i].info ))
-                               return DISCONNECTED;
-               
-                       if( ! IRC_WriteStrClient( prefix, RPL_WHOISSERVER_MSG,
-                                                 Client_ID( prefix ),
-                                                 whowas[i].id,
-                                                 whowas[i].server, t_str ))
-                               return DISCONNECTED;
-               
-                       count++;
-                       if( count >= max ) break;
-               }
-               
-               /* previos entry */
-               i--;
 
-               /* "underflow", wrap around */
-               if( i < 0 ) i = MAX_WHOWAS - 1;
-       } while( i != last );
-       
-       return IRC_WriteStrClient( prefix, RPL_ENDOFWHOWAS_MSG,
-                                  Client_ID( prefix ), Req->argv[0] );
+       /*
+        * Break up the nick argument into a list of nicks, if applicable
+        * Can't modify Req->argv[0] because we need it for RPL_ENDOFWHOWAS_MSG.
+        */
+       strlcpy(tok_buf, Req->argv[0], sizeof(tok_buf));
+       nick = strtok(tok_buf, ",");
+
+       for (i=last, count=0; nick != NULL ; nick = strtok(NULL, ",")) {
+               nc = 0;
+               do {
+                       /* Used entry? */
+                       if (whowas[i].time > 0 && strcasecmp(nick, whowas[i].id) == 0) {
+                               if (!WHOWAS_EntryWrite(prefix, &whowas[i]))
+                                       return DISCONNECTED;
+                               nc++;
+                               count++;
+                       }
+                       /* previous entry */
+                       i--;
+
+                       /* "underflow", wrap around */
+                       if (i < 0)
+                               i = MAX_WHOWAS - 1;
+
+                       if (nc && count >= max)
+                               break;
+               } while (i != last);
+
+               if (nc == 0 && !IRC_WriteStrClient(prefix, ERR_WASNOSUCHNICK_MSG,
+                                               Client_ID(prefix), nick))
+                       return DISCONNECTED;
+       }
+       return IRC_WriteStrClient(prefix, RPL_ENDOFWHOWAS_MSG, Client_ID(prefix), Req->argv[0]);
 } /* IRC_WHOWAS */