rpatricia 0.07 → 0.08

data/Changes

@@ -1,3 +1,7 @@
+0.08 2011/0812
+ - IPv6 support: Patricia.new(:AF_INET6)
+ - minor internal cleanups and speedups
+
 0.07 2010/09/23
  - fix segfault from unpredictable GC ordering
    when node objects outlive the trees they come from

data/README

@@ -60,9 +60,11 @@ new:
 
       pt = Patricia.new
 
-    This is the class' constructor - it returns a Patricia object.  For
-    now, the constructor takes no arguments, and defaults to creating a
-    tree which uses AF_INET IPv4 address and mask values as keys.
+    This is the class' constructor - it returns a Patricia object for
+    handling IPv4 addresses.  To handle IPv6 addresses (only),
+    Patricia.new may be called with an additional argument:
+
+      pt = Patricia.new(:AF_INET6)
 
     The Patricia object will be destroyed automatically when there are
     no longer any references to it.
@@ -74,7 +76,8 @@ add:
     specification in canonical form, e.g. ``10.0.0.0/8'', where the
     number after the slash represents the number of bits in the
     netmask. If no mask width is specified, the longest possible mask
-    is assumed, i.e. 32 bits for AF_INET addresses.
+    is assumed, i.e. 32 bits for AF_INET addresses and 128 bits for
+    AF_INET6 addresses.
 
     The second argument, user_data, is optional. If supplied, it
     should be a STRING object specifying the user data that will be 
@@ -89,6 +92,12 @@ add:
     On success, this method returns the object of the Patricia Trie 
     node.
 
+family:
+
+    Returns either :AF_INET or :AF_INET6 symbol depending on how the
+    object was initialized.  A Patricia object may only handle IPv4 or
+    IPv6 addresses.
+
 add_node:    An alias of add.
 
 search_best:
@@ -103,7 +112,7 @@ search_best:
     canonical form, e.g. ``10.0.0.0/8'', where the number after the
     slash represents the number of bits in the netmask. If no mask
     width value is specified, the longest mask is assumed, i.e. 32
-    bits for AF_INET addresses.
+    bits for AF_INET addresses and 128 bits for AF_INET6 addresses.
 
     If a matching node is found in the Patricia Trie, this method
     returns the object of the node. This method returns nil on
@@ -181,6 +190,7 @@ prefixlen:
      This method returns the prefix length of the Patricia Trie 
      node.
 
-AUTHOR
-------
+AUTHORS
+-------
 Tatsuya Mori <mori.tatsuya@gmail.com>
+Eric Wong <normalperson@yhbt.net>

data/ext/rpatricia/patricia.c

@@ -67,142 +67,37 @@ comp_with_mask (void *addr, void *dest, u_int mask)
     return (0);
 }
 
