Changeset 749 for branches/ithildin-1.1

Timestamp:

06/12/06 00:52:02 (6 years ago)

Author:

wd

Message:

The channel_mode function now resets TS in some cases, making a TS check
after-the-fact somewhat useless. Move the TS check up and leave the mode
resetting to channel_mode.

File:

• branches/ithildin-1.1/modules/ircd/commands/sjoin.c (modified) (3 diffs)

branches/ithildin-1.1/modules/ircd/commands/sjoin.c

@@ -60 +60 @@
     client_t *cp;
     time_t ts = str_conv_int(argv[1], 0);
-    int changeok = 1;
+    bool changeok = true;
     int i;
     int mset = 0;
@@ -78 +78 @@
         chan->created = ts;
     } 
+
+    /* Check TS before running channel_mode (which will reset TS in a
+     * variety of conditions).  All we need to know is whether or not to
+     * accept ops down below, channel_mode does the rest of the logic... */
+    if (ts > chan->created)
+        changeok = false;
+
     /* handle mode changes.  we basically dump off the stuff to the mode
      * command handler.  We subtract four from argc (argv[0] is cmd,
@@ -83 +90 @@
      * arguments. */
     channel_mode(NULL, srv, chan, ts, (argc - 4), argv + 3, 0);
-
-    /* check for ts changes. */
-    /* we actually accept the older ts here.  if their ts is newer than
-     * ours we will quite likely have to undo changes and stuff.
-     * basically, we shouldn't trust any changes made to a channel whose ts
-     * isn't the same or lower than ours. */
-    if (ts > chan->created)
-        changeok = 0;
-    else if (ts < chan->created)
-        chan->created = ts;
-    /* otherwise everything is the same and copacetic */
 
     /* now parse the list of joiners, and propogate our SJOIN out to others */