From eb6648d7ec1c053512cc2b93c19832ffdfd97308 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Fri, 19 Sep 2014 18:18:42 -0500 Subject: [PATCH] Revert "gmap: Limit new IPv4 nodes to a class-b private network" This reverts commit 1dc21e5bc59f78e94690237bddd81ce8bac58369. * May bike-shed the ipv4 address to a class A. --- src/gmap.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/gmap.c b/src/gmap.c index 74974ad..4dad050 100644 --- a/src/gmap.c +++ b/src/gmap.c @@ -572,31 +572,11 @@ random_ip(inet_prefix * ipstart, int final_level, int final_gid, for (;;) { /* * Let's choose a completely random ip. - * New gnodes are limited to: - * IPv4: 172.16.0.0/12 - * IPv6: fe6e:746b::/32 */ levels = total_levels; - if (my_family == AF_INET) { - int i = 0; - while (i < 4) { - int octet = 0; - switch (i) { - case 0: - octet = 172; - break; - case 1: - octet = (rand() % (31-16)) + 16; - break; - default: - octet = rand() % 255; - break; - } - idata[0] |= (octet << (i * 8)); - i++; - } - } else { - // TODO: Generate a random address in fe6e:746b::/32 + if (my_family == AF_INET) + idata[0] = rand(); + else { idata[0] = rand(); idata[1] = rand(); idata[2] = rand();