git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
acl: introduce config parameter for performance/space trade-off
[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
501f35b
..
7f33599
100644
(file)
--- a/
lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/
lib/librte_cmdline/cmdline_parse_ipaddr.c
@@
-306,7
+306,8
@@
inet_pton6(const char *src, unsigned char *dst)
}
int
}
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;
{
struct cmdline_token_ipaddr *tk2;
unsigned int token_len = 0;
@@
-315,6
+316,9
@@
cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *buf, void *res)
char *prefix, *prefix_end;
long prefixlen = 0;
char *prefix, *prefix_end;
long prefixlen = 0;
+ if (res && ressize < sizeof(cmdline_ipaddr_t))
+ return -1;
+
if (!buf || !tk || ! *buf)
return -1;
if (!buf || !tk || ! *buf)
return -1;
@@
-327,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;
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) {
/* convert the network prefix */
if (tk2->ipaddr_data.flags & CMDLINE_IPADDR_NETWORK) {
@@
-379,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:
switch (tk2->ipaddr_data.flags) {
case CMDLINE_IPADDR_V4:
-
rte_
snprintf(dstbuf, size, "IPv4");
+ snprintf(dstbuf, size, "IPv4");
break;
case CMDLINE_IPADDR_V6:
break;
case CMDLINE_IPADDR_V6:
-
rte_
snprintf(dstbuf, size, "IPv6");
+ snprintf(dstbuf, size, "IPv6");
break;
case CMDLINE_IPADDR_V4|CMDLINE_IPADDR_V6:
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:
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:
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:
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:
break;
default:
-
rte_
snprintf(dstbuf, size, "IPaddr (bad flags)");
+ snprintf(dstbuf, size, "IPaddr (bad flags)");
break;
}
return 0;
break;
}
return 0;