diff options
author | Jan Echternach <echter@informatik.uni-rostock.de> | 2000-08-27 07:41:39 +0000 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2000-08-27 07:41:39 +0000 |
commit | af8fe9ec66c40f2c7663222924b819a776f2f9a7 (patch) | |
tree | e14e1945819db051efbdeaabba9e39e49833df2a | |
parent | b6db33196870d3ec401a7ca87234dd2bc379c413 (diff) |
Jan Echternach's string_to_number bignum fixes.
-rw-r--r-- | ip6tables.c | 9 | ||||
-rw-r--r-- | iptables.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ip6tables.c b/ip6tables.c index 27e7187c..4df70c82 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -745,14 +745,15 @@ parse_target(const char *targetname) int string_to_number(const char *s, int min, int max) { - int number; + long number; char *end; /* Handle hex, octal, etc. */ - number = (int)strtol(s, &end, 0); + errno = 0; + number = strtol(s, &end, 0); if (*end == '\0' && end != s) { /* we parsed a number, let's see if we want this */ - if (min <= number && number <= max) + if (errno != ERANGE && min <= number && number <= max) return number; } return -1; @@ -818,7 +819,7 @@ find_target(const char *name, enum ip6t_tryload tryload) } static struct option * -merge_options(struct option *oldopts, struct option *newopts, +merge_options(struct option *oldopts, const struct option *newopts, unsigned int *option_offset) { unsigned int num_old, num_new, i; @@ -200,6 +200,8 @@ static const struct pprot chain_protos[] = { { "tcp", IPPROTO_TCP }, { "udp", IPPROTO_UDP }, { "icmp", IPPROTO_ICMP }, + { "esp", IPPROTO_ESP }, + { "ah", IPPROTO_AH }, { "all", 0 }, }; |