diff options
Diffstat (limited to 'networking/libiproute/iptunnel.c')
-rw-r--r-- | networking/libiproute/iptunnel.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c index 5349587ae..6a841aadb 100644 --- a/networking/libiproute/iptunnel.c +++ b/networking/libiproute/iptunnel.c | |||
@@ -232,9 +232,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
232 | if (strchr(*argv, '.')) | 232 | if (strchr(*argv, '.')) |
233 | p->i_key = p->o_key = get_addr32(*argv); | 233 | p->i_key = p->o_key = get_addr32(*argv); |
234 | else { | 234 | else { |
235 | if (get_unsigned(&uval, *argv, 0) < 0) { | 235 | uval = get_unsigned(*argv, "key"); |
236 | invarg(*argv, "key"); | ||
237 | } | ||
238 | p->i_key = p->o_key = htonl(uval); | 236 | p->i_key = p->o_key = htonl(uval); |
239 | } | 237 | } |
240 | } else if (key == ARG_ikey) { | 238 | } else if (key == ARG_ikey) { |
@@ -244,9 +242,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
244 | if (strchr(*argv, '.')) | 242 | if (strchr(*argv, '.')) |
245 | p->o_key = get_addr32(*argv); | 243 | p->o_key = get_addr32(*argv); |
246 | else { | 244 | else { |
247 | if (get_unsigned(&uval, *argv, 0) < 0) { | 245 | uval = get_unsigned(*argv, "ikey"); |
248 | invarg(*argv, "ikey"); | ||
249 | } | ||
250 | p->i_key = htonl(uval); | 246 | p->i_key = htonl(uval); |
251 | } | 247 | } |
252 | } else if (key == ARG_okey) { | 248 | } else if (key == ARG_okey) { |
@@ -256,9 +252,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
256 | if (strchr(*argv, '.')) | 252 | if (strchr(*argv, '.')) |
257 | p->o_key = get_addr32(*argv); | 253 | p->o_key = get_addr32(*argv); |
258 | else { | 254 | else { |
259 | if (get_unsigned(&uval, *argv, 0) < 0) { | 255 | uval = get_unsigned(*argv, "okey"); |
260 | invarg(*argv, "okey"); | ||
261 | } | ||
262 | p->o_key = htonl(uval); | 256 | p->o_key = htonl(uval); |
263 | } | 257 | } |
264 | } else if (key == ARG_seq) { | 258 | } else if (key == ARG_seq) { |
@@ -297,8 +291,7 @@ static void parse_args(char **argv, int cmd, struct ip_tunnel_parm *p) | |||
297 | NEXT_ARG(); | 291 | NEXT_ARG(); |
298 | key = index_in_strings(keywords, *argv); | 292 | key = index_in_strings(keywords, *argv); |
299 | if (key != ARG_inherit) { | 293 | if (key != ARG_inherit) { |
300 | if (get_unsigned(&uval, *argv, 0)) | 294 | uval = get_unsigned(*argv, "TTL"); |
301 | invarg(*argv, "TTL"); | ||
302 | if (uval > 255) | 295 | if (uval > 255) |
303 | invarg(*argv, "TTL must be <=255"); | 296 | invarg(*argv, "TTL must be <=255"); |
304 | p->iph.ttl = uval; | 297 | p->iph.ttl = uval; |