From: Benjamin Cama <benoar@dolka.fr>
Date: Tue, 16 Aug 2011 23:41:54 +0000 (+0200)
Subject: Switch from masks to CIDR globally for IPv4.
X-Git-Tag: debian/2.2.1-1fdn2~2^2^2~5
X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/7c474381d4dcc23b9fb4d3a2401971a9ef79c889?ds=sidebyside

Switch from masks to CIDR globally for IPv4.

Signed-off-by: Benjamin Cama <benoar@dolka.fr>
---

diff --git a/bgp.c b/bgp.c
index 6a868fa..eca1518 100644
--- a/bgp.c
+++ b/bgp.c
@@ -29,7 +29,7 @@ char const *cvs_id_bgp = "$Id: bgp.c,v 1.12 2005/09/02 23:39:36 bodea Exp $";
 
 static void bgp_clear(struct bgp_peer *peer);
 static void bgp_set_retry(struct bgp_peer *peer);
-static void bgp_cidr(in_addr_t ip, in_addr_t mask, struct bgp_ip_prefix *pfx);
+static void bgp_cidr(in_addr_t ip, int prefixlen, struct bgp_ip_prefix *pfx);
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new);
 
@@ -327,26 +327,6 @@ static void bgp_set_retry(struct bgp_peer *peer)
     	bgp_halt(peer); /* give up */
 }
 
-/* convert ip/mask to CIDR notation */
-static void bgp_cidr(in_addr_t ip, in_addr_t mask, struct bgp_ip_prefix *pfx)
-{
-    int i;
-    uint32_t b;
-
-    /* convert to prefix notation */
-    pfx->len = 32;
-    pfx->prefix = ip;
-
-    if (!mask) /* bogus */
-	mask = 0xffffffff;
-
-    for (i = 0; i < 32 && ((b = ntohl(1 << i)), !(mask & b)); i++)
-    {
-	pfx->len--;
-	pfx->prefix &= ~b;
-    }
-}
-
 /* insert route into list; sorted */
 static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
     struct bgp_route_list *new)
@@ -381,13 +361,14 @@ static struct bgp_route_list *bgp_insert_route(struct bgp_route_list *head,
  * that if that route is later deleted we don't have to be concerned
  * about adding back the more specific one).
  */
-int bgp_add_route(in_addr_t ip, in_addr_t mask)
+int bgp_add_route(in_addr_t ip, int prefixlen)
 {
     struct bgp_route_list *r = bgp_routes;
     struct bgp_route_list add;
     int i;
 
-    bgp_cidr(ip, mask, &add.dest);
+    add.dest.prefix = ip;
+    add.dest.len = prefixlen;
     add.next = 0;
 
     /* check for duplicate */
@@ -427,14 +408,15 @@ int bgp_add_route(in_addr_t ip, in_addr_t mask)
 }
 
 /* remove route from list for peers */
