* Move all channel flags to chan->status, and all irc status flags to chan->ircnet_status

src/chan.h

@@ -242,24 +242,25 @@ struct chanset_t {
 #define CHAN_NODESYNCH      BIT15
 #define CHAN_FASTOP         BIT16	/* Bots will not use +o-b to op (no cookies) */ 
 #define CHAN_PRIVATE        BIT17	/* users need |o to access chan */ 
-#define CHAN_ACTIVE         BIT18	/* like i'm actually on the channel and stuff */
-#define CHAN_PEND           BIT19	/* just joined; waiting for end of WHO list */
-#define CHAN_FLAGGED        BIT20	/* flagged during rehash for delete   */
-#define CHAN_ASKEDBANS      BIT21
-#define CHAN_ASKEDMODES     BIT22	/* find out key-info on IRCu          */
-#define CHAN_JUPED          BIT23	/* Is channel juped                   */
-#define CHAN_STOP_CYCLE     BIT24	/* Some efnetservers have defined NO_CHANOPS_WHEN_SPLIT */
-#define CHAN_AUTOOP         BIT25
-#define CHAN_JOINING        BIT26	/* attempting to join, dont flood with JOIN #chan */
-#define CHAN_MEANKICKS      BIT27	/* use mean/offensive kicks/bans */
-#define CHAN_HAVEBANS       BIT28	/* have been opped and received the ban list */
+#define CHAN_DYNAMICEXEMPTS BIT18
+#define CHAN_NOUSEREXEMPTS  BIT19
+#define CHAN_DYNAMICINVITES BIT20
+#define CHAN_NOUSERINVITES  BIT21
+#define CHAN_FLAGGED        BIT22	/* flagged during rehash for delete   */
+#define CHAN_AUTOOP         BIT23
+#define CHAN_MEANKICKS      BIT24	/* use mean/offensive kicks/bans */
 
 #define CHAN_ASKED_EXEMPTS  BIT0
 #define CHAN_ASKED_INVITES  BIT1
-#define CHAN_DYNAMICEXEMPTS BIT2
-#define CHAN_NOUSEREXEMPTS  BIT3
-#define CHAN_DYNAMICINVITES BIT4
-#define CHAN_NOUSERINVITES  BIT5
+#define CHAN_HAVEBANS       BIT2	/* have been opped and received the ban list */
+#define CHAN_ASKEDBANS      BIT3
+#define CHAN_ASKEDMODES     BIT4	/* find out key-info on IRCu          */
+#define CHAN_ACTIVE         BIT5	/* like i'm actually on the channel and stuff */
+#define CHAN_PEND           BIT6	/* just joined; waiting for end of WHO list */
+#define CHAN_JOINING        BIT7	/* attempting to join, dont flood with JOIN #chan */
+#define CHAN_JUPED          BIT8	/* Is channel juped                   */
+#define CHAN_STOP_CYCLE     BIT9	/* Some efnetservers have defined NO_CHANOPS_WHEN_SPLIT */
+
 /* prototypes */
 memberlist *ismember(struct chanset_t *, const char *);
 struct chanset_t *findchan(const char *name);
@@ -270,9 +271,16 @@ struct chanset_t *findchan_by_dname(const char *name);
 /* is this channel +t? */
 #define channel_optopic(chan) (chan->channel.mode & CHANTOPIC)
 
-#define channel_active(chan)  (chan->status & CHAN_ACTIVE)
-#define channel_joining(chan) (chan->status & CHAN_JOINING)
-#define channel_pending(chan)  (chan->status & CHAN_PEND)
+#define channel_active(chan)  (chan->ircnet_status & CHAN_ACTIVE)
+#define channel_joining(chan) (chan->ircnet_status & CHAN_JOINING)
+#define channel_pending(chan)  (chan->ircnet_status & CHAN_PEND)
+#define channel_juped(chan) (chan->ircnet_status & CHAN_JUPED)
+#define channel_stop_cycle(chan) (chan->ircnet_status & CHAN_STOP_CYCLE)
+
+#define channel_dynamicexempts(chan) (chan->status & CHAN_DYNAMICEXEMPTS)
+#define channel_nouserexempts(chan) (chan->status & CHAN_NOUSEREXEMPTS)
+#define channel_dynamicinvites(chan) (chan->status & CHAN_DYNAMICINVITES)
+#define channel_nouserinvites(chan) (chan->status & CHAN_NOUSERINVITES)
 #define channel_backup(chan) (chan->status & CHAN_BACKUP)
 #define channel_bitch(chan) (chan->status & CHAN_BITCH)
 #define chan_bitch(chan) (chan->status & (CHAN_BITCH|CHAN_BOTBITCH))
@@ -284,12 +292,7 @@ struct chanset_t *findchan_by_dname(const char *name);
 #define channel_secret(chan) (chan->status & CHAN_SECRET)
 #define channel_cycle(chan) (chan->status & CHAN_CYCLE)
 #define channel_inactive(chan) (chan->status & CHAN_INACTIVE)
-#define channel_dynamicexempts(chan) (chan->ircnet_status & CHAN_DYNAMICEXEMPTS)
-#define channel_nouserexempts(chan) (chan->ircnet_status & CHAN_NOUSEREXEMPTS)
-#define channel_dynamicinvites(chan) (chan->ircnet_status & CHAN_DYNAMICINVITES)
-#define channel_nouserinvites(chan) (chan->ircnet_status & CHAN_NOUSERINVITES)
-#define channel_juped(chan) (chan->status & CHAN_JUPED)
-#define channel_stop_cycle(chan) (chan->status & CHAN_STOP_CYCLE)
+
 
 #ifdef REVENGE
 #define channel_revenge(chan) (chan->status & CHAN_REVENGE)

src/mod/channels.mod/channels.c

@@ -390,7 +390,7 @@ check_slowjoinpart(struct chanset_t *chan)
       chan->channel.jointime = 0;
     if (shouldjoin(chan) && !channel_active(chan) && !channel_joining(chan)) {
       dprintf(DP_MODE, "JOIN %s %s\n", chan->dname, chan->key_prot);
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status |= CHAN_JOINING;
     }
   } else if (channel_closed(chan)) {
     enforce_closed(chan);
@@ -485,7 +485,7 @@ static void got_jn(int idx, char *code, char *par)
     chan->channel.jointime = 0;
     if (!conf.bot->hub && shouldjoin(chan) && !channel_active(chan) && !channel_joining(chan)) {
       dprintf(DP_MODE, "JOIN %s %s\n", chan->name, chan->key_prot);
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status |= CHAN_JOINING;
     }
   }
 }

