xtables: fix missing afinfo configuration

I noticed that the iprange match in IPv6 was broken, fix it
by overriding the default family (IPv4) if -6 is passed.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c
index a5d2a65d60232024b90990aa9b8e1a63ccac7ad6..e66f10cdf5c9226428ecdaff40c62f4963e94995 100644 (file)
--- a/iptables/xtables-restore.c
+++ b/iptables/xtables-restore.c
@@ -233,6 +233,7 @@ xtables_restore_main(int argc, char *argv[])
                                break;
                        case '6':
                                h.family = AF_INET6;
+                               xtables_set_nfproto(AF_INET6);
                                break;
                }
        }

diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index 49b859dd562906fc9ca2297731b84b8864a5618b..41ceaf51d5ba950e6901289a3d02099d9b86f6fc 100644 (file)
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -125,6 +125,7 @@ xtables_save_main(int argc, char *argv[])
                        break;
                case '6':
                        h.family = AF_INET6;
+                       xtables_set_nfproto(AF_INET6);
                        break;
                }
        }

diff --git a/iptables/xtables.c b/iptables/xtables.c
index c0585673172271a063587365a8f43fb023ff3926..4e8d36217768b67e6d45f243f2ddad332194bd70 100644 (file)
--- a/iptables/xtables.c
+++ b/iptables/xtables.c
@@ -1045,6 +1045,7 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table)
 
                case '6':
                        args.family = AF_INET6;
+                       xtables_set_nfproto(AF_INET6);
                        break;
 
                case 1: /* non option */