Fix Bahamut assertion failure; move BURST to more "natural" place

* Fix a mod_chanmode assertion failure when using proto-bahamut.c with
debugging enabled.

* Send BURST in response to SVINFO, not SERVER, so that eventual
timestamp adjustment is more accurate.
git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-55

diff --git a/ChangeLog b/ChangeLog
index ee28b89f6487993938c174083ed453b8618fffbb..5d177026ad5b64bf3132fc554bd6b036c41d84e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,23 @@
 # arch-tag: automatic-ChangeLog--srvx@srvx.net--2004-srvx/srvx--devo--1.3
 #
 
+2004-04-29 01:51:19 GMT        Michael Poole <mdpoole@troilus.org>     patch-55
+
+    Summary:
+      Fix Bahamut assertion failure; move BURST to more "natural" place
+    Revision:
+      srvx--devo--1.3--patch-55
+
+    * Fix a mod_chanmode assertion failure when using proto-bahamut.c with
+    debugging enabled.
+    
+    * Send BURST in response to SVINFO, not SERVER, so that eventual
+    timestamp adjustment is more accurate.
+
+    modified files:
+     ChangeLog src/proto-bahamut.c
+
+
 2004-04-29 01:41:37 GMT        Michael Poole <mdpoole@troilus.org>     patch-54
 
     Summary:

diff --git a/src/proto-bahamut.c b/src/proto-bahamut.c
index 42894749e63cd095b2a0f7c7a2d41b7c2748f062..d79f247e4f0917830eae7c08512fa63db8480544 100644 (file)
--- a/src/proto-bahamut.c
+++ b/src/proto-bahamut.c
@@ -309,11 +309,6 @@ irc_svinfo() {
     putsock("SVINFO 3 3 0 :"FMT_TIME_T, now);
 }
 
-void
-irc_burst() {
-    putsock("BURST");
-}
-
 void
 irc_introduce(const char *passwd) {
     extern time_t burst_begin;
@@ -702,7 +697,6 @@ static CMD_FUNC(cmd_server) {
         AddServer(GetServerH(origin), argv[1], atoi(argv[2]), 0, now, 0, argv[3]);
     } else {
         self->uplink = AddServer(self, argv[1], atoi(argv[2]), 0, now, 0, argv[3]);
-        send_burst();
     }
     return 1;
 }
@@ -711,6 +705,7 @@ static CMD_FUNC(cmd_svinfo) {
     if (argc < 5) return 0;
     if ((atoi(argv[1]) < 3) || (atoi(argv[2]) > 3)) return 0;
     /* TODO: something with the timestamp we get from the other guy */
+    send_burst();
     return 1;
 }
 
@@ -1279,7 +1274,7 @@ mod_chanmode_parse(struct chanNode *channel, char **modes, unsigned int argc, un
             break;
         }
     }
-    change->argc = argc; /* in case any turned out to be ignored */
+    change->argc = ch_arg; /* in case any turned out to be ignored */
     if (change->modes_set & MODE_SECRET) {
         change->modes_set &= ~(MODE_PRIVATE);
         change->modes_clear |= MODE_PRIVATE;