* Don't cycle on restart

src/misc.c

@@ -50,6 +50,7 @@
 #include "tandem.h"
 #include "src/mod/server.mod/server.h"
 #include "src/mod/irc.mod/irc.h"
+#include "src/mod/channels.mod/channels.h"
 #include "userrec.h"
 #include "stat.h"
 #include "net.h"
@@ -638,9 +639,9 @@ readsocks(const char *fname)
 
   while (stream.tell() < stream.length()) {
     str = stream.getline().chomp();
+//    dprintf(DP_DEBUG, "read line: %s\n", str.c_str());
     type = newsplit(str);
 
-//    dprintf(DP_DEBUG, "read line: %s\n", buf.c_str());
     if (type == STR("-dcc"))
       dprintf(DP_DEBUG, STR("Added dcc: %d\n"), dcc_read(stream));
     else if (type == STR("-sock"))
@@ -651,6 +652,15 @@ readsocks(const char *fname)
       server_online = strtol(str.c_str(), NULL, 10);
     else if (type == STR("+server_floodless"))
       floodless = 1;
+    else if (type == STR("+chan")) {
+      bd::String chname = newsplit(str), status = newsplit(str), ircnet_status = newsplit(str);
+      channel_add(NULL, chname.c_str(), NULL);
+      struct chanset_t* chan = findchan_by_dname(chname.c_str());
+      chan->status = atoi(status.c_str());
+      chan->ircnet_status = atoi(ircnet_status.c_str());
+      chan->ircnet_status &= ~(CHAN_ACTIVE);
+      chan->ircnet_status |= CHAN_PEND;
+    }
     else if (type == STR("+buildts"))
       old_buildts = strtol(str.c_str(), NULL, 10);
     else if (type == STR("+botname"))
@@ -757,6 +767,9 @@ restart(int idx)
   stream << buf.printf(STR("+online_since %li\n"), online_since);
   if (floodless)
     stream << buf.printf(STR("+server_floodless %d\n"), floodless);
+  for (struct chanset_t *chan = chanset; chan; chan = chan->next)
+    if (shouldjoin(chan) && channel_active(chan))
+      stream << buf.printf(STR("+chan %s %d %d\n"), chan->dname, chan->status, chan->ircnet_status);
   stream << buf.printf(STR("+buildts %li\n"), buildts);
   stream << buf.printf(STR("+ip4 %s\n"), myipstr(AF_INET));
   stream << buf.printf(STR("+ip6 %s\n"), myipstr(AF_INET6));
@@ -768,12 +781,12 @@ restart(int idx)
 
   if (conf.bot->hub)
     write_userfile(idx);
-
+/*
   if (server_online) {
     do_chanset(NULL, NULL, STR("+inactive"), DO_LOCAL);
     dprintf(DP_DUMP, STR("JOIN 0\n"));
   }
-
+*/
   fixmod(binname);
 
   /* replace image now */

src/mod/channels.mod/channels.h

@@ -50,7 +50,7 @@ int u_sticky_mask(maskrec *, char *);
 int u_setsticky_mask(struct chanset_t *, maskrec *, char *, int, const char);
 int SplitList(char *, const char *, int *, const char ***);
 int channel_modify(char *, struct chanset_t *, int, char **, bool);
-int channel_add(char *, char *, char *, bool = 0);
+int channel_add(char *, const char *, char *, bool = 0);
 void clear_channel(struct chanset_t *, bool);
 int u_equals_mask(maskrec *, char *);
 bool u_match_mask(struct maskrec *, char *);

src/mod/channels.mod/tclchan.c

@@ -912,7 +912,7 @@ void clear_channel(struct chanset_t *chan, bool reset)
 
 /* Create new channel and parse commands.
  */
-int channel_add(char *result, char *newname, char *options, bool isdefault)
+int channel_add(char *result, const char *newname, char *options, bool isdefault)
 {
   /* When loading userfile */
   if (newname && newname[0] && loading && !strcmp(newname, "default"))

src/mod/share.mod/share.c

@@ -1453,10 +1453,14 @@ static void share_read_stream(int idx, bd::Stream& stream) {
   /* If this is ever changed, do mind the restarting bool as it will prevent 001 from dumping JOINs.. */
   if (reset_chans) {
     reset_chans = 0;
-//    putlog(LOG_DEBUG, "*", "Resetting channel info for all channels...");
-//    for (chan = chanset; chan; chan = chan->next)
-//      reset_chan_info(chan);
-    join_chans();
+    putlog(LOG_DEBUG, "*", "Resetting channel info for all channels...");
+    for (chan = chanset; chan; chan = chan->next) {
+      if (shouldjoin(chan) && channel_pending(chan)) { // Set when reading socksfile
+        chan->ircnet_status &= ~(CHAN_PEND); // Reset flags to force a reset
+        reset_chan_info(chan);
+      }
+    }
+//    join_chans();
   }
 }