src/mod/channels.mod/cmdschan.c

@@ -607,7 +607,7 @@ static void cmd_slowjoin(int idx, char *par)
 
   if (!conf.bot->hub && shouldjoin(chan) && !channel_joining(chan)) {
     dprintf(DP_MODE, "JOIN %s %s\n", chan->name, chan->key_prot);
-    chan->status |= CHAN_JOINING;
+    chan->ircnet_status |= CHAN_JOINING;
   }
 }
 

src/mod/channels.mod/tclchan.c

@@ -308,7 +308,6 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
 {
   bool error = 0;
   int old_status = chan->status,
-      old_ircnet_status = chan->ircnet_status,
       old_mode_mns_prot = chan->mode_mns_prot,
       old_mode_pls_prot = chan->mode_pls_prot;
   char s[121] = "", result_extra[RESULT_LEN / 2] = "";
@@ -592,21 +591,21 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
     else if (!strcmp(item[i], "-cycle"))
       chan->status &= ~CHAN_CYCLE;
     else if (!strcmp(item[i], "+dynamicexempts"))
-      chan->ircnet_status|= CHAN_DYNAMICEXEMPTS;
+      chan->status |= CHAN_DYNAMICEXEMPTS;
     else if (!strcmp(item[i], "-dynamicexempts"))
-      chan->ircnet_status&= ~CHAN_DYNAMICEXEMPTS;
+      chan->status &= ~CHAN_DYNAMICEXEMPTS;
     else if (!strcmp(item[i], "-userexempts"))
-      chan->ircnet_status|= CHAN_NOUSEREXEMPTS;
+      chan->status |= CHAN_NOUSEREXEMPTS;
     else if (!strcmp(item[i], "+userexempts"))
-      chan->ircnet_status&= ~CHAN_NOUSEREXEMPTS;
+      chan->status &= ~CHAN_NOUSEREXEMPTS;
     else if (!strcmp(item[i], "+dynamicinvites"))
-      chan->ircnet_status|= CHAN_DYNAMICINVITES;
+      chan->status |= CHAN_DYNAMICINVITES;
     else if (!strcmp(item[i], "-dynamicinvites"))
-      chan->ircnet_status&= ~CHAN_DYNAMICINVITES;
+      chan->status &= ~CHAN_DYNAMICINVITES;
     else if (!strcmp(item[i], "-userinvites"))
-      chan->ircnet_status|= CHAN_NOUSERINVITES;
+      chan->status |= CHAN_NOUSERINVITES;
     else if (!strcmp(item[i], "+userinvites"))
-      chan->ircnet_status&= ~CHAN_NOUSERINVITES;
+      chan->status &= ~CHAN_NOUSERINVITES;
     else if (!strcmp(item[i], "+closed"))
       chan->status |= CHAN_CLOSED;
     else if (!strcmp(item[i], "-closed"))
@@ -800,18 +799,18 @@ int channel_modify(char *result, struct chanset_t *chan, int items, char **item,
 
   if (!conf.bot->hub && (chan != chanset_default)) {
     if ((old_status ^ chan->status) & (CHAN_INACTIVE | CHAN_BACKUP)) {
-      if (!shouldjoin(chan) && (chan->status & (CHAN_ACTIVE | CHAN_PEND)))
+      if (!shouldjoin(chan) && (chan->ircnet_status & (CHAN_ACTIVE | CHAN_PEND)))
         dprintf(DP_SERVER, "PART %s\n", chan->name);
-      if (shouldjoin(chan) && !(chan->status & (CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING))) {
+      if (shouldjoin(chan) && !(chan->ircnet_status & (CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING))) {
         dprintf(DP_SERVER, "JOIN %s %s\n", (chan->name[0]) ?
   			   chan->name : chan->dname,
   			   chan->channel.key[0] ?
     			   chan->channel.key : chan->key_prot);
-        chan->status |= CHAN_JOINING;
+        chan->ircnet_status |= CHAN_JOINING;
       }
     }
     if (me_op(chan)) {
-      if ((old_status ^ chan->status) & (CHAN_ENFORCEBANS|CHAN_NOUSERBANS|CHAN_DYNAMICBANS) || (old_ircnet_status ^ chan->ircnet_status) & (CHAN_NOUSEREXEMPTS|CHAN_NOUSERINVITES|CHAN_DYNAMICEXEMPTS|CHAN_DYNAMICINVITES)) {
+      if ((old_status ^ chan->status) & (CHAN_ENFORCEBANS|CHAN_NOUSERBANS|CHAN_DYNAMICBANS|CHAN_NOUSEREXEMPTS|CHAN_NOUSERINVITES|CHAN_DYNAMICEXEMPTS|CHAN_DYNAMICINVITES)) {
         recheck_channel(chan, 1);
       /* if we -take, recheck the chan for modes and shit */
       /* also -[bot]bitch/-private might allow for auto-opping users */
@@ -900,7 +899,7 @@ void clear_channel(struct chanset_t *chan, bool reset)
   clear_masklist(chan->channel.invite);
   chan->channel.invite = NULL;
 
-  chan->status &= ~CHAN_HAVEBANS;
+  chan->ircnet_status &= ~CHAN_HAVEBANS;
 
   if (reset)
     init_channel(chan, 1);

src/mod/channels.mod/userchan.c

@@ -525,7 +525,7 @@ static void tell_masks(const char type, int idx, bool show_inact, char *match, b
       } else
 	display_mask(type, idx, k++, mr, chan, show_inact);
     }
-    if (chan->status & CHAN_ACTIVE) {
+    if (chan->ircnet_status & CHAN_ACTIVE) {
       masklist *ml = NULL;
       masklist *channel_list = (type == 'b' ? chan->channel.ban : type == 'e' ? chan->channel.exempt : chan->channel.invite);
 

src/mod/ctcp.mod/ctcp.c

@@ -510,7 +510,7 @@ static int ctcp_INVITE_UNBAN(char *nick, char *uhost, struct userrec *u, char *o
     if (p)
       *p = 0;
     while (chan) {
-      if (chan->status & CHAN_ACTIVE) {
+      if (chan->ircnet_status & CHAN_ACTIVE) {
         if (!strcasecmp(chan->name, chname)) {
           dprintf(DP_HELP, "NOTICE %s :\002BitchX\002: Access Denied\n", nick);
           return BIND_RET_LOG;

src/mod/irc.mod/chan.c

@@ -1007,7 +1007,7 @@ void recheck_channel_modes(struct chanset_t *chan)
     }
   }
 
-  if (!(chan->status & CHAN_ASKEDMODES)) {
+  if (!(chan->ircnet_status & CHAN_ASKEDMODES)) {
     if (pls & CHANINV && !(cur & CHANINV))
       add_mode(chan, '+', 'i', "");
     else if (mns & CHANINV && cur & CHANINV)
@@ -1395,8 +1395,8 @@ void recheck_channel(struct chanset_t *chan, int dobans)
 
     /* This is a bad hack for +e/+I */
     if (dobans == 2 && chan->channel.members > 1) {
-      if (!(chan->status & (CHAN_ASKEDBANS|CHAN_HAVEBANS))) {
-        chan->status |= CHAN_ASKEDBANS;
+      if (!(chan->ircnet_status & (CHAN_ASKEDBANS|CHAN_HAVEBANS))) {
+        chan->ircnet_status |= CHAN_ASKEDBANS;
         dprintf(DP_MODE, "MODE %s +b\n", chan->name);
       }
       if (do_eI) {
@@ -1433,7 +1433,7 @@ void recheck_channel(struct chanset_t *chan, int dobans)
 
     //Only reset masks if the bot has already received the ban list before (meaning it has already been opped once)
     //Ie, don't set bans without knowing what they are! (asked for above on first op)
-    if (dobans && (chan->status & CHAN_HAVEBANS)) {
+    if (dobans && (chan->ircnet_status & CHAN_HAVEBANS)) {
       if (channel_nouserbans(chan) && !stop_reset)
         resetbans(chan);
       else
@@ -1456,7 +1456,7 @@ void recheck_channel(struct chanset_t *chan, int dobans)
       // Flush out mask changes
       flush_mode(chan, QUICK); 
 
-      if ((chan->status & CHAN_ASKEDMODES) && !channel_inactive(chan)) 
+      if ((chan->ircnet_status & CHAN_ASKEDMODES) && !channel_inactive(chan))
         dprintf(DP_MODE, "MODE %s\n", chan->name);
       recheck_channel_modes(chan);
     }
@@ -1679,9 +1679,9 @@ static int got324(char *from, char *msg)
   bool ok = 0;
   char *p = NULL, *q = NULL;
 
-  if (chan->status & CHAN_ASKEDMODES)
+  if (chan->ircnet_status & CHAN_ASKEDMODES)
     ok = 1;
-  chan->status &= ~CHAN_ASKEDMODES;
+  chan->ircnet_status &= ~CHAN_ASKEDMODES;
   chan->channel.mode = 0;
   while (msg[i] != 0) {
     if (msg[i] == 'i')
@@ -1732,7 +1732,7 @@ static int got324(char *from, char *msg)
 	 * an asterisk and this has been agreed upon by other major IRC 
 	 * networks so we'll check for an asterisk here as well 
 	 * (guppy 22Dec2001) */ 
-        chan->status |= CHAN_ASKEDMODES;
+        chan->ircnet_status |= CHAN_ASKEDMODES;
     }
     if (msg[i] == 'l') {
       p = strchr(msg, ' ');
@@ -1987,14 +1987,14 @@ static int got315(char *from, char *msg)
     return 0;
 
   /* Finished getting who list, can now be considered officially ON CHANNEL */
-  chan->status |= CHAN_ACTIVE;
-  chan->status &= ~(CHAN_PEND | CHAN_JOINING);
+  chan->ircnet_status |= CHAN_ACTIVE;
+  chan->ircnet_status &= ~(CHAN_PEND | CHAN_JOINING);
   /* Am *I* on the channel now? if not, well d0h. */
   if (shouldjoin(chan) && !ismember(chan, botname)) {
     putlog(LOG_MISC | LOG_JOIN, chan->dname, "Oops, I'm not really on %s.", chan->dname);
     clear_channel(chan, 1);
-    chan->status &= ~CHAN_ACTIVE;
-    chan->status |= CHAN_JOINING;
+    chan->ircnet_status &= ~CHAN_ACTIVE;
+    chan->ircnet_status |= CHAN_JOINING;
     dprintf(DP_MODE, "JOIN %s %s\n",
 	    (chan->name[0]) ? chan->name : chan->dname,
 	    chan->channel.key[0] ? chan->channel.key : chan->key_prot);
@@ -2002,7 +2002,7 @@ static int got315(char *from, char *msg)
     if (me_op(chan))
       recheck_channel(chan, 2);
     else if (chan->channel.members == 1)
-      chan->status |= CHAN_STOP_CYCLE;
+      chan->ircnet_status |= CHAN_STOP_CYCLE;
     else if (any_ops(chan))
       request_op(chan);
   }
@@ -2049,8 +2049,8 @@ static int got368(char *from, char *msg)
   chname = newsplit(&msg);
   chan = findchan(chname);
   if (chan) {
-    chan->status &= ~CHAN_ASKEDBANS;
-    chan->status |= CHAN_HAVEBANS;
+    chan->ircnet_status &= ~CHAN_ASKEDBANS;
+    chan->ircnet_status |= CHAN_HAVEBANS;
 
     if (channel_nouserbans(chan))
       resetbans(chan);
@@ -2225,7 +2225,7 @@ static int got403(char *from, char *msg)
              "Unique channel %s does not exist... Attempting to join with "
              "short name.", chname);
       dprintf(DP_SERVER, "JOIN %s\n", chan->dname);
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status |= CHAN_JOINING;
     } else {
       /* We have found the channel, so the server has given us the short
        * name. Prefix another '!' to it, and attempt the join again...
@@ -2259,7 +2259,7 @@ static int got471(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    chan->status &= ~CHAN_JOINING;
+    chan->ircnet_status &= ~CHAN_JOINING;
     putlog(LOG_JOIN, chan->dname, "Channel full--can't join: %s", chan->dname);
     request_in(chan);
 /* need: limit */
@@ -2292,7 +2292,7 @@ static int got473(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    chan->status &= ~CHAN_JOINING;
+    chan->ircnet_status &= ~CHAN_JOINING;
     putlog(LOG_JOIN, chan->dname, "Channel invite only--can't join: %s", chan->dname);
     request_in(chan);
 /* need: invite */
@@ -2325,7 +2325,7 @@ static int got474(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan) {
-    chan->status &= ~CHAN_JOINING;
+    chan->ircnet_status &= ~CHAN_JOINING;
     putlog(LOG_JOIN, chan->dname, "Banned from channel--can't join: %s", chan->dname);
     request_in(chan);
 /* need: unban */
@@ -2358,7 +2358,7 @@ static int got475(char *from, char *msg)
    */
   chan = findchan_by_dname(chname);
   if (chan && shouldjoin(chan)) {
-    chan->status &= ~CHAN_JOINING;
+    chan->ircnet_status &= ~CHAN_JOINING;
     putlog(LOG_JOIN, chan->dname, "Bad key--can't join: %s", chan->dname);
     if (chan->channel.key[0]) {
       free(chan->channel.key);
@@ -2538,7 +2538,7 @@ static int gotjoin(char *from, char *chname)
   } else if (!channel_pending(chan)) {
     char *host = NULL;
 
-    chan->status &= ~CHAN_STOP_CYCLE;
+    chan->ircnet_status &= ~CHAN_STOP_CYCLE;
 
     detect_chan_flood(nick, uhost, from, chan, FLOOD_JOIN, NULL);
 
@@ -2548,8 +2548,8 @@ static int gotjoin(char *from, char *chname)
     if (!channel_active(chan) && !match_my_nick(nick)) {
       /* uh, what?!  i'm on the channel?! */
       putlog(LOG_ERROR, "*", "confused bot: guess I'm on %s and didn't realize it", chan->dname);
-      chan->status |= CHAN_ACTIVE;
-      chan->status &= ~(CHAN_PEND | CHAN_JOINING);
+      chan->ircnet_status |= CHAN_ACTIVE;
+      chan->ircnet_status &= ~(CHAN_PEND | CHAN_JOINING);
       reset_chan_info(chan);
     } else {
       memberlist *m = ismember(chan, nick);
@@ -2607,7 +2607,7 @@ static int gotjoin(char *from, char *chname)
 	   * unique name for the channel (as the server see's it). <cybah>
 	   */
 	  strlcpy(chan->name, chname, 81);
-	  chan->status &= ~CHAN_JUPED;
+	  chan->ircnet_status &= ~CHAN_JUPED;
 
           /* ... and log us joining. Using chan->dname for the channel is
 	   * important in this case. As the config file will never contain
@@ -2755,7 +2755,7 @@ static int gotpart(char *from, char *msg)
   if (chan && !shouldjoin(chan) && match_my_nick(nick)) {
     irc_log(chan, "Parting");    
     clear_channel(chan, 1);
-    chan->status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING);
+    chan->ircnet_status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING);
     return 0;
   }
   if (chan && !channel_pending(chan)) {
@@ -2765,8 +2765,8 @@ static int gotpart(char *from, char *msg)
     if (!channel_active(chan)) {
       /* whoa! */
       putlog(LOG_ERRORS, "*", "confused bot: guess I'm on %s and didn't realize it", chan->dname);
-      chan->status |= CHAN_ACTIVE;
-      chan->status &= ~(CHAN_PEND | CHAN_JOINING);
+      chan->ircnet_status |= CHAN_ACTIVE;
+      chan->ircnet_status &= ~(CHAN_PEND | CHAN_JOINING);
       reset_chan_info(chan);
     }
     set_handle_laston(chan->dname, u, now);
@@ -2782,12 +2782,12 @@ static int gotpart(char *from, char *msg)
     /* If it was me, all hell breaks loose... */
     if (match_my_nick(nick)) {
       clear_channel(chan, 1);
-      chan->status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING);
+      chan->ircnet_status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING);
       if (shouldjoin(chan)) {
 	dprintf(DP_MODE, "JOIN %s %s\n",
 	        (chan->name[0]) ? chan->name : chan->dname,
 	        chan->channel.key[0] ? chan->channel.key : chan->key_prot);
-        chan->status |= CHAN_JOINING;
+        chan->ircnet_status |= CHAN_JOINING;
       }
     } else
       check_lonely_channel(chan);
@@ -2812,8 +2812,8 @@ static int gotkick(char *from, char *origmsg)
   char *nick = newsplit(&msg);
 
   if (match_my_nick(nick) && channel_pending(chan) && shouldjoin(chan) && !channel_joining(chan)) {
-    chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
-    chan->status |= CHAN_JOINING;
+    chan->ircnet_status &= ~(CHAN_ACTIVE | CHAN_PEND);
+    chan->ircnet_status |= CHAN_JOINING;
     dprintf(DP_MODE, "JOIN %s %s\n",
             (chan->name[0]) ? chan->name : chan->dname,
             chan->channel.key[0] ? chan->channel.key : chan->key_prot);
@@ -2861,11 +2861,11 @@ static int gotkick(char *from, char *origmsg)
     irc_log(chan, "%s was kicked by %s (%s)", s1, from, msg);
     /* Kicked ME?!? the sods! */
     if (match_my_nick(nick) && shouldjoin(chan) && !channel_joining(chan)) {
-      chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
+      chan->ircnet_status &= ~(CHAN_ACTIVE | CHAN_PEND);
       dprintf(DP_MODE, "JOIN %s %s\n",
               (chan->name[0]) ? chan->name : chan->dname,
               chan->channel.key[0] ? chan->channel.key : chan->key_prot);
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status |= CHAN_JOINING;
       clear_channel(chan, 1);
     } else {
       killmember(chan, nick);

src/mod/irc.mod/irc.c

@@ -604,7 +604,7 @@ getin_request(char *botnick, char *code, char *par)
 
         putlog(LOG_GETIN, "*", "Got key for %s from %s (%s) - Joining", chan->dname, botnick, chan->channel.key);
         dprintf(DP_MODE, "JOIN %s %s\n", chan->name[0] ? chan->name : chan->dname, chan->channel.key);
-        chan->status |= CHAN_JOINING;
+        chan->ircnet_status |= CHAN_JOINING;
       } else {
         putlog(LOG_GETIN, "*", "Got key for %s from %s - I'm already in the channel", chan->dname, botnick);
       }
@@ -1306,13 +1306,13 @@ reset_chan_info(struct chanset_t *chan)
     free(chan->channel.key);
     chan->channel.key = (char *) my_calloc(1, 1);
     clear_channel(chan, 1);
-    chan->status |= CHAN_PEND;
-    chan->status &= ~(CHAN_ACTIVE | CHAN_ASKEDMODES | CHAN_JOINING);
+    chan->ircnet_status |= CHAN_PEND;
+    chan->ircnet_status &= ~(CHAN_ACTIVE | CHAN_ASKEDMODES | CHAN_JOINING);
     /* don't bother checking bans if it's +take */
     if (!channel_take(chan)) {
       if (opped) {
-        if (!(chan->status & CHAN_ASKEDBANS)) {
-          chan->status |= CHAN_ASKEDBANS;
+        if (!(chan->ircnet_status & CHAN_ASKEDBANS)) {
+          chan->ircnet_status |= CHAN_ASKEDBANS;
           dprintf(DP_MODE, "MODE %s +b\n", chan->name);
         }
 
@@ -1370,7 +1370,7 @@ check_lonely_channel(struct chanset_t *chan)
       dprintf(DP_MODE, "PART %s\n", chan->name);
       /* If it's a !chan, we need to recreate the channel with !!chan <cybah> */
       dprintf(DP_MODE, "JOIN %s%s %s\n", (chan->dname[0] == '!') ? "!" : "", chan->dname, chan->key_prot);
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status |= CHAN_JOINING;
       whined = 0;
     }
   } else if (any_ops(chan)) {
@@ -1601,7 +1601,7 @@ check_expired_chanstuff(struct chanset_t *chan)
     dprintf(DP_MODE, "JOIN %s %s\n",
             (chan->name[0]) ? chan->name : chan->dname,
             chan->channel.key[0] ? chan->channel.key : chan->key_prot);
-    chan->status |= CHAN_JOINING;
+    chan->ircnet_status |= CHAN_JOINING;
   }
 }
 
@@ -1687,13 +1687,13 @@ irc_report(int idx, int details)
     if (!privchan(fr, chan, PRIV_OP) && (idx == DP_STDOUT || glob_master(fr) || chan_master(fr))) {
       p = NULL;
       if (shouldjoin(chan)) {
-        if (chan->status & CHAN_JUPED)
+        if (chan->ircnet_status & CHAN_JUPED)
           p = "juped";
         else if (channel_joining(chan))
           p = "joining";
-        else if (!(chan->status & CHAN_ACTIVE))
+        else if (!(chan->ircnet_status & CHAN_ACTIVE))
           p = "trying";
-        else if (chan->status & CHAN_PEND)
+        else if (chan->ircnet_status & CHAN_PEND)
           p = "pending";
         else if ((chan->dname[0] != '+') && !me_op(chan))
           p = "want ops!";

src/mod/irc.mod/mode.c

@@ -1502,7 +1502,7 @@ gotmode(char *from, char *msg)
       if (chan->channel.do_opreq)
         request_op(chan);
       if (!me_op(chan) && isserver[0])		/* FIXME, WTF IS THIS? */
-        chan->status |= CHAN_ASKEDMODES;
+        chan->ircnet_status |= CHAN_ASKEDMODES;
     }
   }
   return 0;

src/mod/server.mod/servmsg.c

@@ -196,10 +196,10 @@ join_chans()
 {
   for (register struct chanset_t *chan = chanset; chan; chan = chan->next) {
     if (shouldjoin(chan)) {
-      chan->status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING);
+      chan->ircnet_status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_JOINING);
       dprintf(DP_SERVER, "JOIN %s %s\n", (chan->name[0]) ? chan->name : chan->dname,
                                          chan->channel.key[0] ? chan->channel.key : chan->key_prot);
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status |= CHAN_JOINING;
     }
   }
 }
@@ -352,8 +352,8 @@ static int got442(char *from, char *msg)
     if (shouldjoin(chan) && !channel_joining(chan)) {
       putlog(LOG_MISC, chname, "Server says I'm not on channel: %s", chname);
       clear_channel(chan, 1);
-      chan->status &= ~CHAN_ACTIVE;
-      chan->status |= CHAN_JOINING;
+      chan->ircnet_status &= ~CHAN_ACTIVE;
+      chan->ircnet_status |= CHAN_JOINING;
       dprintf(DP_MODE, "JOIN %s %s\n", chan->name,
 	      chan->channel.key[0] ? chan->channel.key : chan->key_prot);
     }
@@ -962,13 +962,13 @@ static int got437(char *from, char *msg)
   if (s[0] && (strchr(CHANMETA, s[0]) != NULL)) {
     chan = findchan(s);
     if (chan) {
-      chan->status &= ~(CHAN_JOINING);
-      if (chan->status & CHAN_ACTIVE) {
+      chan->ircnet_status &= ~(CHAN_JOINING);
+      if (chan->ircnet_status & CHAN_ACTIVE) {
 	putlog(LOG_MISC, "*", "Can't change nickname on %s.  Is my nickname banned?", s);
       } else {
 	if (!channel_juped(chan)) {
 	  putlog(LOG_MISC, "*", "Channel %s is juped. :(", s);
-	  chan->status |= CHAN_JUPED;
+	  chan->ircnet_status |= CHAN_JUPED;
 	}
       }
     }
@@ -1677,7 +1677,7 @@ static void connect_server(void)
     altnick_char = 0;
 
     for (chan = chanset; chan; chan = chan->next)
-      chan->status &= ~CHAN_JUPED;
+      chan->ircnet_status &= ~CHAN_JUPED;
 
     dcc[newidx].timeval = now;
     dcc[newidx].sock = -1;