[NETFILTER]: conntrack annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Al Viro 2006-09-28 14:21:37 -07:00 committed by David S. Miller
parent 59b8bfd8fd
commit cdcb71bf96
14 changed files with 90 additions and 89 deletions

View file

@ -157,7 +157,7 @@ struct ip_conntrack_expect
unsigned int flags;
#ifdef CONFIG_IP_NF_NAT_NEEDED
u_int32_t saved_ip;
__be32 saved_ip;
/* This is the original per-proto part, used to map the
* expected connection the way the recipient expects. */
union ip_conntrack_manip_proto saved_proto;

View file

@ -23,13 +23,13 @@ union ip_conntrack_manip_proto
__be16 port;
} tcp;
struct {
u_int16_t port;
__be16 port;
} udp;
struct {
u_int16_t id;
__be16 id;
} icmp;
struct {
u_int16_t port;
__be16 port;
} sctp;
struct {
__be16 key; /* key is 32bit, pptp only uses 16 */
@ -39,7 +39,7 @@ union ip_conntrack_manip_proto
/* The manipulable part of the tuple. */
struct ip_conntrack_manip
{
u_int32_t ip;
__be32 ip;
union ip_conntrack_manip_proto u;
};
@ -50,22 +50,22 @@ struct ip_conntrack_tuple
/* These are the parts of the tuple which are fixed. */
struct {
u_int32_t ip;
__be32 ip;
union {
/* Add other protocols here. */
u_int16_t all;
struct {
u_int16_t port;
__be16 port;
} tcp;
struct {
u_int16_t port;
__be16 port;
} udp;
struct {
u_int8_t type, code;
} icmp;
struct {
u_int16_t port;
__be16 port;
} sctp;
struct {
__be16 key; /* key is 32bit,