]> arthur.barton.de Git - ngircd-alex.git/blobdiff - src/ngircd/irc-info.c
Quote received messages of ERROR commands in log output
[ngircd-alex.git] / src / ngircd / irc-info.c
index ee60566ecd9a0ea366fd888c92528594c4d65343..28722e71fca86b388a3a63a5166afed15c5c4790 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2009 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
@@ -49,24 +49,23 @@ IRC_ADMIN(CLIENT *Client, REQUEST *Req )
        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 );
 
-       /* Ziel suchen */
+       /* find target ... */
        if( Req->argc == 1 ) target = Client_Search( Req->argv[0] );
        else target = Client_ThisServer( );
 
-       /* Prefix ermitteln */
+       /* find 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 );
 
-       /* An anderen Server weiterleiten? */
+       /* forwad message to another server? */
        if( target != Client_ThisServer( ))
        {
                if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( prefix, ERR_NOSUCHSERVER_MSG, Client_ID( prefix ), Req->argv[0] );
 
-               /* forwarden */
+               /* forward */
                IRC_WriteStrClientPrefix( target, prefix, "ADMIN %s", Req->argv[0] );
                return CONNECTED;
        }
@@ -133,8 +132,14 @@ IRC_INFO(CLIENT * Client, REQUEST * Req)
        if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix),
                                NGIRCd_Version))
                return DISCONNECTED;
-       
-       strlcpy(msg, "Server has been started ", sizeof(msg));
+
+#if defined(__DATE__) && defined(__TIME__)
+       snprintf(msg, sizeof(msg), "Birth Date: %s at %s", __DATE__, __TIME__);
+       if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg))
+               return DISCONNECTED;
+#endif
+
+       strlcpy(msg, "On-line since ", sizeof(msg));
        strlcat(msg, NGIRCd_StartStr, sizeof(msg));
        if (!IRC_WriteStrClient(Client, RPL_INFO_MSG, Client_ID(prefix), msg))
                return DISCONNECTED;
