Stop link to rejected (+r) bot before opening socket. Fixes #463

Previously, a socket would be opened (and TLS negotiation completed) before a bot checked to see if the connecting bot was marked for rejection (+r). This moves that check earlier in the process prior to attempting the socket connection.
eggheads · Sep 27, 2017 · 9426781 · 9426781
1 parent ab40ee3
commit 9426781
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/botnet.c b/src/botnet.c
@@ -997,6 +997,10 @@ int botlink(char *linker, int idx, char *nick)
   } else if (in_chain(nick) && (idx != -3)) {
     if (idx >= 0)
       dprintf(idx, "%s\n", BOT_ALREADYLINKED);
+  } else if (bot_flags(u) & BOT_REJECT) {
+    if (idx >= 0) {
+      dprintf(idx, "%s %s\n", BOT_REJECTING, nick);
+    }
   } else {
     for (i = 0; i < dcc_total; i++)
       if ((dcc[i].user == u) &&

diff --git a/src/version.h b/src/version.h
@@ -27,5 +27,5 @@
  */
 
 #define EGG_STRINGVER "1.8.2"
-#define EGG_NUMVER 1080205
-#define EGG_PATCH "newchanflags"
+#define EGG_NUMVER 1080206
+#define EGG_PATCH "rejectlink"