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
version: 16.07-rc5
[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
..
d3d3e04
100644
(file)
--- a/
lib/librte_cmdline/cmdline_parse_ipaddr.c
+++ b/
lib/librte_cmdline/cmdline_parse_ipaddr.c
@@
-135,12
+135,12
@@
my_inet_pton(int af, const char *src, void *dst)
{
switch (af) {
case AF_INET:
{
switch (af) {
case AF_INET:
- return
(inet_pton4(src, dst)
);
+ return
inet_pton4(src, dst
);
case AF_INET6:
case AF_INET6:
- return
(inet_pton6(src, dst)
);
+ return
inet_pton6(src, dst
);
default:
errno = EAFNOSUPPORT;
default:
errno = EAFNOSUPPORT;
- return
(-1)
;
+ return
-1
;
}
/* NOTREACHED */
}
}
/* NOTREACHED */
}
@@
-172,26
+172,26
@@
inet_pton4(const char *src, unsigned char *dst)
unsigned int new = *tp * 10 + (pch - digits);
if (new > 255)
unsigned int new = *tp * 10 + (pch - digits);
if (new > 255)
- return
(0)
;
+ return
0
;
if (! saw_digit) {
if (++octets > 4)
if (! saw_digit) {
if (++octets > 4)
- return
(0)
;
+ return
0
;
saw_digit = 1;
}
*tp = (unsigned char)new;
} else if (ch == '.' && saw_digit) {
if (octets == 4)
saw_digit = 1;
}
*tp = (unsigned char)new;
} else if (ch == '.' && saw_digit) {
if (octets == 4)
- return
(0)
;
+ return
0
;
*++tp = 0;
saw_digit = 0;
} else
*++tp = 0;
saw_digit = 0;
} else
- return
(0)
;
+ return
0
;
}
if (octets < 4)
}
if (octets < 4)
- return
(0)
;
+ return
0
;
memcpy(dst, tmp, INADDRSZ);
memcpy(dst, tmp, INADDRSZ);
- return
(1)
;
+ return
1
;
}
/* int
}
/* int
@@
-224,7
+224,7
@@
inet_pton6(const char *src, unsigned char *dst)
/* Leading :: requires some special handling. */
if (*src == ':')
if (*++src != ':')
/* Leading :: requires some special handling. */
if (*src == ':')
if (*++src != ':')
- return
(0)
;
+ return
0
;
curtok = src;
saw_xdigit = count_xdigit = 0;
val = 0;
curtok = src;
saw_xdigit = count_xdigit = 0;
val = 0;
@@
-236,11
+236,11
@@
inet_pton6(const char *src, unsigned char *dst)
pch = strchr((xdigits = xdigits_u), ch);
if (pch != NULL) {
if (count_xdigit >= 4)
pch = strchr((xdigits = xdigits_u), ch);
if (pch != NULL) {
if (count_xdigit >= 4)
- return
(0)
;
+ return
0
;
val <<= 4;
val |= (pch - xdigits);
if (val > 0xffff)
val <<= 4;
val |= (pch - xdigits);
if (val > 0xffff)
- return
(0)
;
+ return
0
;
saw_xdigit = 1;
count_xdigit++;
continue;
saw_xdigit = 1;
count_xdigit++;
continue;
@@
-249,14
+249,14
@@
inet_pton6(const char *src, unsigned char *dst)
curtok = src;
if (!saw_xdigit) {
if (colonp)
curtok = src;
if (!saw_xdigit) {
if (colonp)
- return
(0)
;
+ return
0
;
colonp = tp;
continue;
} else if (*src == '\0') {
colonp = tp;
continue;
} else if (*src == '\0') {
- return
(0)
;
+ return
0
;
}
if (tp + sizeof(int16_t) > endp)
}
if (tp + sizeof(int16_t) > endp)
- return
(0)
;
+ return
0
;
*tp++ = (unsigned char) ((val >> 8) & 0xff);
*tp++ = (unsigned char) (val & 0xff);
saw_xdigit = 0;
*tp++ = (unsigned char) ((val >> 8) & 0xff);
*tp++ = (unsigned char) (val & 0xff);
saw_xdigit = 0;
@@
-272,11
+272,11
@@
inet_pton6(const char *src, unsigned char *dst)
dbloct_count += 2;
break; /* '\0' was seen by inet_pton4(). */
}
dbloct_count += 2;
break; /* '\0' was seen by inet_pton4(). */
}
- return
(0)
;
+ return
0
;
}
if (saw_xdigit) {
if (tp + sizeof(int16_t) > endp)
}
if (saw_xdigit) {
if (tp + sizeof(int16_t) > endp)
- return
(0)
;
+ return
0
;
*tp++ = (unsigned char) ((val >> 8) & 0xff);
*tp++ = (unsigned char) (val & 0xff);
dbloct_count++;
*tp++ = (unsigned char) ((val >> 8) & 0xff);
*tp++ = (unsigned char) (val & 0xff);
dbloct_count++;
@@
-300,13
+300,14
@@
inet_pton6(const char *src, unsigned char *dst)
tp = endp;
}
if (tp != endp)
tp = endp;
}
if (tp != endp)
- return
(0)
;
+ return
0
;
memcpy(dst, tmp, IN6ADDRSZ);
memcpy(dst, tmp, IN6ADDRSZ);
- return
(1)
;
+ return
1
;
}
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;