@@ -193,7 +198,6 @@ IRC_LINKS( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Server-Mask ermitteln */
@@ -241,7 +245,6 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
        if(( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
        /* Absender ermitteln */
@@ -270,12 +273,15 @@ IRC_LUSERS( CLIENT *Client, REQUEST *Req )
 
 
 /**
- * List registered services.
- * This function is a dummy that immediately returns RPL_SERVLISTEND.
+ * Handler for the IRC command "SERVLIST".
+ * List registered services, see RFC 2811, section 3.5.1: the syntax is
+ * "SERVLIST [<mask> [<type>]]".
  */
 GLOBAL bool
 IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
 {
+       CLIENT *c;
+
        assert(Client != NULL);
        assert(Req != NULL);
 
@@ -283,6 +289,21 @@ IRC_SERVLIST(CLIENT *Client, REQUEST *Req)
                return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
                                          Client_ID(Client), Req->command);
 
+       if (Req->argc < 2 || strcmp(Req->argv[1], "0") == 0) {
+               for (c = Client_First(); c!= NULL; c = Client_Next(c)) {
+                       if (Client_Type(c) != CLIENT_SERVICE)
+                               continue;
+                       if (Req->argc > 0 && !MatchCaseInsensitive(Req->argv[0],
+                                                                 Client_ID(c)))
+                               continue;
+                       if (!IRC_WriteStrClient(Client, RPL_SERVLIST_MSG,
+                                       Client_ID(Client), Client_Mask(c),
+                                       Client_Mask(Client_Introducer(c)), "*",
+                                       0, Client_Hops(c), Client_Info(c)))
+                               return DISCONNECTED;
+               }
+       }
+
        return IRC_WriteStrClient(Client, RPL_SERVLISTEND_MSG, Client_ID(Client),
                                  Req->argc > 0 ? Req->argv[0] : "*",
                                  Req->argc > 1 ? Req->argv[1] : "0");
@@ -297,7 +318,6 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
        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 */
@@ -307,7 +327,7 @@ IRC_MOTD( CLIENT *Client, REQUEST *Req )
 
        if( Req->argc == 1 )
        {
-               /* an anderen Server forwarden */
+               /* forward? */
                target = Client_Search( Req->argv[0] );
                if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[0] );
 
@@ -333,23 +353,21 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
        assert( Client != NULL );
        assert( Req != NULL );
 
-       /* Falsche Anzahl Parameter? */
        if( Req->argc > 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
 
-       /* From aus Prefix ermitteln */
+       /* use prefix to determine "From" */
        if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix );
        else from = Client;
        if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        if( Req->argc == 2 )
        {
-               /* an anderen Server forwarden */
+               /* forward to another server? */
                target = Client_Search( Req->argv[1] );
                if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
 
-               if( target != Client_ThisServer( ))
-               {
-                       /* Ok, anderer Server ist das Ziel: forwarden */
+               if( target != Client_ThisServer( )) {
+                       /* target is another server, forward */
                        return IRC_WriteStrClientPrefix( target, from, "NAMES %s :%s", Req->argv[0], Req->argv[1] );
                }
        }
@@ -363,53 +381,48 @@ IRC_NAMES( CLIENT *Client, REQUEST *Req )
                        chan = Channel_Search( ptr );
                        if( chan )
                        {
-                               /* Namen ausgeben */
+                               /* print name */
                                if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
                        }
                        if( ! IRC_WriteStrClient( from, RPL_ENDOFNAMES_MSG, Client_ID( from ), ptr )) return DISCONNECTED;
 
-                       /* naechsten Namen ermitteln */
+                       /* get next channel name */
                        ptr = strtok( NULL, "," );
                }
                return CONNECTED;
        }
 
-       /* alle Channels durchgehen */
        chan = Channel_First( );
        while( chan )
        {
-               /* Namen ausgeben */
                if( ! IRC_Send_NAMES( from, chan )) return DISCONNECTED;
 
-               /* naechster Channel */
                chan = Channel_Next( chan );
        }
 
-       /* Nun noch alle Clients ausgeben, die in keinem Channel sind */
+       /* Now print all clients which are not in any channel */
        c = Client_First( );
        snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
        while( c )
        {
                if(( Client_Type( c ) == CLIENT_USER ) && ( Channel_FirstChannelOf( c ) == NULL ) && ( ! strchr( Client_Modes( c ), 'i' )))
                {
-                       /* Okay, das ist ein User: anhaengen */
+                       /* its a user, concatenate ... */
                        if( rpl[strlen( rpl ) - 1] != ':' ) strlcat( rpl, " ", sizeof( rpl ));
                        strlcat( rpl, Client_ID( c ), sizeof( rpl ));
 
                        if( strlen( rpl ) > ( LINE_LEN - CLIENT_NICK_LEN - 4 ))
                        {
-                               /* Zeile wird zu lang: senden! */
+                               /* Line is gwoing too long, send now */
                                if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
                                snprintf( rpl, sizeof( rpl ), RPL_NAMREPLY_MSG, Client_ID( from ), "*", "*" );
                        }
                }
 
-               /* naechster Client */
                c = Client_Next( c );
        }
        if( rpl[strlen( rpl ) - 1] != ':')
        {
-               /* es wurden User gefunden */
                if( ! IRC_WriteStrClient( from, "%s", rpl )) return DISCONNECTED;
        }
 
@@ -427,7 +440,7 @@ t_diff(time_t *t, const time_t d)
        remain = diff * d;
        *t -= remain;
 
-       return diff;
+       return (unsigned int)diff;
 }
 
 
@@ -452,6 +465,10 @@ uptime_mins(time_t *now)
 }
 
 
+/**
+ * Handler for the IRC command "STATS".
+ * See RFC 2812 section 3.4.4.
+ */
 GLOBAL bool
 IRC_STATS( CLIENT *Client, REQUEST *Req )
 {
@@ -462,31 +479,34 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
        time_t time_now;
        unsigned int days, hrs, mins;
 
-       assert( Client != NULL );
-       assert( Req != NULL );
+       assert(Client != NULL);
+       assert(Req != NULL);
 
-       /* Falsche Anzahl Parameter? */
        if (Req->argc > 2)
-               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG, Client_ID(Client), Req->command);
+               return IRC_WriteStrClient(Client, ERR_NEEDMOREPARAMS_MSG,
+                                         Client_ID(Client), Req->command);
 
