utils: add s32 parser

[lisovros/iproute2_canprio.git] / lib / utils.c

diff --git a/lib/utils.c b/lib/utils.c
index bcc6a730d5b989e7d9451c2b075b1b30744c1066..d80f79b4fa26c690acc227ec932235f1e9f6521e 100644 (file)
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -8,10 +8,6 @@
  *
  * Authors:    Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
- *
- * Changes:
- *
- * Rani Assaf <rani@magic.metawire.com> 980929:        resolve addresses
  */
 
 #include <stdio.h>
@@ -29,6 +25,7 @@
 #include <linux/pkt_sched.h>
 #include <time.h>
 #include <sys/time.h>
+#include <errno.h>
 
 
 #include "utils.h"
@@ -97,14 +94,13 @@ int get_unsigned(unsigned *val, const char *arg, int base)
 }
 
 /*
- * get_jiffies is "translated" from a similar routine "get_time" in
- * tc_util.c.  we don't use the exact same routine because tc passes
- * microseconds to the kernel and the callers of get_jiffies want 
- * to pass jiffies, and have a different assumption for the units of
- * a "raw" number.
+ * get_time_rtt is "translated" from a similar routine "get_time" in
+ * tc_util.c.  We don't use the exact same routine because tc passes
+ * microseconds to the kernel and the callers of get_time_rtt want to
+ * pass milliseconds (standard unit for rtt values since 2.6.27), and
+ * have a different assumption for the units of a "raw" number.
  */
-
-int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw)
+int get_time_rtt(unsigned *val, const char *arg, int *raw)
 {
        double t;
        unsigned long res;
@@ -116,35 +112,22 @@ int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw)
                        return -1;
        }
        else {
-               res = strtoul(arg,&p,base);
+               res = strtoul(arg, &p, 0);
                if (res > UINT_MAX)
                        return -1;
                t = (double)res;
        }
        if (p == arg)
                return -1;
-
-       if (__iproute2_hz_internal == 0)
-                __iproute2_hz_internal = __get_hz();
-       
        *raw = 1;
 
        if (*p) {
                *raw = 0;
                 if (strcasecmp(p, "s") == 0 || strcasecmp(p, "sec")==0 ||
                     strcasecmp(p, "secs")==0)
-                        t *= __iproute2_hz_internal;
+                        t *= 1000;
                 else if (strcasecmp(p, "ms") == 0 || strcasecmp(p, "msec")==0 ||
                          strcasecmp(p, "msecs") == 0)
-                        t *= __iproute2_hz_internal/1000.0;
-                else if (strcasecmp(p, "us") == 0 || strcasecmp(p, "usec")==0 ||
-                         strcasecmp(p, "usecs") == 0)
-                        t *= __iproute2_hz_internal/1000000.0;
-                else if (strcasecmp(p, "ns") == 0 || strcasecmp(p, "nsec")==0 ||
-                         strcasecmp(p, "nsecs") == 0)
-                        t *= __iproute2_hz_internal/1000000000.0;
-               else if (strcasecmp(p, "j") == 0 || strcasecmp(p, "hz") == 0 ||
-                        strcasecmp(p,"jiffies") == 0)
                        t *= 1.0; /* allow suffix, do nothing */
                 else
                         return -1;
@@ -152,9 +135,9 @@ int get_jiffies(unsigned *jiffies, const char *arg, int base, int *raw)
 
        /* emulate ceil() without having to bring-in -lm and always be >= 1 */
 
-       *jiffies = t;
-       if (*jiffies < t)
-               *jiffies += 1;
+       *val = t;
+       if (*val < t)
+               *val += 1;
        
         return 0;
 
@@ -216,6 +199,24 @@ int get_u8(__u8 *val, const char *arg, int base)
        return 0;
 }
 
+int get_s32(__s32 *val, const char *arg, int base)
+{
+       long res;
+       char *ptr;
+
+       errno = 0;
+
+       if (!arg || !*arg)
+               return -1;
+       res = strtol(arg, &ptr, base);
+       if (ptr == arg || *ptr ||
+           ((res ==  LONG_MIN || res == LONG_MAX) && errno == ERANGE) ||
+           res > INT32_MAX || res < INT32_MIN)
+               return -1;
+       *val = res;
+       return 0;
+}
+
 int get_s16(__s16 *val, const char *arg, int base)
 {
        long res;
@@ -244,11 +245,39 @@ int get_s8(__s8 *val, const char *arg, int base)
        return 0;
 }
 
-int get_addr_1(inet_prefix *addr, const char *name, int family)
+/* This uses a non-standard parsing (ie not inet_aton, or inet_pton)
+ * because of legacy choice to parse 10.8 as 10.8.0.0 not 10.0.0.8
+ */
+static int get_addr_ipv4(__u8 *ap, const char *cp)
 {
-       unsigned long n;
-       char *endp;
+       int i;
 
+       for (i = 0; i < 4; i++) {
+               unsigned long n;
+               char *endp;
+               
+               n = strtoul(cp, &endp, 0);
+               if (n > 255)
+                       return -1;      /* bogus network value */
+
+               if (endp == cp) /* no digits */
+                       return -1;
+
+               ap[i] = n;
+
+               if (*endp == '\0')
+                       break;
+
+               if (i == 3 || *endp != '.')
+                       return -1;      /* extra characters */
+               cp = endp + 1;
+       }
+
+       return 1;
+}
+
+int get_addr_1(inet_prefix *addr, const char *name, int family)
+{
        memset(addr, 0, sizeof(*addr));
 
        if (strcmp(name, "default") == 0 ||
@@ -288,22 +317,7 @@ int get_addr_1(inet_prefix *addr, const char *name, int family)
        if (family != AF_UNSPEC && family != AF_INET)
                return -1;
 
-       n = strtoul(name, &endp, 0);
-       if (n > 255)
-               return -1;      /* bogus network value */
-
-       if (endp == name)       /* not a number */
-               return -1;
-
-       /* compatable with older usage (ie 10/8 = 10.0.0.0/8) */
-       if (strchr(name, '.') == NULL) {
-               addr->data[0] = n;
-               addr->bytelen = 4;
-               addr->bitlen = -1;
-               return 0;
-       }
-
-       if (inet_aton(name, (struct in_addr *)addr->data) <= 0)
+       if (get_addr_ipv4((__u8 *)addr->data, name) <= 0)
                return -1;
 
        addr->bytelen = 4;
@@ -705,7 +719,7 @@ ssize_t getcmdline(char **linep, size_t *lenp, FILE *in)
        while ((cp = strstr(*linep, "\\\n")) != NULL) {
                char *line1 = NULL;
                size_t len1 = 0;
-               size_t cc1;
+               ssize_t cc1;
 
                if ((cc1 = getline(&line1, &len1, in)) < 0) {
                        fprintf(stderr, "Missing continuation line\n");