Jan Echternach's string_to_number bignum fixes.

diff --git a/ip6tables.c b/ip6tables.c
index 27e7187c6e0bc22fff26e18bcd9cb082c6bbb7a1..4df70c824efce216d82e038cffabbdda5a95dd23 100644 (file)
--- 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;

diff --git a/iptables.c b/iptables.c
index 92f0175dc076add73965b604adef21897cec63a5..2f18826080bfa23a6702947b95014d6b6a29d099 100644 (file)
--- a/iptables.c
+++ b/iptables.c
@@ -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 },
 };