-       /* From aus Prefix ermitteln */
+       /* use prefix to determine "From" */
        if (Client_Type(Client) == CLIENT_SERVER)
                from = Client_Search(Req->prefix);
        else
                from = Client;
 
-       if (! from)
-               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix);
+       if (!from)
+               return IRC_WriteStrClient(Client, ERR_NOSUCHNICK_MSG,
+                                         Client_ID(Client), Req->prefix);
 
        if (Req->argc == 2) {
-               /* an anderen Server forwarden */
-               target = Client_Search( Req->argv[1] );
-               if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER ))
-                       return IRC_WriteStrClient( from, ERR_NOSUCHSERVER_MSG, Client_ID( from ), Req->argv[1] );
-
-               if( target != Client_ThisServer()) {
-                       /* Ok, anderer Server ist das Ziel: forwarden */
-                       return IRC_WriteStrClientPrefix( target, from, "STATS %s %s", Req->argv[0], Req->argv[1] );
+               /* forward to another server? */
+               target = Client_Search(Req->argv[1]);
+               if ((!target) || (Client_Type(target) != CLIENT_SERVER))
+                       return IRC_WriteStrClient(from, ERR_NOSUCHSERVER_MSG,
+                                                Client_ID(from), Req->argv[1]);
+
+               if (target != Client_ThisServer()) {
+                       /* forward to another server */
+                       return IRC_WriteStrClientPrefix(target, from,
+                                    "STATS %s %s", Req->argv[0], Req->argv[1]);
                }
        }
 
