Use strtonum in host()

This is simpler than checking three cases for `q' and gives nicer error
messages. While here, use `v6mask' as maximum netmask instead of hardcoding
it.

OK sashan

diff --git a/regress/sbin/pfctl/pfail40.ok b/regress/sbin/pfctl/pfail40.ok
index 361fa25..303b285 100644 (file)
--- a/regress/sbin/pfctl/pfail40.ok
+++ b/regress/sbin/pfctl/pfail40.ok
@@ -1,4 +1,4 @@
-invalid netmask '/161'
+netmask is too large: /161
 stdin:2: could not parse host specification
-invalid netmask '/161'
+netmask is too large: /161
 stdin:3: could not parse host specification

diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index 45a6fac..ebc45cd 100644 (file)
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pfctl_parser.c,v 1.323 2018/07/24 09:48:04 kn Exp $ */
+/*     $OpenBSD: pfctl_parser.c,v 1.324 2018/07/28 23:36:54 kn Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -1629,7 +1629,8 @@ host(const char *s, int opts)
 {
        struct node_host        *h = NULL, *n;
        int                      mask = -1, v4mask = 32, v6mask = 128, cont = 1;
-       char                    *p, *q, *r, *ps, *if_name;
+       char                    *p, *r, *ps, *if_name;
+       const char              *errstr;
 
        if ((ps = strdup(s)) == NULL)
                err(1, "host: strdup");
@@ -1642,9 +1643,9 @@ host(const char *s, int opts)
        if ((p = strrchr(ps, '/')) != NULL) {
                if ((r = strdup(ps)) == NULL)
                        err(1, "host: strdup");
-               mask = strtol(p+1, &q, 0);
-               if (!q || *q || mask > 128 || q == (p+1)) {
-                       fprintf(stderr, "invalid netmask '%s'\n", p);
+               mask = strtonum(p+1, 0, v6mask, &errstr);
+               if (errstr) {
+                       fprintf(stderr, "netmask is %s: %s\n", errstr, p);
                        free(r);
                        free(ps);
                        return (NULL);