-/* inet_pton substitute implementation
- * Uses inet_addr to convert an IP address in dotted decimal notation into 
- * unsigned long and copies the result to dst.
- * Only supports AF_INET.  Follows standard error return conventions of 
- * inet_pton.
- */
-int
-inet_pton (int af, const char *src, void *dst)
-{
-    u_long result;  
-
-    if (af == AF_INET) {
-	result = inet_addr(src);
-	if (result == -1)
-	    return 0;
-	else {
-			memcpy (dst, &result, 4);
-	    return 1;
-		}
-	}
-#ifdef NT
-#ifdef HAVE_IPV6
-	else if (af == AF_INET6) {
-		struct in6_addr Address;
-		return (inet6_addr(src, &Address));
-	}
-#endif /* HAVE_IPV6 */
-#endif /* NT */
-#ifndef NT
-    else {
-
-	errno = EAFNOSUPPORT;
-	return -1;
-    }
-#endif /* NT */
-}
-
-/* this allows imcomplete prefix */
-int
-my_inet_pton (int af, const char *src, void *dst)
-{
-    if (af == AF_INET) {
-        int i, c, val;
-        u_char xp[4] = {0, 0, 0, 0};
-
-        for (i = 0; ; i++) {
-	    c = *src++;
-	    if (!isdigit (c))
-		return (-1);
-	    val = 0;
-	    do {
-		val = val * 10 + c - '0';
-		if (val > 255)
-		    return (0);
-		c = *src++;
-	    } while (c && isdigit (c));
-            xp[i] = val;
-	    if (c == '\0')
-		break;
-            if (c != '.')
-                return (0);
-	    if (i >= 3)
-		return (0);
-        }
-	memcpy (dst, xp, 4);
-        return (1);
-#ifdef HAVE_IPV6
-    } else if (af == AF_INET6) {
-        return (inet_pton (af, src, dst));
-#endif /* HAVE_IPV6 */
-    } else {
-#ifndef NT
-	errno = EAFNOSUPPORT;
-#endif /* NT */
-	return -1;
-    }
-}
-
 /* 
  * convert prefix information to ascii string with length
- * thread safe and (almost) re-entrant implementation
+ * thread safe and re-entrant implementation
+ *
+ * buff must be at least PATRICIA_MAXSTRLEN bytes large if with_len is true
+ * buff must be at least INET6_ADDRSTRLEN bytes large if with_len is false
  */
 char *
 prefix_toa2x (prefix_t *prefix, char *buff, int with_len)
 {
-    if (prefix == NULL)
-	return ("(Null)");
-    assert (prefix->ref_count >= 0);
-    if (buff == NULL) {
-
-        struct buffer {
-            char buffs[16][48+5];
-            u_int i;
-        } *buffp;
-
-#    if 0
-	THREAD_SPECIFIC_DATA (struct buffer, buffp, 1);
-#    else
-        { /* for scope only */
-	   static struct buffer local_buff;
-           buffp = &local_buff;
-	}
-#    endif
-	if (buffp == NULL) {
-	    /* XXX should we report an error? */
-	    return (NULL);
-	}
+    const char *dst;
 
-	buff = buffp->buffs[buffp->i++%16];
-    }
-    if (prefix->family == AF_INET) {
-	u_char *a;
-	assert (prefix->bitlen <= 32);
-	a = prefix_touchar (prefix);
-	if (with_len) {
-	    sprintf (buff, "%d.%d.%d.%d/%d", a[0], a[1], a[2], a[3],
-		     prefix->bitlen);
-	}
-	else {
-	    sprintf (buff, "%d.%d.%d.%d", a[0], a[1], a[2], a[3]);
-	}
-	return (buff);
-    }
-#ifdef HAVE_IPV6
-    else if (prefix->family == AF_INET6) {
-	char *r;
-	r = (char *) inet_ntop (AF_INET6, &prefix->add.sin6, buff, 48 /* a guess value */ );
-	if (r && with_len) {
-	    assert (prefix->bitlen <= 128);
-	    sprintf (buff + strlen (buff), "/%d", prefix->bitlen);
-	}
-	return (buff);
-    }
-#endif /* HAVE_IPV6 */
-    else
-	return (NULL);
+    assert(prefix && "NULL prefix not allowed");
+    assert(prefix->ref_count >= 0);
+    assert(buff != NULL && "buffer must be specified");
+
+    switch (prefix->family) {
+    case AF_INET:
+	assert(prefix->bitlen <= 32 && "bitlen > 32 for AF_INET");
+	break;
+    case AF_INET6:
+	assert(prefix->bitlen <= 128 && "bitlen > 128 for AF_INET6");
+	break;
+    default:
+	assert(0 && "unknown address family (memory corruption?)");
+    }
+    dst = inet_ntop(prefix->family, &prefix->add.sin6, buff, INET6_ADDRSTRLEN);
+    assert(dst && "corrupt address");
+    if (with_len)
+	sprintf(buff + strlen(buff), "/%u", prefix->bitlen);
+    return buff;
 }
 
 /* prefix_toa2
@@ -214,57 +109,36 @@ prefix_toa2 (prefix_t *prefix, char *buff)
     return (prefix_toa2x (prefix, buff, 0));
 }
 
-/* prefix_toa
- */
-char *
-prefix_toa (prefix_t * prefix)
-{
-    return (prefix_toa2 (prefix, (char *) NULL));
-}
-
 prefix_t *
 New_Prefix2 (int family, void *dest, int bitlen, prefix_t *prefix)
 {
-    int dynamic_allocated = 0;
-    int default_bitlen = 32;
-
-#ifdef HAVE_IPV6
-    if (family == AF_INET6) {
-        default_bitlen = 128;
-	if (prefix == NULL) {
-            prefix = calloc(1, sizeof (prefix6_t));
-	    dynamic_allocated++;
-	}
-	memcpy (&prefix->add.sin6, dest, 16);
-    }
-    else
-#endif /* HAVE_IPV6 */
-    if (family == AF_INET) {
-		if (prefix == NULL) {
-#ifndef NT
-            prefix = calloc(1, sizeof (prefix4_t));
-#else
-			//for some reason, compiler is getting
-			//prefix4_t size incorrect on NT
-			prefix = calloc(1, sizeof (prefix_t)); 
-#endif /* NT */
-		
-			dynamic_allocated++;
-		}
-		memcpy (&prefix->add.sin, dest, 4);
-    }
-    else {
-        return (NULL);
-    }
-
-    prefix->bitlen = (bitlen >= 0)? bitlen: default_bitlen;
+    prefix_t *orig_prefix = prefix;
+    int default_bitlen;
+    size_t size, addr_size;
+
+    switch (family) {
+    case AF_INET6:
+        addr_size = sizeof(struct in6_addr);
+	size = sizeof(prefix_t);
+	break;
+    case AF_INET:
+	addr_size = sizeof(struct in_addr);
+	size = sizeof(prefix4_t);
+	break;
+    default:
+        return NULL;
+    }
+    default_bitlen = addr_size * CHAR_BIT;
+    if (bitlen > default_bitlen)
+	return NULL;
+    if (!orig_prefix)
+	prefix = calloc(1, size);
+    prefix->bitlen = bitlen >= 0 ? bitlen : default_bitlen;
     prefix->family = family;
-    prefix->ref_count = 0;
-    if (dynamic_allocated) {
-        prefix->ref_count++;
-   }
-/* fprintf(stderr, "[C %s, %d]\n", prefix_toa (prefix), prefix->ref_count); */
-    return (prefix);
+    prefix->ref_count = orig_prefix ? 0 : 1;
+    memcpy(&prefix->add.sin6, dest, addr_size);
+
+    return prefix;
 }
 
 prefix_t *