-int bgp_del_route(in_addr_t ip, in_addr_t mask)
+int bgp_del_route(in_addr_t ip, int prefixlen)
 {
     struct bgp_route_list *r = bgp_routes;
     struct bgp_route_list *e = 0;
     struct bgp_route_list del;
     int i;
 
-    bgp_cidr(ip, mask, &del.dest);
+    del.dest.ip = ip;
+    del.dest.len = prefixlen;
     del.next = 0;
 
     /* find entry in routes list and remove */
diff --git a/bgp.h b/bgp.h
index 0a2e59c..f8b52d6 100644
--- a/bgp.h
+++ b/bgp.h
@@ -193,8 +193,8 @@ int bgp_start(struct bgp_peer *peer, char *name, int as, int keepalive,
 void bgp_stop(struct bgp_peer *peer);
 void bgp_halt(struct bgp_peer *peer);
 int bgp_restart(struct bgp_peer *peer);
-int bgp_add_route(in_addr_t ip, in_addr_t mask);
-int bgp_del_route(in_addr_t ip, in_addr_t mask);
+int bgp_add_route(in_addr_t ip, int prefixlen);
+int bgp_del_route(in_addr_t ip, int prefixlen);
 void bgp_enable_routing(int enable);
 int bgp_set_poll(void);
 int bgp_process(uint32_t events[]);
diff --git a/l2tpns.c b/l2tpns.c
index 57e3215..f530955 100644
--- a/l2tpns.c
+++ b/l2tpns.c
@@ -419,16 +419,19 @@ void random_data(uint8_t *buf, int len)
 // via BGP if enabled, and stuffs it into the
 // 'sessionbyip' cache.
 //
-// 'ip' and 'mask' must be in _host_ order.
+// 'ip' must be in _host_ order.
 //
-static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, int add)
+static void routeset(sessionidt s, in_addr_t ip, int prefixlen, in_addr_t gw, int add)
 {
 	struct rtentry r;
+	in_addr_t mask;
 	int i;
 
-	if (!mask) mask = 0xffffffff;
+	if (!prefixlen) prefixlen = 32;
 
-	ip &= mask;		// Force the ip to be the first one in the route.
+	mask = 0xffffffff << (32 - prefixlen);
+
+	ip &= mask;	// Force the ip to be the first one in the route.
 
 	memset(&r, 0, sizeof(r));
 	r.rt_dev = config->tundevice;
@@ -441,11 +444,11 @@ static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, i
 	r.rt_flags = (RTF_UP | RTF_STATIC);
 	if (gw)
 		r.rt_flags |= RTF_GATEWAY;
-	else if (mask == 0xffffffff)
+	else if (prefixlen == 32)
 		r.rt_flags |= RTF_HOST;
 
-	LOG(1, s, 0, "Route %s %s/%s%s%s\n", add ? "add" : "del",
-	    fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1),
+	LOG(1, s, 0, "Route %s %s/%d%s%s\n", add ? "add" : "del",
+	    fmtaddr(htonl(ip), 0), prefixlen,
 	    gw ? " via" : "", gw ? fmtaddr(htonl(gw), 2) : "");
 
 	if (ioctl(ifrfd, add ? SIOCADDRT : SIOCDELRT, (void *) &r) < 0)
@@ -453,9 +456,9 @@ static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, i
 
 #ifdef BGP
 	if (add)
-		bgp_add_route(htonl(ip), htonl(mask));
+		bgp_add_route(htonl(ip), prefixlen);
 	else
-		bgp_del_route(htonl(ip), htonl(mask));
+		bgp_del_route(htonl(ip), prefixlen);
 #endif /* BGP */
 
 		// Add/Remove the IPs to the 'sessionbyip' cache.
@@ -471,7 +474,7 @@ static void routeset(sessionidt s, in_addr_t ip, in_addr_t mask, in_addr_t gw, i
 		if (!add)	// Are we deleting a route?
 			s = 0;	// Caching the session as '0' is the same as uncaching.
 
-		for (i = ip; (i&mask) == (ip&mask) ; ++i)
+		for (i = ip; i < ip+(1<<(32-prefixlen)) ; ++i)
 			cache_ipmap(i, s);
 	}
 }
@@ -1927,11 +1930,11 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
 		int routed = 0;
 		for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
 		{
-			if ((session[s].ip & session[s].route[r].mask) ==
-			    (session[s].route[r].ip & session[s].route[r].mask))
+			if ((session[s].ip >> (32-session[s].route[r].prefixlen)) ==
+			    (session[s].route[r].ip >> (32-session[s].route[r].prefixlen)))
 				routed++;
 
-			if (del_routes) routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 0);
+			if (del_routes) routeset(s, session[s].route[r].ip, session[s].route[r].prefixlen, 0, 0);
 			session[s].route[r].ip = 0;
 		}
 
@@ -4443,18 +4446,18 @@ static void fix_address_pool(int sid)
 //
 // Add a block of addresses to the IP pool to hand out.
 //
