Miscellaneous bugfixes from recent commits, and a file omitted from last commit.

[ircu2.10.12-pk.git] / ircd / numnicks.c

diff --git a/ircd/numnicks.c b/ircd/numnicks.c
index f84c335f3a98464d8b0ebe8c4ab5b8436ac50371..1e41917375fa2a9bffb6e13f1c35288a0bd98a22 100644 (file)
--- a/ircd/numnicks.c
+++ b/ircd/numnicks.c
@@ -26,6 +26,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_string.h"
 #include "match.h"
 #include "s_bsd.h"
@@ -33,7 +34,7 @@
 #include "s_misc.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -439,11 +440,14 @@ struct Client* find_match_server(char *mask)
  * @param[in] addr IP address to encode.
  * @param[in] count Number of bytes writable to \a buf.
  */
-const char* iptobase64(char* buf, const struct irc_in_addr* addr, unsigned int count)
+const char* iptobase64(char* buf, const struct irc_in_addr* addr, unsigned int count, int v6_ok)
 {
   if (irc_in_addr_is_ipv4(addr)) {
     assert(count >= 6);
     inttobase64(buf, (htons(addr->in6_16[6]) << 16) | htons(addr->in6_16[7]), 6);
+  } else if (!v6_ok) {
+    assert(count >= 6);
+    strcpy(buf, "AAAAAA");
   } else {
     unsigned int max_start, max_zeros, curr_zeros, zero, ii;
     char *output = buf;