@@ -496,57 +516,70 @@ IRC_STATS( CLIENT *Client, REQUEST *Req )
                query = '*';
 
        switch (query) {
-               case 'l':       /* Links */
-               case 'L':
-                       time_now = time(NULL);
-                       for (con = Conn_First(); con != NONE ;con = Conn_Next(con)) {
-                               cl = Conn_GetClient(con);
-                               if (!cl)
-                                       continue;
-                               if ((Client_Type(cl) == CLIENT_SERVER) || (cl == Client)) {
-                                       /* Server link or our own connection */
+       case 'l':       /* Link status (servers and own link) */
+       case 'L':
+               time_now = time(NULL);
+               for (con = Conn_First(); con != NONE; con = Conn_Next(con)) {
+                       cl = Conn_GetClient(con);
+                       if (!cl)
+                               continue;
+                       if ((Client_Type(cl) == CLIENT_SERVER)
+                           || (cl == Client)) {
+                               /* Server link or our own connection */
 #ifdef ZLIB
-                                       if (Conn_Options(con) & CONN_ZIP) {
-                                               if (!IRC_WriteStrClient(from, RPL_STATSLINKINFOZIP_MSG,
-                                                       Client_ID(from), Client_Mask(cl), Conn_SendQ(con),
-                                                       Conn_SendMsg(con), Zip_SendBytes(con), Conn_SendBytes(con),
-                                                       Conn_RecvMsg(con), Zip_RecvBytes(con), Conn_RecvBytes(con), (long)(time_now - Conn_StartTime(con))))
-                                                               return DISCONNECTED;
-                                               continue;
-                                       }
-#endif
-                                       if (!IRC_WriteStrClient(from, RPL_STATSLINKINFO_MSG, Client_ID(from),
-                                               Client_Mask(cl), Conn_SendQ(con), Conn_SendMsg(con), Conn_SendBytes(con),
-                                               Conn_RecvMsg(con), Conn_RecvBytes(con), (long)(time_now - Conn_StartTime(con))))
-                                                       return DISCONNECTED;
-                               }
-                       }
-                       break;
-               case 'm':       /* IRC-Commands */
-               case 'M':
-                       cmd = Parse_GetCommandStruct( );
-                       for (; cmd->name ; cmd++) {
-                               if (cmd->lcount == 0 && cmd->rcount == 0)
+                               if (Conn_Options(con) & CONN_ZIP) {
+                                       if (!IRC_WriteStrClient
+                                           (from, RPL_STATSLINKINFOZIP_MSG,
+                                            Client_ID(from), Client_Mask(cl),
+                                            Conn_SendQ(con), Conn_SendMsg(con),
+                                            Zip_SendBytes(con),
+                                            Conn_SendBytes(con),
+                                            Conn_RecvMsg(con),
+                                            Zip_RecvBytes(con),
+                                            Conn_RecvBytes(con),
+                                            (long)(time_now - Conn_StartTime(con))))
+                                               return DISCONNECTED;
                                        continue;
-                               if (!IRC_WriteStrClient(from, RPL_STATSCOMMANDS_MSG, Client_ID(from),
-                                               cmd->name, cmd->lcount, cmd->bytes, cmd->rcount))
-                                                       return DISCONNECTED;
+                               }
+#endif
+                               if (!IRC_WriteStrClient
+                                   (from, RPL_STATSLINKINFO_MSG,
+                                    Client_ID(from), Client_Mask(cl),
+                                    Conn_SendQ(con), Conn_SendMsg(con),
+                                    Conn_SendBytes(con), Conn_RecvMsg(con),
+                                    Conn_RecvBytes(con),
+                                    (long)(time_now - Conn_StartTime(con))))
+                                       return DISCONNECTED;
                        }
-                       break;
-               case 'u':       /* server uptime */
-               case 'U':
-                       time_now = time(NULL) - NGIRCd_Start;
-                       days = uptime_days(&time_now);
-                       hrs = uptime_hrs(&time_now);
-                       mins = uptime_mins(&time_now);
-                       if (!IRC_WriteStrClient(from, RPL_STATSUPTIME, Client_ID(from),
-                                       days, hrs, mins, (unsigned int) time_now))
-                                               return DISCONNECTED;
-                       break;
+               }
+               break;
+       case 'm':       /* IRC command status (usage count) */
+       case 'M':
+               cmd = Parse_GetCommandStruct();
+               for (; cmd->name; cmd++) {
+                       if (cmd->lcount == 0 && cmd->rcount == 0)
+                               continue;
+                       if (!IRC_WriteStrClient
+                           (from, RPL_STATSCOMMANDS_MSG, Client_ID(from),
+                            cmd->name, cmd->lcount, cmd->bytes, cmd->rcount))
+                               return DISCONNECTED;
+               }
+               break;
+       case 'u':       /* Server uptime */
+       case 'U':
+               time_now = time(NULL) - NGIRCd_Start;
+               days = uptime_days(&time_now);
+               hrs = uptime_hrs(&time_now);
+               mins = uptime_mins(&time_now);
+               if (!IRC_WriteStrClient(from, RPL_STATSUPTIME, Client_ID(from),
+                                      days, hrs, mins, (unsigned int)time_now))
+                       return DISCONNECTED;
+               break;
        }
 
        IRC_SetPenalty(from, 2);
-       return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG, Client_ID(from), query);
+       return IRC_WriteStrClient(from, RPL_ENDOFSTATS_MSG,
+                                 Client_ID(from), query);
 } /* IRC_STATS */
 
 
@@ -573,23 +606,19 @@ IRC_TIME( CLIENT *Client, REQUEST *Req )
        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_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
        if( Req->argc == 1 )
        {
-               /* an anderen Server forwarden */
                target = Client_Search( Req->argv[0] );
                if(( ! target ) || ( Client_Type( target ) != CLIENT_SERVER )) 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] );
                }
        }
@@ -610,7 +639,6 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
        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 );
 
        if( Req->argc > 5 ) max = 5;
@@ -622,7 +650,7 @@ IRC_USERHOST( CLIENT *Client, REQUEST *Req )
                c = Client_Search( Req->argv[i] );
                if( c && ( Client_Type( c ) == CLIENT_USER ))
                {
-                       /* Dieser Nick ist "online" */
+                       /* This Nick is "online" */
                        strlcat( rpl, Client_ID( c ), sizeof( rpl ));
                        if( Client_HasMode( c, 'o' )) strlcat( rpl, "*", sizeof( rpl ));
                        strlcat( rpl, "=", sizeof( rpl ));
@@ -660,7 +688,6 @@ IRC_VERSION( CLIENT *Client, REQUEST *Req )
        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 );
 
        /* Ziel suchen */