Suggested patch for allowing netmask to be specified in dotted quad format.
See http://bugs.debian.org/357172
(Known problem: this will not prevent some invalid syntaxes,
ie. "255.0.255.0" will be treated as "255.255.255.0")
Comments? Suggestions? Improvements?
Signed-off-by: Andreas Henriksson <[EMAIL PROTECTED]>
diff --git a/lib/utils.c b/lib/utils.c
index 4c42dfd..277ab45 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -47,6 +47,25 @@ int get_integer(int *val, const char *arg, int base)
return 0;
}
+int get_netmask(unsigned *val, const char *arg, int base)
+{
+ inet_prefix addr;
+
+ if (!get_unsigned(val, arg, base))
+ return 0;
+
+ /* try coverting dotted quad to CIDR */
+ if (!get_addr_1(&addr, arg, AF_INET)) {
+ u_int32_t mask;
+ *val=0;
+ for (mask = addr.data[0]; mask; mask >>= 1)
+ (*val)++;
+ return 0;
+ }
+
+ return -1;
+}
+
int get_unsigned(unsigned *val, const char *arg, int base)
{
unsigned long res;
@@ -304,7 +323,8 @@ int get_prefix_1(inet_prefix *dst, char *arg, int family)
dst->bitlen = 32;
}
if (slash) {
- if (get_unsigned(&plen, slash+1, 0) || plen >
dst->bitlen) {
+ if (get_netmask(&plen, slash+1, 0)
+ || plen > dst->bitlen) {
err = -1;
goto done;
}
--
Regards,
Andreas Henriksson
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
