added basic ssl support to ircu

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

diff --git a/ircd/numnicks.c b/ircd/numnicks.c
index b54e20ed20dae4e59383bcdea3685e5d60757177..66e432135d23db284df65b3e1c1b0a03518bd2c8 100644 (file)
--- a/ircd/numnicks.c
+++ b/ircd/numnicks.c
@@ -48,7 +48,7 @@
  * replaced by a 5 character string: YYXXX
  * Where 'YY' represents the server, and 'XXX' the nick on that server.
  *
- * 'YYXXX' should not interfer with the input parser, and therefore is
+ * 'YYXXX' should not interfere with the input parser, and therefore is
  * not allowed to contain spaces or a ':'.
  * Also, 'YY' can't start with a '+' because of m_server().
  *
@@ -439,6 +439,7 @@ struct Client* find_match_server(char *mask)
  * @param[out] buf Output buffer to write to.
  * @param[in] addr IP address to encode.
  * @param[in] count Number of bytes writable to \a buf.
+ * @param[in] v6_ok If non-zero, peer understands base-64 encoded IPv6 addresses.
  */
 const char* iptobase64(char* buf, const struct irc_in_addr* addr, unsigned int count, int v6_ok)
 {
@@ -501,14 +502,18 @@ void base64toip(const char* input, struct irc_in_addr* addr)
   memset(addr, 0, sizeof(*addr));
   if (strlen(input) == 6) {
     unsigned int in = base64toint(input);
-    addr->in6_16[6] = htons(in >> 16);
-    addr->in6_16[7] = htons(in & 65535);
+    /* An all-zero address should stay that way. */
+    if (in) {
+      addr->in6_16[5] = htons(65535);
+      addr->in6_16[6] = htons(in >> 16);
+      addr->in6_16[7] = htons(in & 65535);
+    }
   } else {
     unsigned int pos = 0;
     do {
       if (*input == '_') {
         unsigned int left;
-        for (left = (25 - strlen(input)) / 3; left; left--)
+        for (left = (25 - strlen(input)) / 3 - pos; left; left--)
           addr->in6_16[pos++] = 0;
         input++;
       } else {
@@ -516,7 +521,6 @@ void base64toip(const char* input, struct irc_in_addr* addr)
         accum = (accum << NUMNICKLOG) | convert2n[(unsigned char)*input++];
         accum = (accum << NUMNICKLOG) | convert2n[(unsigned char)*input++];
         addr->in6_16[pos++] = ntohs(accum);
-        input += 3;
       }
     } while (pos < 8);
   }