[PATCH] Remove Scope IDs from IPv6 addresses.

[Hleb Valoshka <375gnu@gmail.com>]

	Scoped ipv6 addresses are defined in rfc4007.
	Ruby doesn't support them yet and it's unknown whether it will
	(see http://bugs.ruby-lang.org/issues/8464).
	So we just remove scope ids.
---
 ext/raindrops/linux_inet_diag.c |   49 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 46 insertions(+), 3 deletions(-)

diff --git a/ext/raindrops/linux_inet_diag.c b/ext/raindrops/linux_inet_diag.c
index cd4a876..3948c33 100644
--- a/ext/raindrops/linux_inet_diag.c
+++ b/ext/raindrops/linux_inet_diag.c
@@ -134,17 +134,54 @@ static int st_free_data(st_data_t key, st_data_t value, st_data_t ignored)
 	return ST_DELETE;
 }
 
+/*
+ * call-seq:
+ *      remove_scope_id(ipv4_or_ipv6_address)
+ *
+ * Returns copy of IP address with Scope ID removed,
+ * if address has it (only IPv6 actually may have it).
+ *
+ * NOTE: free() must be called on its result.
+ */
+static char* remove_scope_id(const char * addr)
+{
+        char *newaddr, *t;
+
+        newaddr = strdup(addr);
+        if (newaddr == NULL)
+                perror("strdup");
+
+        t = strchr(newaddr, '%');
+
+        if (t != NULL) {
+                *t = '\0';
+                t = strchr(t+1, ']');
+                if (t == NULL)
+                        fprintf(stderr, "Bad IPv6 address: %s!\n", addr);
+                else
+                        strcat(newaddr, t);
+        }
+
+        return newaddr;
+}
+
 static int st_to_hash(st_data_t key, st_data_t value, VALUE hash)
 {
 	struct listen_stats *stats = (struct listen_stats *)value;
 
 	if (stats->listener_p) {
-		VALUE k = rb_str_new2((const char *)key);
-		VALUE v = rb_listen_stats(stats);
+		VALUE k, v;
+		char *xkey = remove_scope_id((const char *)key);
+		if (xkey == NULL)
+			goto get_out;
+		k = rb_str_new2(xkey);
+		v = rb_listen_stats(stats);
+		free(xkey);
 
 		OBJ_FREEZE(k);
 		rb_hash_aset(hash, k, v);
 	}
+get_out:
 	return st_free_data(key, value, 0);
 }
 
@@ -153,7 +190,12 @@ static int st_AND_hash(st_data_t key, st_data_t value, VALUE hash)
 	struct listen_stats *stats = (struct listen_stats *)value;
 
 	if (stats->listener_p) {
-		VALUE k = rb_str_new2((const char *)key);
+		VALUE k;
+		char *xkey = remove_scope_id((const char *)key);
+		if (xkey == NULL)
+			goto get_out;
+		k = rb_str_new2(xkey);
+		free(xkey);
 
 		if (rb_hash_lookup(hash, k) == Qtrue) {
 			VALUE v = rb_listen_stats(stats);
@@ -161,6 +203,7 @@ static int st_AND_hash(st_data_t key, st_data_t value, VALUE hash)
 			rb_hash_aset(hash, k, v);
 		}
 	}
+get_out:
 	return st_free_data(key, value, 0);
 }
 
-- 
1.7.10.4