various bugfixes and IPv6 preparation work

src/modcmd.c (modcmd_privmsg): Fix CTCP PING response type.

src/opserv.help: Add column headers for command lists.

src/tools.c (is_gline, split_ircmask): Accept colons in hostnames.
git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-3

diff --git a/ChangeLog b/ChangeLog
index 0861ade75ae9e30338afb9c87a30d2311f72eb1d..4f254831d5aff51a7387319f8188074db8a82e79 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3
 #
 
+2005-01-20 22:51:54 GMT        Michael Poole <mdpoole@troilus.org>     patch-3
+
+    Summary:
+      various bugfixes and IPv6 preparation work
+    Revision:
+      srvx--devo--1.3--patch-3
+
+    src/modcmd.c (modcmd_privmsg): Fix CTCP PING response type.
+    
+    src/opserv.help: Add column headers for command lists.
+    
+    src/tools.c (is_gline, split_ircmask): Accept colons in hostnames.
+
+    modified files:
+     ChangeLog src/modcmd.c src/opserv.help src/tools.c
+
+
 2005-01-05 01:03:05 GMT        Michael Poole <mdpoole@troilus.org>     patch-2
 
     Summary:

diff --git a/src/modcmd.c b/src/modcmd.c
index 6e4e59f2a4e93c7100182797e45dbf3fc22caa41..95feb17f3bc411bff5cbcaf7f4f810b64c0fb069 100644 (file)
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -852,10 +852,10 @@ modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int serv
             irc_notice_user(bot, user, "\001CLIENTINFO CLIENTINFO PING TIME USERINFO VERSION\x01");
         } else if (!irccasecmp(text, "PING")) {
             if (term) {
-                snprintf(response, sizeof(response), "\x01PONG %s\x01", term);
+                snprintf(response, sizeof(response), "\x01PING %s\x01", term);
                 irc_notice_user(bot, user, response);
             } else {
-                irc_notice_user(bot,user, "\x01PONG\x01");
+                irc_notice_user(bot,user, "\x01PING\x01");
             }
         } else if (!irccasecmp(text, "TIME")) {
             struct tm tm;

diff --git a/src/opserv.help b/src/opserv.help
index e41cd3e0e0947370086d6eee976e91710141d991..297e8b984552597c03783c17401ba6f033c91288 100644 (file)
--- a/src/opserv.help
+++ b/src/opserv.help
@@ -17,6 +17,7 @@
 "USER" ("$bUSER COMMANDS$b",
         "Search for, gives information on, and gives some control over IRC users.",
         "Alerts are a way to automatically detect (and optionally G-line) certain users.  For example, a \"gline info sub7server\" alert would G-line any users using \"sub7server\" as their full name (user info field).",
+        "  COMMAND  [MinAccess]",
         "  ACCESS   [${level/access}]",
         "  ADDALERT [${level/addalert}]",
         "  ADDTRUST [${level/addtrust}]",
@@ -93,6 +94,7 @@
         "  CHANNEL REACTIONS   - Automated reactions based on channel names",
         "  CHANNEL CONTROL     - Channel information and control",
         "There are also some miscellaneous channel-related commands:",
+        "  COMMAND  [MinAccess]",
         "  CHANINFO [${level/chaninfo}]",
         "  CSEARCH  [${level/csearch}]",
         "  JOIN     [${level/join}]",
@@ -123,6 +125,7 @@
 
 "CHANNEL REACTIONS" ("$bCHANNEL REACTION COMMANDS$b",
         "\"Bad-word\" channels are for assisting in enforcement of network policies (such as disallowing \"warez\" channels).  \"Warning\" channels are for channels which may be abused when they are present, but should be allowed otherwise.",
+        "  COMMAND  [MinAccess]",
         "  ADDBAD    [${level/addbad}]",
         "  ADDEXEMPT [${level/addexempt}]",
         "  DELBAD    [${level/delbad}]",
@@ -152,6 +155,7 @@
 
 "CHANNEL CONTROL" ("$bCHANNEL CONTROL COMMANDS$b",
         "These are analogous to the same (or similar) $C commands, but can be used on any channel.",
+        "  COMMAND    [MinAccess]",
         "  BAN        [${level/ban}]",
         "  CLEARBANS  [${level/clearbans}]",
         "  CLEARMODES [${level/clearmodes}]",
@@ -231,6 +235,7 @@
 
 "GLINES" ("$bGLINE COMMANDS$b",
         "Searches for, issues, and removes G-lines (network-global K-lines).",
+        "  COMMAND  [MinAccess]",
         "  BLOCK    [${level/block}]",
         "  GLINE    [${level/gline}]",
         "  GTRACE   [${level/gtrace}]",
@@ -273,6 +278,7 @@
 
 "CLONES" ("$bCLONE/JUPE COMMANDS$b",
         "Commands that add, remove or control fake (reserved) users or servers.",
+        "  COMMAND   [MinAccess]",
         "  CLONE     [${level/clone}]",
         "  COLLIDE   [${level/collide}]",
         "  JUPE      [${level/jupe}]",
@@ -305,6 +311,7 @@
 
 "LOGS" ("$bLOGGING COMMANDS$b",
         "Controls what goes into logs and searches them.",
+        "  COMMAND         [MinAccess]",
         "  LOG             [${level/log}]",
         "  REOPEN          [${level/reopen}]");
 "LOG" ("/msg $O LOG <criteria> <value> [<criteria> <value>]...",
@@ -326,6 +333,7 @@
 
 "RUNNING" ("$bRUNNING COMMANDS$b",
         "These commands control srvx's runtime state.",
+        "  COMMAND   [MinAccess]",
         "  DIE       [${level/die}]",
         "  JUMP      [${level/jump}]",
         "  RECONNECT [${level/reconnect}]",
@@ -351,6 +359,7 @@
 
 "SERVICES" ("$bSERVICES COMMANDS$b",
         "These commands control how other services behave.",
+        "  COMMAND    [MinAccess]",
         "  BANEMAIL   [${level/banemail}]",
         "  BIND       [${level/bind}]",
         "  GAG        [${level/gag}]",
@@ -378,6 +387,7 @@
 
 "OTHER" ("$bOTHER COMMANDS$b",
         "These commands do not easily fall into one of the other categories.",
+        "  COMMAND [MinAccess]",
         "  DUMP    [${level/dump}]",
         "  HELP    [${level/help}]",
         "  RAW     [${level/raw}]",

diff --git a/src/tools.c b/src/tools.c
index 26c83a9b393fbe38ebdb5a10aef48be20662b1b0..973bc53bb823455cc1fce85313c2e690a641336a 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -378,7 +378,7 @@ is_gline(const char *text)
         return 0;
     if (!*text)
         return 0;
-    while (*text && (isalnum((char)*text) || strchr(".-?*", *text)))
+    while (*text && (isalnum((char)*text) || strchr(".-?*:", *text)))
         text++;
     return !*text;
 }
@@ -405,9 +405,9 @@ split_ircmask(char *text, char **nick, char **ident, char **host)
     *text = 0;
     if (ident)
         *ident = start;
-    
+
     start = ++text;
-    while (*text && (isalnum((char)*text) || strchr(".-?*", *text)))
+    while (*text && (isalnum((char)*text) || strchr(".-?*:", *text)))
         text++;
     if (host)
         *host = start;