@@ -276,76 +150,46 @@ New_Prefix (int family, void *dest, int bitlen)
 /* ascii2prefix
  */
 prefix_t *
-ascii2prefix (int family, char *string)
+ascii2prefix(char *string, prefix_t *prefix)
 {
-    u_long bitlen, maxbitlen = 0;
-    char *cp;
-    struct in_addr sin;
-#ifdef HAVE_IPV6
-    struct in6_addr sin6;
-#endif /* HAVE_IPV6 */
+    long bitlen;
+    size_t maxbitlen;
+    void *dest;
+    char *slash, *end;
     int result;
-    char save[MAXLINE];
-
-    if (string == NULL)
-		return (NULL);
-
-    /* easy way to handle both families */
-    if (family == 0) {
-       family = AF_INET;
-#ifdef HAVE_IPV6
-       if (strchr (string, ':')) family = AF_INET6;
-#endif /* HAVE_IPV6 */
+    char save[INET6_ADDRSTRLEN];
+    size_t len;
+    int family;
+    union {
+	struct in6_addr sin6;
+	struct in_addr sin;
+    } addr;
+
+    assert(string && "string is NULL");
+    len = strlen(string);
+    slash = memchr(string, '/', len);
+    if (slash) {
+	bitlen = strtol(slash + 1, &end, 10);
+	if (*end || (bitlen < 0) || ((slash - string) >= (int)sizeof(save)))
+	    return NULL;
+
+	/* copy the string to save. Avoid destroying the string */
+	memcpy(save, string, slash - string);
+	save[slash - string] = '\0';
+	string = save;
+    } else {
+	bitlen = -1;
     }
 
-    if (family == AF_INET) {
-		maxbitlen = 32;
-    }
-#ifdef HAVE_IPV6
-    else if (family == AF_INET6) {
-		maxbitlen = 128;
-    }
-#endif /* HAVE_IPV6 */
-
-    if ((cp = strchr (string, '/')) != NULL) {
-		bitlen = atol (cp + 1);
-		/* *cp = '\0'; */
-		/* copy the string to save. Avoid destroying the string */
-		assert (cp - string < MAXLINE);
-		memcpy (save, string, cp - string);
-		save[cp - string] = '\0';
-		string = save;
-		if (bitlen < 0 || bitlen > maxbitlen)
-			bitlen = maxbitlen;
-		}
-		else {
-			bitlen = maxbitlen;
-		}
-
-		if (family == AF_INET) {
-			if ((result = my_inet_pton (AF_INET, string, &sin)) <= 0)
-				return (NULL);
-			return (New_Prefix (AF_INET, &sin, bitlen));
-		}
-
-#ifdef HAVE_IPV6
-		else if (family == AF_INET6) {
-// Get rid of this with next IPv6 upgrade
-#if defined(NT) && !defined(HAVE_INET_NTOP)
-			inet6_addr(string, &sin6);
-			return (New_Prefix (AF_INET6, &sin6, bitlen));
-#else
-			if ((result = inet_pton (AF_INET6, string, &sin6)) <= 0)
-				return (NULL);
-#endif /* NT */
-			return (New_Prefix (AF_INET6, &sin6, bitlen));
-		}
-#endif /* HAVE_IPV6 */
-		else
-			return (NULL);
+    family = memchr(string, ':', len) ? AF_INET6 : AF_INET;
+    result = inet_pton(family, string, &addr);
+    if (result != 1)
+	return NULL;
+
+    return New_Prefix2(family, &addr, bitlen, prefix);
 }
 
-prefix_t *
+static prefix_t *
 Ref_Prefix (prefix_t * prefix)
 {
     if (prefix == NULL)
@@ -355,11 +199,10 @@ Ref_Prefix (prefix_t * prefix)
         return (New_Prefix2 (prefix->family, &prefix->add, prefix->bitlen, NULL));
     }
     prefix->ref_count++;
-/* fprintf(stderr, "[A %s, %d]\n", prefix_toa (prefix), prefix->ref_count); */
     return (prefix);
 }
 
