Changeset 784

Timestamp:

10/14/06 09:31:18 (6 years ago)

Author:

wd

Message:

Merge changes from 1.1 branch to core code.

Location:

branches/ithildin-scons

Files:

• include/ithildin/socket.h (modified) (1 diff)
• include/ithildin/util.h (modified) (1 diff)
• lib/log.c (modified) (3 diffs)
• lib/socket.c (modified) (1 diff)
• lib/string.c (modified) (2 diffs)

branches/ithildin-scons/include/ithildin/socket.h

@@ -144 +144 @@
 #endif
 
+/* Functions for handling network address type detection */
+int get_address_type(const char *);
+
 /* if we don't have a system getaddrinfo, use the ones that will be included
  * from source/contrib/gailib.c */

branches/ithildin-scons/include/ithildin/util.h

@@ -10 +10 @@
 #ifndef UTIL_H
 #define UTIL_H
-
-/* $Id$ */
 
 /* map a file into memory in various ways */

branches/ithildin-scons/lib/log.c

@@ -83 +83 @@
 }
 
+/* Recursion protection for logged messages.  If we log_*() and then hook an
+ * event which generates a log_*() we can end up in serious trouble. :) */
+#define LOG_RECURSE_MAX 10
+static uint32_t log_recursed;
+
 void log_vmsg(enum logtypes type, const char *mod, const char *msg,
         va_list ap) {
@@ -91 +96 @@
         return; /* avoid doing anything for debug messages when we don't
                    want to */
+
+    log_recursed++;
+    if (log_recursed == LOG_RECURSE_MAX) {
+        log_recursed--;
+        return;
+    }
 
     vsnprintf(logmsg, LOG_MSG_MAXLEN, msg, ap);
@@ -115 +126 @@
             break;
     }
+
+    log_recursed--;
 }
 

branches/ithildin-scons/lib/socket.c

@@ -1008 +1008 @@
 #endif
 
+/* Function to determine the type of an address.  We do cheap best effort
+ * here.  If it looks IPv6-y we try inet_pton with AF_INET6, if it looks
+ * IPv4-y we try inet_pton with AF_INET, and as long as one succeeds we
+ * return that type. */
+int get_address_type(const char *addr) {
+    const char *s = addr;
+    unsigned char buf[IPADDR_SIZE];
+
+#ifdef INET6
+    s = strchr(addr, ':');
+    if (s != NULL && strchr(s + 1, ':') != NULL) {
+        /* either IPv6 or nothing, let's see */
+        if (inet_pton(PF_INET6, addr, buf) == 1)
+            return PF_INET6;
+        return PF_UNSPEC;
+    }
+#endif
+
+    if (inet_pton(PF_INET, addr, buf) == 1)
+        return PF_INET;
+    return PF_UNSPEC;
+}
+
 /* vi:set ts=8 sts=4 sw=4 tw=76 et: */

branches/ithildin-scons/lib/string.c

@@ -315 +315 @@
     int imask = 0;
     int i;
-    char *s;
+    char *mask;
 
     memset(bitmask, 0xff, IPADDR_SIZE);
     strlcpy(addr, wild, IPADDR_MAXLEN + 1);
-    /* First figure out what kind of address we've got.  We no longer support
-     * IPv4 mask form (ip:mask), but IPv6 addresses need at least two colons.
-     * If we find only one, just return 0 right away. */
-    if ((s = strchr(wild, ':')) != NULL) {
-        if (strchr(s + 1, ':') != NULL)
-            family = PF_INET6; /* actually, inet6.. */
-        else
-            return 0; /* no mask support */
-    }
-
-    if ((s = strchr(wild, '/')) != NULL) {
+
+    /* strip off the mask portion if it is there */
+    if ((mask = strchr(wild, '/')) != NULL) {
         /* mask form.  mask specifies significant bits from left to right.
-         * simple enough. */
-        if (IPADDR_MAXLEN > s - wild)
-            addr[s - wild] = '\0';
-        s++;
-        imask = str_conv_int(s, -1);
-        if (imask <= 0)
-            return 0; /* bad bit count specified */
+         * we must make sure to truncate addr at the point where the mask
+         * starts as well, if it starts before IPADDR_MAXLEN. */
+        if (IPADDR_MAXLEN > mask - wild)
+            addr[mask - wild] = '\0';
+        mask++;
+    }
+
+    /* now determine the address family */
+    family = get_address_type(addr);
+    if (family != PF_INET && family != PF_INET6)
+        return 0;
+
+    /* and handle the bitmasking if need-be */
+    if (mask != NULL) {
+        imask = str_conv_int(mask, 0);
 
         if (family == PF_INET6) {
-            if (imask > 128)
-                return 0; /* bad bit count specified */
+            if (imask <= 0)
+                imask = 128;
+            else if (imask > 128)
+                imask = 128;
         } else {
-            if (imask > 32)
-                return 0; /* bad bit count specified */
+            if (imask <= 0)
+                imask = 32;
+            else if (imask > 32)
+                imask = 32;
         }
         memset(bitmask, 0, IPADDR_SIZE);
@@ -351 +355 @@
             bitmask[(i - 1) / 8] = 0xff << (i % 8 ? (8 - (i % 8)) : 0);
     }
-    addr[IPADDR_MAXLEN] = '\0';
 
     /* now copy our addresses into bitmasks.  if either pton fails, assume no