-static void add_to_ip_pool(in_addr_t addr, in_addr_t mask)
+static void add_to_ip_pool(in_addr_t addr, int prefixlen)
 {
 	int i;
-	if (mask == 0)
-		mask = 0xffffffff;	// Host route only.
+	if (prefixlen == 0)
+		prefixlen = 32;		// Host route only.
 
-	addr &= mask;
+	addr &= 0xffffffff << (32 - prefixlen);
 
 	if (ip_pool_size >= MAXIPPOOL)	// Pool is full!
 		return ;
 
-	for (i = addr ;(i & mask) == addr; ++i)
+	for (i = addr ; i < addr+(1<<(32-prefixlen)); ++i)
 	{
 		if ((i & 0xff) == 0 || (i&0xff) == 255)
 			continue;	// Skip 0 and broadcast addresses.
@@ -4512,7 +4515,7 @@ static void initippool()
 		{
 			// It's a range
 			int numbits = 0;
-			in_addr_t start = 0, mask = 0;
+			in_addr_t start = 0;
 
 			LOG(2, 0, 0, "Adding IP address range %s\n", buf);
 			*p++ = 0;
@@ -4522,15 +4525,14 @@ static void initippool()
 				continue;
 			}
 			start = ntohl(inet_addr(pool));
-			mask = (in_addr_t) (pow(2, numbits) - 1) << (32 - numbits);
 
 			// Add a static route for this pool
-			LOG(5, 0, 0, "Adding route for address pool %s/%u\n",
-				fmtaddr(htonl(start), 0), 32 + mask);
+			LOG(5, 0, 0, "Adding route for address pool %s/%d\n",
+				fmtaddr(htonl(start), 0), numbits);
 
-			routeset(0, start, mask, 0, 1);
+			routeset(0, start, numbits, 0, 1);
 
-			add_to_ip_pool(start, mask);
+			add_to_ip_pool(start, numbits);
 		}
 		else
 		{
@@ -5179,11 +5181,11 @@ int sessionsetup(sessionidt s, tunnelidt t)
 		// Add the route for this session.
 		for (r = 0; r < MAXROUTE && session[s].route[r].ip; r++)
 		{
-			if ((session[s].ip & session[s].route[r].mask) ==
-			    (session[s].route[r].ip & session[s].route[r].mask))
+			if ((session[s].ip >> (32-session[s].route[r].prefixlen)) ==
+			    (session[s].route[r].ip >> (32-session[s].route[r].prefixlen)))
 				routed++;
 
-			routeset(s, session[s].route[r].ip, session[s].route[r].mask, 0, 1);
+			routeset(s, session[s].route[r].ip, session[s].route[r].prefixlen, 0, 1);
 		}
 
 		// Static IPs need to be routed if not already
@@ -5254,7 +5256,7 @@ int load_session(sessionidt s, sessiont *new)
 
 	for (i = 0; !newip && i < MAXROUTE && (session[s].route[i].ip || new->route[i].ip); i++)
 		if (new->route[i].ip != session[s].route[i].ip ||
-		    new->route[i].mask != session[s].route[i].mask)
+		    new->route[i].prefixlen != session[s].route[i].prefixlen)
 			newip++;
 
 	// needs update
@@ -5265,11 +5267,11 @@ int load_session(sessionidt s, sessiont *new)
 		// remove old routes...
 		for (i = 0; i < MAXROUTE && session[s].route[i].ip; i++)
 		{
-			if ((session[s].ip & session[s].route[i].mask) ==
-			    (session[s].route[i].ip & session[s].route[i].mask))
+			if ((session[s].ip >> (32-session[s].route[i].prefixlen)) ==
+			    (session[s].route[i].ip >> (32-session[s].route[i].prefixlen)))
 				routed++;
 
-			routeset(s, session[s].route[i].ip, session[s].route[i].mask, 0, 0);
+			routeset(s, session[s].route[i].ip, session[s].route[i].prefixlen, 0, 0);
 		}
 
 		// ...ip
@@ -5288,11 +5290,11 @@ int load_session(sessionidt s, sessiont *new)
 		// add new routes...
 		for (i = 0; i < MAXROUTE && new->route[i].ip; i++)
 		{
-			if ((new->ip & new->route[i].mask) ==
-			    (new->route[i].ip & new->route[i].mask))
+			if ((new->ip >> (32-new->route[i].prefixlen)) ==
+			    (new->route[i].ip >> (32-new->route[i].prefixlen)))
 				routed++;
 
-			routeset(s, new->route[i].ip, new->route[i].mask, 0, 1);
+			routeset(s, new->route[i].ip, new->route[i].prefixlen, 0, 1);
 		}
 
 		// ...ip
diff --git a/l2tpns.h b/l2tpns.h
index b9a0714..bab2921 100644
--- a/l2tpns.h
+++ b/l2tpns.h
@@ -233,7 +233,7 @@ struct cli_tunnel_actions {
 typedef struct			// route
 {
 	in_addr_t ip;
-	in_addr_t mask;
+	int prefixlen;
 }
 routet;
 
diff --git a/radius.c b/radius.c
index 93a1cde..e337a75 100644
--- a/radius.c
+++ b/radius.c
@@ -402,21 +402,11 @@ void radiussend(uint16_t r, uint8_t state)
 			int r;
 			for (r = 0; s && r < MAXROUTE && session[s].route[r].ip; r++)
 			{
-				int width = 32;
-				if (session[s].route[r].mask)
-				{
-				    int mask = session[s].route[r].mask;
-				    while (!(mask & 1))
-				    {
-					width--;
-					mask >>= 1;
-				    }
-				}
-
 				*p = 22;	// Framed-Route
 				p[1] = sprintf((char *) p + 2, "%s/%d %s 1",
 					fmtaddr(htonl(session[s].route[r].ip), 0),
-					width, fmtaddr(htonl(session[s].ip), 1)) + 2;
+					session[s].route[r].prefixlen,
+					fmtaddr(htonl(session[s].ip), 1)) + 2;
 
 				p += p[1];
 			}
@@ -696,7 +686,7 @@ void processrad(uint8_t *buf, int len, char socket_index)
 					else if (*p == 22)
 					{
 						// Framed-Route
-						in_addr_t ip = 0, mask = 0;
+						in_addr_t ip = 0;
 						uint8_t u = 0;
 						uint8_t bits = 0;
 						uint8_t *n = p + 2;
@@ -718,14 +708,13 @@ void processrad(uint8_t *buf, int len, char socket_index)
 							n++;
 							while (n < e && isdigit(*n))
 								bits = bits * 10 + *n++ - '0';
-							mask = (( -1) << (32 - bits));
 						}
 						else if ((ip >> 24) < 128)
-							mask = 0xFF0000;
+							bits = 8;
 						else if ((ip >> 24) < 192)
-							mask = 0xFFFF0000;
+							bits = 16;
 						else
-							mask = 0xFFFFFF00;
+							bits = 24;
 
 						if (routes == MAXROUTE)
 						{
@@ -733,11 +722,11 @@ void processrad(uint8_t *buf, int len, char socket_index)
 						}
 						else if (ip)
 						{
-							LOG(3, s, session[s].tunnel, "   Radius reply contains route for %s/%s\n",
-								fmtaddr(htonl(ip), 0), fmtaddr(htonl(mask), 1));
+							LOG(3, s, session[s].tunnel, "   Radius reply contains route for %s/%d\n",
+								fmtaddr(htonl(ip), 0), bits, 1));
 							
 							session[s].route[routes].ip = ip;
-							session[s].route[routes].mask = mask;
+							session[s].route[routes].prefixlen = bits;
 							routes++;
 						}
 					}