git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
linux
/
netfilter_ipv4
/
ip_conntrack_tuple.h
diff --git
a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
b/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
index
2fdabdb
..
c228bde
100644
(file)
--- a/
include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+++ b/
include/linux/netfilter_ipv4/ip_conntrack_tuple.h
@@
-23,13
+23,13
@@
union ip_conntrack_manip_proto
__be16 port;
} tcp;
struct {
__be16 port;
} tcp;
struct {
-
u_int16_t
port;
+
__be16
port;
} udp;
struct {
} udp;
struct {
-
u_int16_t
id;
+
__be16
id;
} icmp;
struct {
} icmp;
struct {
-
u_int16_t
port;
+
__be16
port;
} sctp;
struct {
__be16 key; /* key is 32bit, pptp only uses 16 */
} 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
{
/* The manipulable part of the tuple. */
struct ip_conntrack_manip
{
-
u_int32_t
ip;
+
__be32
ip;
union ip_conntrack_manip_proto u;
};
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 {
/* 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 {
union {
/* Add other protocols here. */
u_int16_t all;
struct {
-
u_int16_t
port;
+
__be16
port;
} tcp;
struct {
} tcp;
struct {
-
u_int16_t
port;
+
__be16
port;
} udp;
struct {
u_int8_t type, code;
} icmp;
struct {
} udp;
struct {
u_int8_t type, code;
} icmp;
struct {
-
u_int16_t
port;
+
__be16
port;
} sctp;
struct {
__be16 key; /* key is 32bit,
} sctp;
struct {
__be16 key; /* key is 32bit,