Merge branch 'netrel-updates' into maint

* netrel-updates:
  * When in release_time window and the wanted nick is taken, reset keepnick to start regaining it again
  * Raise release time to 8 seconds (8-2) = 6 seconds before it will regrab it
  * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick

Conflicts:
	doc/UPDATES

doc/UPDATES

@@ -1,6 +1,8 @@
 maint
   * Fix --disable-ipv6 compiling
   * Update cmd_mop to support console channel (so it works via Auth commands better)
+  * Add an extra 2 second delay before releasing nick to aide in syncing and time to type /nick
+  * When a nick is released, start regaining as soon as it is witnessed to have been taken again
 
 1.3.2 - http://wraith.botpack.net/milestone/1.3.2
   * Misc bug fixes

src/eggdrop.h

@@ -62,7 +62,7 @@
 #define RANDSPECIAL     "#*+,-./;<=>?[]^_{}|"
 #define RANDSPECIALLEN  19
 
-#define RELEASE_TIME	7
+#define RELEASE_TIME	8
 
 #define ESCAPESHELL	"`\\|#*()[]& "
 

src/mod/server.mod/servmsg.c

@@ -954,18 +954,29 @@ void nicks_available(char* buf, char delim, bool buf_contains_available) {
   nick_available(is_jupe, is_orig);
 }
 
+void real_release_nick(void *data) {
+  if (match_my_nick(jupenick)) {
+    altnick_char = rolls = 0;
+    tried_nick = now;
+    dprintf(DP_MODE, "NICK %s\n", origbotname);
+    putlog(LOG_MISC, "*", "Releasing jupenick '%s' and switching back to nick '%s'", jupenick, origbotname);
+  }
+}
+
 void release_nick(const char* nick) {
   // Only do this if currently on a jupenick
   if (jupenick[0] && ((!nick && match_my_nick(jupenick)) || (nick && !rfc_casecmp(jupenick, nick)))) {
     keepnick = 0;
+
+    // Delay releasing nick for 2 seconds to allow botnet to receive orders and user to type /NICK
+    egg_timeval_t howlong;
+    howlong.sec = 2;
+    howlong.usec = 0;
+
     release_time = now;
 
-    if (match_my_nick(jupenick)) {
-      altnick_char = rolls = 0;
-      tried_nick = now;
-      dprintf(DP_MODE, "NICK %s\n", origbotname);
-      putlog(LOG_MISC, "*", "Releasing jupenick '%s' and switching back to nick '%s'", jupenick, origbotname);
-    }
+    timer_create(&howlong, "release_nick", (Function) real_release_nick);
+
   } else if (!nick)
     putlog(LOG_CMDS, "*", "Not releasing nickname. (Not currently on a jupenick)");
 }
@@ -1226,8 +1237,15 @@ static int gotnick(char *from, char *msg)
       }
     } else
       putlog(LOG_SERV | LOG_MISC, "*", "Nickname changed to '%s'???", msg);
-  } else if ((keepnick) && (rfc_casecmp(nick, msg))) { //Ignore case changes
-    nicks_available(nick);
+  } else if ((rfc_casecmp(nick, msg))) { //Ignore case changes
+    if (keepnick)
+      nicks_available(nick);
+    else if (keepnick && release_time) {
+      // Someone else has regained the nickname, revert to keeping the nick in case they lose it
+      // within the release_time window.
+      keepnick = 0;
+      release_time = 0;
+    }
   }
   free(buf_ptr);
   return 0;