Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 643a2c15 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by David S. Miller
Browse files

[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: default avatarJan Engelhardt <jengelh@computergmbh.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df54aae0

include/linux/netfilter.h

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ enum nf_inet_hooks { 
	NF_INET_NUMHOOKS

};



union nf_inet_addr {

	u_int32_t	all[4];

	__be32		ip;

	__be32		ip6[4];

};



#ifdef __KERNEL__

#ifdef CONFIG_NETFILTER

include/linux/netfilter/nf_conntrack_h323.h

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct nf_conn; 


extern 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);

extern void nf_conntrack_h245_expect(struct nf_conn *new,

				     struct nf_conntrack_expect *this);

extern void nf_conntrack_q931_expect(struct nf_conn *new,
@@ -39,12 +39,12 @@ extern void nf_conntrack_q931_expect(struct nf_conn *new, 
extern int (*set_h245_addr_hook) (struct sk_buff *skb,

				  unsigned char **data, int dataoff,

				  H245_TransportAddress *taddr,

				  union nf_conntrack_address *addr,

				  union nf_inet_addr *addr,

				  __be16 port);

extern int (*set_h225_addr_hook) (struct sk_buff *skb,

				  unsigned char **data, int dataoff,

				  TransportAddress *taddr,

				  union nf_conntrack_address *addr,

				  union nf_inet_addr *addr,

				  __be16 port);

extern int (*set_sig_addr_hook) (struct sk_buff *skb,

				 struct nf_conn *ct,

include/net/netfilter/nf_conntrack_expect.h

+2 −2
Original line number Diff line number Diff line
@@ -73,8 +73,8 @@ void nf_ct_unexpect_related(struct nf_conntrack_expect *exp); 
   nf_ct_expect_related.  You will have to call put afterwards. */

struct nf_conntrack_expect *nf_ct_expect_alloc(struct nf_conn *me);

void nf_ct_expect_init(struct nf_conntrack_expect *, int,

		       union nf_conntrack_address *,

		       union nf_conntrack_address *,

		       union nf_inet_addr *,

		       union nf_inet_addr *,

		       u_int8_t, __be16 *, __be16 *);

void nf_ct_expect_put(struct nf_conntrack_expect *exp);

int nf_ct_expect_related(struct nf_conntrack_expect *expect);

include/net/netfilter/nf_conntrack_tuple.h

+5 −12
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#ifndef _NF_CONNTRACK_TUPLE_H

#define _NF_CONNTRACK_TUPLE_H



#include <linux/netfilter/x_tables.h>

#include <linux/netfilter/nf_conntrack_tuple_common.h>



/* A `tuple' is a structure containing the information to uniquely
@@ -20,15 +21,7 @@ 
  "non-manipulatable" lines, for the benefit of the NAT code.

*/



#define NF_CT_TUPLE_L3SIZE	4



/* The l3 protocol-specific manipulable parts of the tuple: always in

   network order! */

union nf_conntrack_address {

	u_int32_t all[NF_CT_TUPLE_L3SIZE];

	__be32 ip;

	__be32 ip6[4];

};

#define NF_CT_TUPLE_L3SIZE	ARRAY_SIZE(((union nf_inet_addr *)NULL)->all)



/* The protocol-specific manipulable parts of the tuple: always in

   network order! */
@@ -57,7 +50,7 @@ union nf_conntrack_man_proto 
/* The manipulable part of the tuple. */

struct nf_conntrack_man

{

	union nf_conntrack_address u3;

	union nf_inet_addr u3;

	union nf_conntrack_man_proto u;

	/* Layer 3 protocol */

	u_int16_t l3num;
@@ -70,7 +63,7 @@ struct nf_conntrack_tuple 


	/* These are the parts of the tuple which are fixed. */

	struct {

		union nf_conntrack_address u3;

		union nf_inet_addr u3;

		union {

			/* Add other protocols here. */

			__be16 all;
@@ -103,7 +96,7 @@ struct nf_conntrack_tuple 
struct nf_conntrack_tuple_mask

{

	struct {

		union nf_conntrack_address u3;

		union nf_inet_addr u3;

		union nf_conntrack_man_proto u;

	} src;

};

net/ipv4/netfilter/nf_nat_h323.c

+5 −5
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static int set_addr(struct sk_buff *skb, 
static int set_h225_addr(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)

{

	return set_addr(skb, data, dataoff, taddr->ipAddress.ip,

			addr->ip, port);
@@ -86,7 +86,7 @@ static int set_h225_addr(struct sk_buff *skb, 
static int set_h245_addr(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)

{

	return set_addr(skb, data, dataoff,

			taddr->unicastAddress.iPAddress.network,
@@ -103,7 +103,7 @@ static int set_sig_addr(struct sk_buff *skb, struct nf_conn *ct, 
	int dir = CTINFO2DIR(ctinfo);

	int i;

	__be16 port;

	union nf_conntrack_address addr;

	union nf_inet_addr addr;



	for (i = 0; i < count; i++) {

		if (get_h225_addr(ct, *data, &taddr[i], &addr, &port)) {
@@ -155,7 +155,7 @@ static int set_ras_addr(struct sk_buff *skb, struct nf_conn *ct, 
	int dir = CTINFO2DIR(ctinfo);

	int i;

	__be16 port;

	union nf_conntrack_address addr;

	union nf_inet_addr addr;



	for (i = 0; i < count; i++) {

		if (get_h225_addr(ct, *data, &taddr[i], &addr, &port) &&
@@ -408,7 +408,7 @@ static int nat_q931(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);

	u_int16_t nated_port = ntohs(port);

	union nf_conntrack_address addr;

	union nf_inet_addr addr;



	/* Set expectations for NAT */

	exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port;