X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Flibrte_cmdline%2Fcmdline_parse_ipaddr.c;h=7f3359942304ccd7ea9872b9b4cd1c2e367c0db2;hb=2f372ab5c90c8e93e04f65d0fbdd34f6997f4de6;hp=4b4ce7519ba726457c7769b7e8c48e661c1f1cc1;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git

diff --git a/lib/librte_cmdline/cmdline_parse_ipaddr.c b/lib/librte_cmdline/cmdline_parse_ipaddr.c
index 4b4ce7519b..7f33599423 100644
--- 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;