-void 
+static void
 Deref_Prefix (prefix_t * prefix)
 {
     if (prefix == NULL)
@@ -377,8 +220,6 @@ Deref_Prefix (prefix_t * prefix)
 
 /* } */
 
-/* #define PATRICIA_DEBUG 1 */
-
 static int num_active_patricia = 0;
 
 /* these routines support continuous mask only */
@@ -512,27 +353,10 @@ patricia_search_exact (patricia_tree_t *patricia, prefix_t *prefix)
     bitlen = prefix->bitlen;
 
     while (node->bit < bitlen) {
-
 	if (BIT_TEST (addr[node->bit >> 3], 0x80 >> (node->bit & 0x07))) {
-#ifdef PATRICIA_DEBUG
-	    if (node->prefix)
-    	        fprintf (stderr, "patricia_search_exact: take right %s/%d\n", 
-	                 prefix_toa (node->prefix), node->prefix->bitlen);
-	    else
-    	        fprintf (stderr, "patricia_search_exact: take right at %d\n", 
-			 node->bit);
-#endif /* PATRICIA_DEBUG */
 	    node = node->r;
 	}
 	else {
-#ifdef PATRICIA_DEBUG
-	    if (node->prefix)
-    	        fprintf (stderr, "patricia_search_exact: take left %s/%d\n", 
-	                 prefix_toa (node->prefix), node->prefix->bitlen);
-	    else
-    	        fprintf (stderr, "patricia_search_exact: take left at %d\n", 
-			 node->bit);
-#endif /* PATRICIA_DEBUG */
 	    node = node->l;
 	}
 
@@ -540,23 +364,12 @@ patricia_search_exact (patricia_tree_t *patricia, prefix_t *prefix)
 	    return (NULL);
     }
 
-#ifdef PATRICIA_DEBUG
-    if (node->prefix)
-        fprintf (stderr, "patricia_search_exact: stop at %s/%d\n", 
-	         prefix_toa (node->prefix), node->prefix->bitlen);
-    else
-        fprintf (stderr, "patricia_search_exact: stop at %d\n", node->bit);
-#endif /* PATRICIA_DEBUG */
     if (node->bit > bitlen || node->prefix == NULL)
 	return (NULL);
     assert (node->bit == bitlen);
     assert (node->bit == node->prefix->bitlen);
     if (comp_with_mask (prefix_tochar (node->prefix), prefix_tochar (prefix),
 			bitlen)) {
-#ifdef PATRICIA_DEBUG
-        fprintf (stderr, "patricia_search_exact: found %s/%d\n", 
-	         prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	return (node);
     }
     return (NULL);
@@ -587,33 +400,13 @@ patricia_search_best2 (patricia_tree_t *patricia, prefix_t *prefix, int inclusiv
     while (node->bit < bitlen) {
 
 	if (node->prefix) {
-#ifdef PATRICIA_DEBUG
-            fprintf (stderr, "patricia_search_best: push %s/%d\n", 
-	             prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	    stack[cnt++] = node;
 	}
 
 	if (BIT_TEST (addr[node->bit >> 3], 0x80 >> (node->bit & 0x07))) {
-#ifdef PATRICIA_DEBUG
-	    if (node->prefix)
-    	        fprintf (stderr, "patricia_search_best: take right %s/%d\n", 
-	                 prefix_toa (node->prefix), node->prefix->bitlen);
-	    else
-    	        fprintf (stderr, "patricia_search_best: take right at %d\n", 
-			 node->bit);
-#endif /* PATRICIA_DEBUG */
 	    node = node->r;
 	}
 	else {
-#ifdef PATRICIA_DEBUG
-	    if (node->prefix)
-    	        fprintf (stderr, "patricia_search_best: take left %s/%d\n", 
-	                 prefix_toa (node->prefix), node->prefix->bitlen);
-	    else
-    	        fprintf (stderr, "patricia_search_best: take left at %d\n", 
-			 node->bit);
-#endif /* PATRICIA_DEBUG */
 	    node = node->l;
 	}
 
@@ -624,32 +417,14 @@ patricia_search_best2 (patricia_tree_t *patricia, prefix_t *prefix, int inclusiv
     if (inclusive && node && node->prefix)
 	stack[cnt++] = node;
 
-#ifdef PATRICIA_DEBUG
-    if (node == NULL)
-        fprintf (stderr, "patricia_search_best: stop at null\n");
-    else if (node->prefix)
-        fprintf (stderr, "patricia_search_best: stop at %s/%d\n", 
-	         prefix_toa (node->prefix), node->prefix->bitlen);
-    else
-        fprintf (stderr, "patricia_search_best: stop at %d\n", node->bit);
-#endif /* PATRICIA_DEBUG */
-
     if (cnt <= 0)
 	return (NULL);
 
     while (--cnt >= 0) {
 	node = stack[cnt];
-#ifdef PATRICIA_DEBUG
-        fprintf (stderr, "patricia_search_best: pop %s/%d\n", 
-	         prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	if (comp_with_mask (prefix_tochar (node->prefix), 
 			    prefix_tochar (prefix),
 			    node->prefix->bitlen)) {
-#ifdef PATRICIA_DEBUG
-            fprintf (stderr, "patricia_search_best: found %s/%d\n", 
-	             prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	    return (node);
 	}
     }
@@ -684,10 +459,6 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
 	node->l = node->r = NULL;
 	node->data = NULL;
 	patricia->head = node;
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_lookup: new_node #0 %s/%d (head)\n", 
-		 prefix_toa (prefix), prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	patricia->num_active_node++;
 	return (node);
     }
@@ -702,25 +473,11 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
 	    BIT_TEST (addr[node->bit >> 3], 0x80 >> (node->bit & 0x07))) {
 	    if (node->r == NULL)
 		break;
-#ifdef PATRICIA_DEBUG
-	    if (node->prefix)
-    	        fprintf (stderr, "patricia_lookup: take right %s/%d\n", 
-	                 prefix_toa (node->prefix), node->prefix->bitlen);
-	    else
-    	        fprintf (stderr, "patricia_lookup: take right at %d\n", node->bit);
-#endif /* PATRICIA_DEBUG */
 	    node = node->r;
 	}
 	else {
 	    if (node->l == NULL)
 		break;
-#ifdef PATRICIA_DEBUG
-	    if (node->prefix)
-    	        fprintf (stderr, "patricia_lookup: take left %s/%d\n", 
-	             prefix_toa (node->prefix), node->prefix->bitlen);
-	    else
-    	        fprintf (stderr, "patricia_lookup: take left at %d\n", node->bit);
-#endif /* PATRICIA_DEBUG */
 	    node = node->l;
 	}
 
@@ -728,16 +485,12 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
     }
 
     assert (node->prefix);
-#ifdef PATRICIA_DEBUG
-    fprintf (stderr, "patricia_lookup: stop at %s/%d\n", 
-	     prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 
     test_addr = prefix_touchar (node->prefix);
     /* find the first bit different */
     check_bit = (node->bit < bitlen)? node->bit: bitlen;
     differ_bit = 0;
-    for (i = 0; i*8 < check_bit; i++) {
+    for (i = 0; i*8 < (int)check_bit; i++) {
 	if ((r = (addr[i] ^ test_addr[i])) == 0) {
 	    differ_bit = (i + 1) * 8;
 	    continue;
@@ -754,36 +507,18 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
     }
     if (differ_bit > check_bit)
 	differ_bit = check_bit;
-#ifdef PATRICIA_DEBUG
-    fprintf (stderr, "patricia_lookup: differ_bit %d\n", differ_bit);
-#endif /* PATRICIA_DEBUG */
 
     parent = node->parent;
     while (parent && parent->bit >= differ_bit) {
 	node = parent;
 	parent = node->parent;
-#ifdef PATRICIA_DEBUG
-	if (node->prefix)
-            fprintf (stderr, "patricia_lookup: up to %s/%d\n", 
-	             prefix_toa (node->prefix), node->prefix->bitlen);
-	else
-            fprintf (stderr, "patricia_lookup: up to %d\n", node->bit);
-#endif /* PATRICIA_DEBUG */
     }
 
     if (differ_bit == bitlen && node->bit == bitlen) {
 	if (node->prefix) {
-#ifdef PATRICIA_DEBUG 
-    	    fprintf (stderr, "patricia_lookup: found %s/%d\n", 
-		     prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	    return (node);
 	}
 	node->prefix = Ref_Prefix (prefix);
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_lookup: new node #1 %s/%d (glue mod)\n",
-		 prefix_toa (prefix), prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	assert (node->data == NULL);
 	return (node);
     }
@@ -807,10 +542,6 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
 	    assert (node->l == NULL);
 	    node->l = new_node;
 	}
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_lookup: new_node #2 %s/%d (child)\n", 
-		 prefix_toa (prefix), prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	return (new_node);
     }
 
@@ -834,10 +565,6 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
 	    node->parent->l = new_node;
 	}
 	node->parent = new_node;
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_lookup: new_node #3 %s/%d (parent)\n", 
-		 prefix_toa (prefix), prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
     }
     else {
         glue = calloc(1, sizeof *glue);
@@ -868,10 +595,6 @@ patricia_lookup (patricia_tree_t *patricia, prefix_t *prefix)
 	    node->parent->l = glue;
 	}
 	node->parent = glue;
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_lookup: new_node #4 %s/%d (glue+node)\n", 
-		 prefix_toa (prefix), prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
     }
     return (new_node);
 }
@@ -886,11 +609,6 @@ patricia_remove (patricia_tree_t *patricia, patricia_node_t *node)
     assert (node);
 
     if (node->r && node->l) {
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_remove: #0 %s/%d (r & l)\n", 
-		 prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
-	
 	/* this might be a placeholder node -- have to check and make sure
 	 * there is a prefix aossciated with it ! */
 	if (node->prefix != NULL) 
@@ -902,10 +620,6 @@ patricia_remove (patricia_tree_t *patricia, patricia_node_t *node)
     }
 
     if (node->r == NULL && node->l == NULL) {
-#ifdef PATRICIA_DEBUG
-	fprintf (stderr, "patricia_remove: #1 %s/%d (!r & !l)\n", 
-		 prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
 	parent = node->parent;
 	Deref_Prefix (node->prefix);
 	Delete (node);
@@ -949,10 +663,6 @@ patricia_remove (patricia_tree_t *patricia, patricia_node_t *node)
 	return;
     }
 
-#ifdef PATRICIA_DEBUG
-    fprintf (stderr, "patricia_remove: #2 %s/%d (r ^ l)\n", 
-	     prefix_toa (node->prefix), node->prefix->bitlen);
-#endif /* PATRICIA_DEBUG */
     if (node->r) {
 	child = node->r;
     }
@@ -981,64 +691,3 @@ patricia_remove (patricia_tree_t *patricia, patricia_node_t *node)
 	parent->l = child;
     }
 }
-
-/* { from demo.c */
-
-patricia_node_t *
-make_and_lookup (patricia_tree_t *tree, char *string)
-{
-    prefix_t *prefix;
-    patricia_node_t *node;
-
-    prefix = ascii2prefix (AF_INET, string);
-    printf ("make_and_lookup: %s/%d\n", prefix_toa (prefix), prefix->bitlen);
-    node = patricia_lookup (tree, prefix);
-    Deref_Prefix (prefix);
-    return (node);
-}
-
-patricia_node_t *
-try_search_exact (patricia_tree_t *tree, char *string)
-{
-    prefix_t *prefix;
-    patricia_node_t *node;
-
-    prefix = ascii2prefix (AF_INET, string);
-    printf ("try_search_exact: %s/%d\n", prefix_toa (prefix), prefix->bitlen);
-    if ((node = patricia_search_exact (tree, prefix)) == NULL) {
-        printf ("try_search_exact: not found\n");
-    }
-    else {
-        printf ("try_search_exact: %s/%d found\n", 
-	        prefix_toa (node->prefix), node->prefix->bitlen);
-    }
-    Deref_Prefix (prefix);
-    return (node);
-}
-
-void
-lookup_then_remove (patricia_tree_t *tree, char *string)
-{
-    patricia_node_t *node;
-
-    if (node = try_search_exact (tree, string))
-        patricia_remove (tree, node);
-}
-
-patricia_node_t *
-try_search_best (patricia_tree_t *tree, char *string)
-{
-    prefix_t *prefix;
-    patricia_node_t *node;
-
-    prefix = ascii2prefix (AF_INET, string);
-    printf ("try_search_best: %s/%d\n", prefix_toa (prefix), prefix->bitlen);
-    if ((node = patricia_search_best (tree, prefix)) == NULL)
-        printf ("try_search_best: not found\n");
-    else
-        printf ("try_search_best: %s/%d found\n", 
-	        prefix_toa (node->prefix), node->prefix->bitlen);
-    Deref_Prefix (prefix);
-}
-
-/* } */

data/ext/rpatricia/patricia.h

@@ -23,8 +23,6 @@ typedef void (*void_fn_t)();
 #define BIT_TEST(f, b)  ((f) & (b))
 /* } */
 
-#define addroute make_and_lookup
-
 #include <sys/types.h> /* for u_* definitions (on FreeBSD 5) */
 
 #include <errno.h> /* for EAFNOSUPPORT */
@@ -52,9 +50,7 @@ typedef struct _prefix_t {
     int ref_count;		/* reference count */
     union {
 		struct in_addr sin;
-#ifdef HAVE_IPV6
 		struct in6_addr sin6;
-#endif /* IPV6 */
     } add;
 } prefix_t;
 
@@ -90,14 +86,12 @@ void patricia_process (patricia_tree_t *patricia, void_fn_t func);
 /* { from demo.c */
 
 prefix_t *
-ascii2prefix (int family, char *string);
-
-patricia_node_t *
-make_and_lookup (patricia_tree_t *tree, char *string);
+ascii2prefix (char *string, prefix_t *prefix);
 
 /* } */
 
 #define PATRICIA_MAXBITS 128
+#define PATRICIA_MAXSTRLEN (INET6_ADDRSTRLEN + sizeof("/128") - 1)
 #define PATRICIA_NBIT(x)        (0x80 >> ((x) & 0x7f))
 #define PATRICIA_NBYTE(x)       ((x) >> 3)
 

data/ext/rpatricia/rpatricia.c

@@ -8,7 +8,12 @@
 #include "patricia.h"
 #include <assert.h>
 
+size_t patricia_walk_inorder(patricia_node_t *node, void_fn_t func);
+char * prefix_toa2x(prefix_t *prefix, char *buff, int with_len);
+char * prefix_toa2(prefix_t *prefix, char *buff);
+
 static VALUE cPatricia, cNode;
+static VALUE sym_AF_INET, sym_AF_INET6;
 
 static void dummy(void) {}
 
@@ -42,16 +47,18 @@ wrap_node(patricia_node_t *orig)
   return Data_Wrap_Struct(cNode, p_node_mark, -1, node);
 }
 
-static prefix_t *
-my_ascii2prefix(int family, VALUE str)
+static void
+my_ascii2prefix(patricia_tree_t *tree, VALUE str, prefix_t *prefix)
 {
-  char *cstr = StringValuePtr(str);
-  prefix_t *prefix = ascii2prefix(family, cstr);
+  char *cstr = StringValueCStr(str);
+  prefix_t *ok = ascii2prefix(cstr, prefix);
 
-  if (!prefix)
+  if (!ok)
     rb_raise(rb_eArgError, "invalid prefix: %s", cstr);
 
-  return prefix;
+  if (prefix->bitlen > tree->maxbits)
+    rb_raise(rb_eArgError, "prefix length (%u) larger than maxbits (%u)",
+             prefix->bitlen, tree->maxbits);
 }
 
 static VALUE
@@ -60,15 +67,14 @@ p_add (int argc, VALUE *argv, VALUE self)
   VALUE user_data;
   patricia_tree_t *tree;
   patricia_node_t *node;
-  prefix_t *prefix;
+  prefix_t prefix;
 
   if (argc > 2 || argc < 1) 
     return Qnil;
 
   Data_Get_Struct(self, patricia_tree_t, tree);
-  prefix = my_ascii2prefix(AF_INET, argv[0]);
-  node = patricia_lookup(tree, prefix);
-  Deref_Prefix(prefix);
+  my_ascii2prefix(tree, argv[0], &prefix);
+  node = patricia_lookup(tree, &prefix);
 
   if (argc == 2) {
     user_data = argv[1];
@@ -90,12 +96,11 @@ p_remove (VALUE self, VALUE r_key)
 {
   patricia_tree_t *tree;
   patricia_node_t *node;
-  prefix_t *prefix;
+  prefix_t prefix;
 
   Data_Get_Struct(self, patricia_tree_t, tree);
-  prefix = my_ascii2prefix (AF_INET, r_key);
-  node = patricia_search_exact(tree, prefix);
-  Deref_Prefix (prefix);
+  my_ascii2prefix(tree, r_key, &prefix);
+  node = patricia_search_exact(tree, &prefix);
 
   if (node) {
     patricia_remove (tree, node);
@@ -110,12 +115,11 @@ p_match (VALUE self, VALUE r_key)
 {
   patricia_tree_t *tree;
   patricia_node_t *node;
-  prefix_t *prefix;
+  prefix_t prefix;
   
   Data_Get_Struct(self, patricia_tree_t, tree);
-  prefix = my_ascii2prefix (AF_INET, r_key);
-  node = patricia_search_best(tree, prefix);
-  Deref_Prefix (prefix);
+  my_ascii2prefix(tree, r_key, &prefix);
+  node = patricia_search_best(tree, &prefix);
 
   return node ? wrap_node(node) : Qnil;
 }
@@ -125,12 +129,11 @@ p_include (VALUE self, VALUE r_key)
 {
   patricia_tree_t *tree;
   patricia_node_t *node;
-  prefix_t *prefix;
+  prefix_t prefix;
 
   Data_Get_Struct(self, patricia_tree_t, tree);
-  prefix = my_ascii2prefix (AF_INET, r_key);
-  node = patricia_search_best(tree, prefix);
-  Deref_Prefix (prefix);
+  my_ascii2prefix(tree, r_key, &prefix);
+  node = patricia_search_best(tree, &prefix);
 
   return node ? Qtrue : Qfalse;
 }
@@ -140,12 +143,11 @@ p_match_exact (VALUE self, VALUE r_key)
 {
   patricia_tree_t *tree;
   patricia_node_t *node;
-  prefix_t *prefix;
+  prefix_t prefix;
 
   Data_Get_Struct(self, patricia_tree_t, tree);
-  prefix = my_ascii2prefix (AF_INET, r_key);
-  node = patricia_search_exact(tree, prefix);
-  Deref_Prefix (prefix);
+  my_ascii2prefix(tree, r_key, &prefix);
+  node = patricia_search_exact(tree, &prefix);
 
   return node ? wrap_node(node) : Qnil;
 }
@@ -177,7 +179,7 @@ p_print_nodes (int argc, VALUE *argv, VALUE self)
 {
   ID id_printf = rb_intern("printf");
   VALUE fmt = rb_str_new2("node: %s\n");
-  VALUE buf = rb_str_buf_new(128);
+  VALUE buf = rb_str_new(0, 0);
   char *cbuf;
   patricia_tree_t *tree;
   patricia_node_t *node;
@@ -190,7 +192,7 @@ p_print_nodes (int argc, VALUE *argv, VALUE self)
 
   if (tree->head) {
     PATRICIA_WALK(tree->head, node) {
-      rb_str_resize(buf, 128);
+      rb_str_resize(buf, PATRICIA_MAXSTRLEN);
       cbuf = RSTRING_PTR(buf);
       prefix_toa2x(node->prefix, cbuf, 1);
       rb_str_set_len(buf, strlen(cbuf));
@@ -219,21 +221,29 @@ p_data (VALUE self)
 static VALUE
 p_network (VALUE self)
 {
-  char buff[32];
   patricia_node_t *node;
+  VALUE str = rb_str_new(0, PATRICIA_MAXSTRLEN);
+  char *cstr = RSTRING_PTR(str);
+
   Data_Get_Struct(self, patricia_node_t, node);
-  prefix_toa2x (node->prefix, buff, 0);
-  return rb_str_new2(buff);
+  prefix_toa2x(node->prefix, cstr, 0);
+  rb_str_set_len(str, strlen(cstr));
+
+  return str;
 }
 
 static VALUE
 p_prefix (VALUE self)
 {
-  char buff[32];
   patricia_node_t *node;
+  VALUE str = rb_str_new(0, INET6_ADDRSTRLEN);
+  char *cstr = RSTRING_PTR(str);
+
   Data_Get_Struct(self, patricia_node_t, node);
-  prefix_toa2 (node->prefix, buff);
-  return rb_str_new2(buff);
+  prefix_toa2(node->prefix, cstr);
+  rb_str_set_len(str, strlen(cstr));
+
+  return str;
 }
 
 static VALUE
@@ -258,25 +268,42 @@ p_tree_mark (void *ptr)
 {
   patricia_tree_t *tree = ptr;
 
-  patricia_process(tree, p_tree_mark_each);
+  if (tree)
+    patricia_process(tree, p_tree_mark_each);
 }
 
 static void
 p_tree_free (void *ptr)
 {
   patricia_tree_t *tree = ptr;
-
   /* no need to explicitly free each node->data, GC will do it for us */
-  Destroy_Patricia(tree, NULL);
+  if (tree)
+    Destroy_Patricia(tree, NULL);
 }
 
 static VALUE
 p_alloc(VALUE klass)
 {
-  patricia_tree_t *tree;
-  tree = New_Patricia(32); /* assuming only IPv4 */
+  return Data_Wrap_Struct(klass, p_tree_mark, p_tree_free, NULL);
+}
+
+static VALUE
+p_init(int argc, VALUE *argv, VALUE self)
+{
+  VALUE family;
+  int maxbits;
+
+  rb_scan_args(argc, argv, "01", &family);
 
-  return Data_Wrap_Struct(klass, p_tree_mark, p_tree_free, tree);
+  if (NIL_P(family) || family == sym_AF_INET)
+    maxbits = 32;
+  else if (family == sym_AF_INET6)
+    maxbits = 128;
+  else
+    rb_raise(rb_eArgError, "unknown family (must be :AF_INET6 or :AF_INET)");
+
+  DATA_PTR(self) = New_Patricia(maxbits);
+  return self;
 }
 
 static VALUE
@@ -288,10 +315,10 @@ p_init_copy(VALUE self, VALUE orig)
   if (orig_tree->head) {
     patricia_tree_t *tree;
     patricia_node_t *orig_node, *node;
-    prefix_t prefix;
     VALUE user_data;
 
-    Data_Get_Struct(self, patricia_tree_t, tree);
+    DATA_PTR(self) = tree = New_Patricia(orig_tree->maxbits);
+
     PATRICIA_WALK(orig_tree->head, orig_node) {
       node = patricia_lookup(tree, orig_node->prefix);
       assert(node->prefix == orig_node->prefix);
@@ -302,6 +329,23 @@ p_init_copy(VALUE self, VALUE orig)
       PATRICIA_DATA_SET(node, user_data);
     } PATRICIA_WALK_END;
   }
+
+  return self;
+}
+
+static VALUE
+p_family(VALUE self)
+{
+  patricia_tree_t *tree;
+
+  Data_Get_Struct(self, patricia_tree_t, tree);
+
+  switch (tree->maxbits) {
+  case 32: return sym_AF_INET;
+  case 128: return sym_AF_INET6;
+  }
+  assert(0 && "unknown maxbits, corrupt tree");
+  return Qnil;
 }
 
 void
@@ -309,15 +353,19 @@ Init_rpatricia (void)
 {
   cPatricia = rb_define_class("Patricia", rb_cObject);
   cNode = rb_define_class_under(cPatricia, "Node", rb_cObject);
+  sym_AF_INET = ID2SYM(rb_intern("AF_INET"));
+  sym_AF_INET6 = ID2SYM(rb_intern("AF_INET6"));
 
   /* allocate new Patricia object, called before initialize  */
   rb_define_alloc_func(cPatricia, p_alloc);
+  rb_define_private_method(cPatricia, "initialize", p_init, -1);
   rb_define_method(cPatricia, "initialize_copy", p_init_copy, 1);
 
   /*---------- methods to tree ----------*/
   /* add string */
   rb_define_method(cPatricia, "add", p_add, -1);
   rb_define_method(cPatricia, "add_node", p_add, -1);
+  rb_define_method(cPatricia, "family", p_family, 0);
 
   /* match prefix */
   rb_define_method(cPatricia, "match_best", p_match, 1); 
@@ -348,6 +396,4 @@ Init_rpatricia (void)
   rb_define_method(cNode, "network", p_network, 0);
   rb_define_method(cNode, "prefix", p_prefix, 0);
   rb_define_method(cNode, "prefixlen", p_prefixlen, 0);
-  //  rb_define_method(cPatricia, "family", p_family, 0); 
-
 }

data/rpatricia.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rpatricia}
-  s.version = %q{0.07} # remember to update Changes if this is changed
+  s.version = %q{0.08} # remember to update Changes if this is changed
 
   s.homepage = "http://www.goto.info.waseda.ac.jp/~tatsuya/rpatricia/"
 

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rpatricia
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
-  - 7
-  version: "0.07"
+  - 8
+  version: "0.08"
 platform: ruby
 authors: 
 - Tatsuya Mori
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +00:00
-default_executable: 
+date: 2011-08-13 00:00:00 Z
 dependencies: []
 
 description: |-
@@ -46,7 +45,6 @@ files:
 - ext/rpatricia/rpatricia.c
 - rpatricia.gemspec
 - test.rb
-has_rdoc: true
 homepage: http://www.goto.info.waseda.ac.jp/~tatsuya/rpatricia/
 licenses: []
 
@@ -76,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: module for fast IP address/prefix lookups