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

Commit 605dcad6 authored by Martin Josefsson's avatar Martin Josefsson Committed by David S. Miller
Browse files

[NETFILTER]: nf_conntrack: rename struct nf_conntrack_protocol 



Rename 'struct nf_conntrack_protocol' to 'struct nf_conntrack_l4proto' in
order to help distinguish it from 'struct nf_conntrack_l3proto'. It gets
rather confusing with 'nf_conntrack_protocol'.

Signed-off-by: default avatarMartin Josefsson <gandalf@wlug.westbo.se>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent e2b7606c

include/net/netfilter/nf_conntrack_core.h

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <linux/netfilter.h>

#include <net/netfilter/nf_conntrack_l3proto.h>

#include <net/netfilter/nf_conntrack_protocol.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_ecache.h>



/* This header is used to share core functionality between the
@@ -32,7 +32,7 @@ extern struct nf_conntrack_l3proto *nf_ct_find_l3proto(u_int16_t pf); 
/* Like above, but you already have conntrack read lock. */

extern struct nf_conntrack_l3proto *__nf_ct_find_l3proto(u_int16_t l3proto);



struct nf_conntrack_protocol;

struct nf_conntrack_l4proto;



extern int

nf_ct_get_tuple(const struct sk_buff *skb,
@@ -42,13 +42,13 @@ nf_ct_get_tuple(const struct sk_buff *skb, 
		u_int8_t protonum,

		struct nf_conntrack_tuple *tuple,

		const struct nf_conntrack_l3proto *l3proto,

		const struct nf_conntrack_protocol *protocol);

		const struct nf_conntrack_l4proto *l4proto);



extern int

nf_ct_invert_tuple(struct nf_conntrack_tuple *inverse,

		   const struct nf_conntrack_tuple *orig,

		   const struct nf_conntrack_l3proto *l3proto,

		   const struct nf_conntrack_protocol *protocol);

		   const struct nf_conntrack_l4proto *l4proto);



/* Find a connection corresponding to a tuple. */

extern struct nf_conntrack_tuple_hash *
@@ -76,7 +76,7 @@ extern void __nf_conntrack_attach(struct sk_buff *nskb, struct sk_buff *skb); 
int

print_tuple(struct seq_file *s, const struct nf_conntrack_tuple *tuple,

	    struct nf_conntrack_l3proto *l3proto,

	    struct nf_conntrack_protocol *proto);

	    struct nf_conntrack_l4proto *proto);



extern struct list_head *nf_conntrack_hash;

extern struct list_head nf_conntrack_expect_list;

include/net/netfilter/nf_conntrack_l3proto.h

+2 −2
Original line number Diff line number Diff line
@@ -96,13 +96,13 @@ extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p); 
/* Existing built-in protocols */

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;

extern struct nf_conntrack_l3proto nf_conntrack_generic_l3proto;

extern struct nf_conntrack_l3proto nf_conntrack_l3proto_generic;



static inline struct nf_conntrack_l3proto *

__nf_ct_l3proto_find(u_int16_t l3proto)

{

	if (unlikely(l3proto >= AF_MAX))

		return &nf_conntrack_generic_l3proto;

		return &nf_conntrack_l3proto_generic;

	return nf_ct_l3protos[l3proto];

}

include/net/netfilter/nf_conntrack_protocol.h→include/net/netfilter/nf_conntrack_l4proto.h

+18 −18
Original line number Diff line number Diff line 
/*

 * Header for use in defining a given protocol for connection tracking.

 * Header for use in defining a given L4 protocol for connection tracking.

 *

 * 16 Dec 2003: Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp>

 *	- generalized L3 protocol dependent part.
@@ -7,14 +7,14 @@ 
 * Derived from include/linux/netfiter_ipv4/ip_conntrack_protcol.h

 */



#ifndef _NF_CONNTRACK_PROTOCOL_H

#define _NF_CONNTRACK_PROTOCOL_H

#ifndef _NF_CONNTRACK_L4PROTO_H

#define _NF_CONNTRACK_L4PROTO_H

#include <net/netfilter/nf_conntrack.h>



struct seq_file;

struct nfattr;



struct nf_conntrack_protocol

struct nf_conntrack_l4proto

{

	/* Next pointer. */

	struct list_head list;
@@ -22,8 +22,8 @@ struct nf_conntrack_protocol 
	/* L3 Protocol number. */

	u_int16_t l3proto;



	/* Protocol number. */

	u_int8_t proto;

	/* L4 Protocol number. */

	u_int8_t l4proto;



	/* Protocol name */

	const char *name;
@@ -84,25 +84,25 @@ struct nf_conntrack_protocol 
};



/* Existing built-in protocols */

extern struct nf_conntrack_protocol nf_conntrack_protocol_tcp6;

extern struct nf_conntrack_protocol nf_conntrack_protocol_udp4;

extern struct nf_conntrack_protocol nf_conntrack_protocol_udp6;

extern struct nf_conntrack_protocol nf_conntrack_generic_protocol;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;



#define MAX_NF_CT_PROTO 256

extern struct nf_conntrack_protocol **nf_ct_protos[PF_MAX];

extern struct nf_conntrack_l4proto **nf_ct_protos[PF_MAX];



extern struct nf_conntrack_protocol *

