package/network/utils/iptables/patches/002-xtables-Call-init_extensions_a_b.patch

   1 A modified version of this patch was commited upstream
   2 as part of a fixup series
   3 https://bugzilla.netfilter.org/show_bug.cgi?id=1593
   4 https://git.netfilter.org/iptables/commit/?id=0836524f093c0fd9c39604a46a949e43d9b47ef2
   5
   6 --- a/iptables/xtables-monitor.c
   7 +++ b/iptables/xtables-monitor.c
   8 @@ -629,6 +629,8 @@ int xtables_monitor_main(int argc, char
   9         init_extensions();
  10         init_extensions4();
  11         init_extensions6();
  12 +       init_extensionsa();
  13 +       init_extensionsb();
  14  #endif
  15
  16         if (nft_init(&h, AF_INET, xtables_ipv4)) {
  17 --- a/iptables/xtables-restore.c
  18 +++ b/iptables/xtables-restore.c
  19 @@ -368,9 +368,17 @@ xtables_restore_main(int family, const c
  20  #endif
  21                 break;
  22         case NFPROTO_ARP:
  23 +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  24 +               init_extensions();
  25 +               init_extensionsa();
  26 +#endif
  27                 tables = xtables_arp;
  28                 break;
  29         case NFPROTO_BRIDGE:
  30 +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  31 +               init_extensions();
  32 +               init_extensionsb();
  33 +#endif
  34                 tables = xtables_bridge;
  35                 break;
  36         default:
  37 --- a/iptables/xtables-save.c
  38 +++ b/iptables/xtables-save.c
  39 @@ -208,9 +208,17 @@ xtables_save_main(int family, int argc,
  40                 d.commit = true;
  41                 break;
  42         case NFPROTO_ARP:
  43 +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  44 +               init_extensions();
  45 +               init_extensionsa();
  46 +#endif
  47                 tables = xtables_arp;
  48                 break;
  49         case NFPROTO_BRIDGE: {
  50 +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  51 +               init_extensions();
  52 +               init_extensionsb();
  53 +#endif
  54                 const char *ctr = getenv("EBTABLES_SAVE_COUNTER");
  55
  56                 if (!(d.format & FMT_NOCOUNTS)) {
  57 --- a/iptables/xtables-standalone.c
  58 +++ b/iptables/xtables-standalone.c
  59 @@ -58,6 +58,8 @@ xtables_main(int family, const char *pro
  60         init_extensions();
  61         init_extensions4();
  62         init_extensions6();
  63 +       init_extensionsa();
  64 +       init_extensionsb();
  65  #endif
  66
  67         if (nft_init(&h, family, xtables_ipv4) < 0) {
  68 --- a/iptables/xtables-translate.c
  69 +++ b/iptables/xtables-translate.c
  70 @@ -474,9 +474,17 @@ static int xtables_xlate_main_common(str
  71                 tables = xtables_ipv4;
  72                 break;
  73         case NFPROTO_ARP:
  74 +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  75 +               init_extensions();
  76 +               init_extensionsa();
  77 +#endif
  78                 tables = xtables_arp;
  79                 break;
  80         case NFPROTO_BRIDGE:
  81 +#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  82 +               init_extensions();
  83 +               init_extensionsb();
  84 +#endif
  85                 tables = xtables_bridge;
  86                 break;
  87         default:
  88 --- a/iptables/xtables-arp.c
  89 +++ b/iptables/xtables-arp.c
  90 @@ -438,6 +438,7 @@ int nft_init_arp(struct nft_handle *h, c
  91         }
  92
  93  #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
  94 +       init_extensions();
  95         init_extensionsa();
  96  #endif
  97
  98 --- a/iptables/xtables-eb.c
  99 +++ b/iptables/xtables-eb.c
 100 @@ -685,6 +685,7 @@ int nft_init_eb(struct nft_handle *h, co
 101         }
 102
 103  #if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS)
 104 +       init_extensions();
 105         init_extensionsb();
 106  #endif
 107