[NETFILTER]: Introduce nf_inet_address

A few netfilter modules provide their own union of IPv4 and IPv6
address storage. Will unify that in this patch series.

(1/4): Rename union nf_conntrack_address to union nf_inet_addr and
move it to x_tables.h.

Signed-off-by: Jan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 34 insertions, 34 deletions

diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 175c8d1a199..0efbf343eac 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -226,8 +226,8 @@ struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me)
 EXPORT_SYMBOL_GPL(nf_ct_expect_alloc);
 
 void nf_ct_expect_init(struct nf_conntrack_expect *exp, int family,
-                       union nf_conntrack_address *saddr,
-                       union nf_conntrack_address *daddr,
+                       union nf_inet_addr *saddr,
+                       union nf_inet_addr *daddr,
                        u_int8_t proto, __be16 *src, __be16 *dst)
 {
         int len;
diff --git a/net/netfilter/nf_conntrack_ftp.c b/net/netfilter/nf_conntrack_ftp.c
index 6df259067f7..6770baf2e84 100644
--- a/net/netfilter/nf_conntrack_ftp.c
+++ b/net/netfilter/nf_conntrack_ftp.c
@@ -358,7 +358,7 @@ static int help(struct sk_buff *skb,
         unsigned int matchlen, matchoff;
         struct nf_ct_ftp_master *ct_ftp_info = &nfct_help(ct)->help.ct_ftp_info;
         struct nf_conntrack_expect *exp;
-        union nf_conntrack_address *daddr;
+        union nf_inet_addr *daddr;
         struct nf_conntrack_man cmd = {};
         unsigned int i;
         int found = 0, ends_in_nl;
diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index b636ca60a77..872c1aa3124 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -50,12 +50,12 @@ MODULE_PARM_DESC(callforward_filter, "only create call forwarding expectations "
 int (*set_h245_addr_hook) (struct sk_buff *skb,
                            unsigned char **data, int dataoff,
                            H245_TransportAddress *taddr,
-                           union nf_conntrack_address *addr, __be16 port)
+                           union nf_inet_addr *addr, __be16 port)
                            __read_mostly;
 int (*set_h225_addr_hook) (struct sk_buff *skb,
                            unsigned char **data, int dataoff,
                            TransportAddress *taddr,
-                           union nf_conntrack_address *addr, __be16 port)
+                           union nf_inet_addr *addr, __be16 port)
                            __read_mostly;
 int (*set_sig_addr_hook) (struct sk_buff *skb,
                           struct nf_conn *ct,
@@ -214,7 +214,7 @@ static int get_tpkt_data(struct sk_buff *skb, unsigned int protoff,
 /****************************************************************************/
 static int get_h245_addr(struct nf_conn *ct, unsigned char *data,
                          H245_TransportAddress *taddr,
-                         union nf_conntrack_address *addr, __be16 *port)
+                         union nf_inet_addr *addr, __be16 *port)
 {
         unsigned char *p;
         int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
@@ -257,7 +257,7 @@ static int expect_rtp_rtcp(struct sk_buff *skb, struct nf_conn *ct,
         int ret = 0;
         __be16 port;
         __be16 rtp_port, rtcp_port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *rtp_exp;
         struct nf_conntrack_expect *rtcp_exp;
         typeof(nat_rtp_rtcp_hook) nat_rtp_rtcp;
@@ -330,7 +330,7 @@ static int expect_t120(struct sk_buff *skb,
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
         typeof(nat_t120_hook) nat_t120;
 
@@ -623,7 +623,7 @@ static struct nf_conntrack_helper nf_conntrack_helper_h245 __read_mostly = {
 /****************************************************************************/
 int get_h225_addr(struct nf_conn *ct, unsigned char *data,
                   TransportAddress *taddr,
-                  union nf_conntrack_address *addr, __be16 *port)
+                  union nf_inet_addr *addr, __be16 *port)
 {
         unsigned char *p;
         int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
@@ -662,7 +662,7 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct,
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
         typeof(nat_h245_hook) nat_h245;
 
@@ -704,8 +704,8 @@ static int expect_h245(struct sk_buff *skb, struct nf_conn *ct,
 
 /* If the calling party is on the same side of the forward-to party,
  * we don't need to track the second call */
-static int callforward_do_filter(union nf_conntrack_address *src,
-                                 union nf_conntrack_address *dst,
+static int callforward_do_filter(union nf_inet_addr *src,
+                                 union nf_inet_addr *dst,
                                  int family)
 {
         const struct nf_afinfo *afinfo;
@@ -772,7 +772,7 @@ static int expect_callforwarding(struct sk_buff *skb,
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
         typeof(nat_callforwarding_hook) nat_callforwarding;
 
@@ -828,7 +828,7 @@ static int process_setup(struct sk_buff *skb, struct nf_conn *ct,
         int ret;
         int i;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         typeof(set_h225_addr_hook) set_h225_addr;
 
         pr_debug("nf_ct_q931: Setup\n");
@@ -1200,7 +1200,7 @@ static unsigned char *get_udp_data(struct sk_buff *skb, unsigned int protoff,
 
 /****************************************************************************/
 static struct nf_conntrack_expect *find_expect(struct nf_conn *ct,
-                                               union nf_conntrack_address *addr,
+                                               union nf_inet_addr *addr,
                                                __be16 port)
 {
         struct nf_conntrack_expect *exp;
@@ -1242,7 +1242,7 @@ static int expect_q931(struct sk_buff *skb, struct nf_conn *ct,
         int ret = 0;
         int i;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
         typeof(nat_q931_hook) nat_q931;
 
@@ -1311,7 +1311,7 @@ static int process_gcf(struct sk_buff *skb, struct nf_conn *ct,
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
 
         pr_debug("nf_ct_ras: GCF\n");
@@ -1471,7 +1471,7 @@ static int process_arq(struct sk_buff *skb, struct nf_conn *ct,
         struct nf_ct_h323_master *info = &nfct_help(ct)->help.ct_h323_info;
         int dir = CTINFO2DIR(ctinfo);
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         typeof(set_h225_addr_hook) set_h225_addr;
 
         pr_debug("nf_ct_ras: ARQ\n");
@@ -1513,7 +1513,7 @@ static int process_acf(struct sk_buff *skb, struct nf_conn *ct,
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
         typeof(set_sig_addr_hook) set_sig_addr;
 
@@ -1576,7 +1576,7 @@ static int process_lcf(struct sk_buff *skb, struct nf_conn *ct,
         int dir = CTINFO2DIR(ctinfo);
         int ret = 0;
         __be16 port;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         struct nf_conntrack_expect *exp;
 
         pr_debug("nf_ct_ras: LCF\n");
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c
index 515abffc4a0..47d8947cf26 100644
--- a/net/netfilter/nf_conntrack_sip.c
+++ b/net/netfilter/nf_conntrack_sip.c
@@ -247,7 +247,7 @@ static int skp_digits_len(struct nf_conn *ct, const char *dptr,
 }
 
 static int parse_addr(struct nf_conn *ct, const char *cp, const char **endp,
-                      union nf_conntrack_address *addr, const char *limit)
+                      union nf_inet_addr *addr, const char *limit)
 {
         const char *end;
         int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
@@ -275,7 +275,7 @@ static int parse_addr(struct nf_conn *ct, const char *cp, const char **endp,
 static int epaddr_len(struct nf_conn *ct, const char *dptr,
                       const char *limit, int *shift)
 {
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         const char *aux = dptr;
 
         if (!parse_addr(ct, dptr, &dptr, &addr, limit)) {
@@ -366,7 +366,7 @@ EXPORT_SYMBOL_GPL(ct_sip_get_info);
 static int set_expected_rtp(struct sk_buff *skb,
                             struct nf_conn *ct,
                             enum ip_conntrack_info ctinfo,
-                            union nf_conntrack_address *addr,
+                            union nf_inet_addr *addr,
                             __be16 port,
                             const char *dptr)
 {
@@ -403,7 +403,7 @@ static int sip_help(struct sk_buff *skb,
                     enum ip_conntrack_info ctinfo)
 {
         int family = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num;
-        union nf_conntrack_address addr;
+        union nf_inet_addr addr;
         unsigned int dataoff, datalen;
         const char *dptr;
         int ret = NF_ACCEPT;
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index 26d12b00a9c..b7a684607c7 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -53,10 +53,10 @@ static inline unsigned int connlimit_iphash(__be32 addr)
 }
 
 static inline unsigned int
-connlimit_iphash6(const union nf_conntrack_address *addr,
-                  const union nf_conntrack_address *mask)
+connlimit_iphash6(const union nf_inet_addr *addr,
+                  const union nf_inet_addr *mask)
 {
-        union nf_conntrack_address res;
+        union nf_inet_addr res;
         unsigned int i;
 
         if (unlikely(!connlimit_rnd_inited)) {
@@ -81,14 +81,14 @@ static inline bool already_closed(const struct nf_conn *conn)
 }
 
 static inline unsigned int
-same_source_net(const union nf_conntrack_address *addr,
-                const union nf_conntrack_address *mask,
-                const union nf_conntrack_address *u3, unsigned int family)
+same_source_net(const union nf_inet_addr *addr,
+                const union nf_inet_addr *mask,
+                const union nf_inet_addr *u3, unsigned int family)
 {
         if (family == AF_INET) {
                 return (addr->ip & mask->ip) == (u3->ip & mask->ip);
         } else {
-                union nf_conntrack_address lh, rh;
+                union nf_inet_addr lh, rh;
                 unsigned int i;
 
                 for (i = 0; i < ARRAY_SIZE(addr->ip6); ++i) {
@@ -102,8 +102,8 @@ same_source_net(const union nf_conntrack_address *addr,
 
 static int count_them(struct xt_connlimit_data *data,
                       const struct nf_conntrack_tuple *tuple,
-                      const union nf_conntrack_address *addr,
-                      const union nf_conntrack_address *mask,
+                      const union nf_inet_addr *addr,
+                      const union nf_inet_addr *mask,
                       const struct xt_match *match)
 {
         struct nf_conntrack_tuple_hash *found;
@@ -185,7 +185,7 @@ connlimit_mt(const struct sk_buff *skb, const struct net_device *in,
              bool *hotdrop)
 {
         const struct xt_connlimit_info *info = matchinfo;
-        union nf_conntrack_address addr, mask;
+        union nf_inet_addr addr, mask;
         struct nf_conntrack_tuple tuple;
         const struct nf_conntrack_tuple *tuple_ptr = &tuple;
         enum ip_conntrack_info ctinfo;