__nf_ct_proto_find(u_int16_t l3proto, u_int8_t protocol);

extern struct nf_conntrack_l4proto *

__nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);



extern struct nf_conntrack_protocol *

nf_ct_proto_find_get(u_int16_t l3proto, u_int8_t protocol);

extern struct nf_conntrack_l4proto *

nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t protocol);



extern void nf_ct_proto_put(struct nf_conntrack_protocol *p);

extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);



/* Protocol registration. */

extern int nf_conntrack_protocol_register(struct nf_conntrack_protocol *proto);

extern void nf_conntrack_protocol_unregister(struct nf_conntrack_protocol *proto);

extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);

extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);



/* Generic netlink helpers */

extern int nf_ct_port_tuple_to_nfattr(struct sk_buff *skb,

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c

+13 −13
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/netfilter_ipv4.h>

#include <net/netfilter/nf_conntrack.h>

#include <net/netfilter/nf_conntrack_helper.h>

#include <net/netfilter/nf_conntrack_protocol.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_l3proto.h>

#include <net/netfilter/nf_conntrack_core.h>

#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
@@ -429,9 +429,9 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 = { 
	.me		 = THIS_MODULE,

};



extern struct nf_conntrack_protocol nf_conntrack_protocol_tcp4;

extern struct nf_conntrack_protocol nf_conntrack_protocol_udp4;

extern struct nf_conntrack_protocol nf_conntrack_protocol_icmp;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;



MODULE_ALIAS("nf_conntrack-" __stringify(AF_INET));

MODULE_LICENSE("GPL");
@@ -448,19 +448,19 @@ static int __init nf_conntrack_l3proto_ipv4_init(void) 
		return ret;

	}



	ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_tcp4);

	ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_tcp4);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register tcp.\n");

		goto cleanup_sockopt;

	}



	ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_udp4);

	ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_udp4);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register udp.\n");

		goto cleanup_tcp;

	}



	ret = nf_conntrack_protocol_register(&nf_conntrack_protocol_icmp);

	ret = nf_conntrack_l4proto_register(&nf_conntrack_l4proto_icmp);

	if (ret < 0) {

		printk("nf_conntrack_ipv4: can't register icmp.\n");

		goto cleanup_udp;
@@ -495,11 +495,11 @@ static int __init nf_conntrack_l3proto_ipv4_init(void) 
 cleanup_ipv4:

	nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);

 cleanup_icmp:

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_icmp);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_icmp);

 cleanup_udp:

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_udp4);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udp4);

 cleanup_tcp:

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp4);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_tcp4);

 cleanup_sockopt:

	nf_unregister_sockopt(&so_getorigdst);

	return ret;
@@ -513,9 +513,9 @@ static void __exit nf_conntrack_l3proto_ipv4_fini(void) 
#endif

	nf_unregister_hooks(ipv4_conntrack_ops, ARRAY_SIZE(ipv4_conntrack_ops));

	nf_conntrack_l3proto_unregister(&nf_conntrack_l3proto_ipv4);

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_icmp);

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_udp4);

	nf_conntrack_protocol_unregister(&nf_conntrack_protocol_tcp4);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_icmp);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_udp4);

	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_tcp4);

	nf_unregister_sockopt(&so_getorigdst);

}

net/ipv4/netfilter/nf_conntrack_proto_icmp.c

+6 −6
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <net/checksum.h>

#include <linux/netfilter_ipv4.h>

#include <net/netfilter/nf_conntrack_tuple.h>

#include <net/netfilter/nf_conntrack_protocol.h>

#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_core.h>



unsigned long nf_ct_icmp_timeout __read_mostly = 30*HZ;
@@ -152,7 +152,7 @@ icmp_error_message(struct sk_buff *skb, 
		struct icmphdr icmp;

		struct iphdr ip;

	} _in, *inside;

	struct nf_conntrack_protocol *innerproto;

	struct nf_conntrack_l4proto *innerproto;

	struct nf_conntrack_tuple_hash *h;

	int dataoff;
@@ -170,7 +170,7 @@ icmp_error_message(struct sk_buff *skb, 
		return -NF_ACCEPT;

	}



	innerproto = __nf_ct_proto_find(PF_INET, inside->ip.protocol);

	innerproto = __nf_ct_l4proto_find(PF_INET, inside->ip.protocol);

	dataoff = skb->nh.iph->ihl*4 + sizeof(inside->icmp);

	/* Are they talking about one of our connections? */

	if (!nf_ct_get_tuple(skb, dataoff, dataoff + inside->ip.ihl*4, PF_INET,
@@ -321,11 +321,11 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[], 
}

#endif



struct nf_conntrack_protocol nf_conntrack_protocol_icmp =

struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp =

{

	.list			= { NULL, NULL },

	.l3proto		= PF_INET,

	.proto			= IPPROTO_ICMP,

	.l4proto		= IPPROTO_ICMP,

	.name			= "icmp",

	.pkt_to_tuple		= icmp_pkt_to_tuple,

	.invert_tuple		= icmp_invert_tuple,
@@ -343,4 +343,4 @@ struct nf_conntrack_protocol nf_conntrack_protocol_icmp = 
#endif

};



EXPORT_SYMBOL(nf_conntrack_protocol_icmp);
 
EXPORT_SYMBOL(nf_conntrack_l4proto_icmp);