acl: fix matching rule

[dpdk.git] / lib / librte_cmdline / cmdline_parse_ipaddr.c

diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index 4b4ce75..7f33599 100644 (file)
--- a/lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/lib/librte_cmdline/cmdline_parse_ipaddr.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -87,7 +87,11 @@
 #include <errno.h>
 #include <netinet/in.h>
 #ifndef __linux__
+#ifndef __FreeBSD__
 #include <net/socket.h>
+#else
+#include <sys/socket.h>
+#endif
 #endif
 
 #include <rte_string_fns.h>
@@ -302,7 +306,8 @@ inet_pton6(const char *src, unsigned char *dst)
 }
 
 int
-cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
+cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res,
+       unsigned ressize)
 {
        struct cmdline_token_ipaddr *tk2;
        unsigned int token_len = 0;
@@ -311,6 +316,9 @@ cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
        char *prefix, *prefix_end;
        long prefixlen = 0;
 
+       if (res && ressize < sizeof(cmdline_ipaddr_t))
+               return -1;
+
        if (!buf || !tk || ! *buf)
                return -1;
 
@@ -323,7 +331,7 @@ cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
        if (token_len >= INET6_ADDRSTRLEN+4)
                return -1;
 
-       rte_snprintf(ip_str, token_len+1, "%s", buf);
+       snprintf(ip_str, token_len+1, "%s", buf);
 
        /* convert the network prefix */
        if (tk2->ipaddr_data.flags & CMDLINE_IPADDR_NETWORK) {
@@ -375,25 +383,25 @@ int cmdline_get_help_ipaddr(cmdline_parse_token_hdr_t *tk, char *dstbuf,
 
        switch (tk2->ipaddr_data.flags) {
        case CMDLINE_IPADDR_V4:
-               rte_snprintf(dstbuf, size, "IPv4");
+               snprintf(dstbuf, size, "IPv4");
                break;
        case CMDLINE_IPADDR_V6:
-               rte_snprintf(dstbuf, size, "IPv6");
+               snprintf(dstbuf, size, "IPv6");
                break;
        case CMDLINE_IPADDR_V4|CMDLINE_IPADDR_V6:
-               rte_snprintf(dstbuf, size, "IPv4/IPv6");
+               snprintf(dstbuf, size, "IPv4/IPv6");
                break;
        case CMDLINE_IPADDR_NETWORK|CMDLINE_IPADDR_V4:
-               rte_snprintf(dstbuf, size, "IPv4 network");
+               snprintf(dstbuf, size, "IPv4 network");
                break;
        case CMDLINE_IPADDR_NETWORK|CMDLINE_IPADDR_V6:
-               rte_snprintf(dstbuf, size, "IPv6 network");
+               snprintf(dstbuf, size, "IPv6 network");
                break;
        case CMDLINE_IPADDR_NETWORK|CMDLINE_IPADDR_V4|CMDLINE_IPADDR_V6:
-               rte_snprintf(dstbuf, size, "IPv4/IPv6 network");
+               snprintf(dstbuf, size, "IPv4/IPv6 network");
                break;
        default:
-               rte_snprintf(dstbuf, size, "IPaddr (bad flags)");
+               snprintf(dstbuf, size, "IPaddr (bad flags)");
                break;
        }
        return 0;