]> git.pld-linux.org Git - packages/linux-libc-headers.git/blame - linux-libc-headers-netfilter.patch
projects / packages / linux-libc-headers.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- release 4;
[packages/linux-libc-headers.git] / linux-libc-headers-netfilter.patch
CommitLineData
b4f81b20
AM		 1diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack.h
2--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack.h 2004-08-19 21:31:32.676498552 +0200
3+++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack.h 2004-08-19 21:32:30.805661576 +0200
1a75cf76 4@@ -49,10 +49,12 @@
ac0dc5e3 5
1a75cf76
PS		 6 #include <linux/netfilter_ipv4/ip_conntrack_tcp.h>
7 #include <linux/netfilter_ipv4/ip_conntrack_icmp.h>
8+#include <linux/netfilter_ipv4/ip_conntrack_sctp.h>
ac0dc5e3 9
1a75cf76
PS		 10 /* per conntrack: protocol private data */
11 union ip_conntrack_proto {
12 /* insert conntrack proto private data here */
13+ struct ip_ct_sctp sctp;
14 struct ip_ct_tcp tcp;
15 struct ip_ct_icmp icmp;
16 };
b4f81b20
AM		 17diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_sctp.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
18--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 1970-01-01 01:00:00.000000000 +0100
19+++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_sctp.h 2004-08-19 21:32:30.808661120 +0200
1a75cf76
PS		 20@@ -0,0 +1,25 @@
21+#ifndef _IP_CONNTRACK_SCTP_H
22+#define _IP_CONNTRACK_SCTP_H
23+/* SCTP tracking. */
24+
25+enum sctp_conntrack {
26+ SCTP_CONNTRACK_NONE,
27+ SCTP_CONNTRACK_CLOSED,
28+ SCTP_CONNTRACK_COOKIE_WAIT,
29+ SCTP_CONNTRACK_COOKIE_ECHOED,
30+ SCTP_CONNTRACK_ESTABLISHED,
31+ SCTP_CONNTRACK_SHUTDOWN_SENT,
32+ SCTP_CONNTRACK_SHUTDOWN_RECD,
33+ SCTP_CONNTRACK_SHUTDOWN_ACK_SENT,
34+ SCTP_CONNTRACK_MAX
35+};
36+
37+struct ip_ct_sctp
5b9841a9 38+{
1a75cf76 39+ enum sctp_conntrack state;
5b9841a9 40+
1a75cf76
PS		 41+ u_int32_t vtag[IP_CT_DIR_MAX];
42+ u_int32_t ttag[IP_CT_DIR_MAX];
5b9841a9
PS		 43+};
44+
1a75cf76 45+#endif /* _IP_CONNTRACK_SCTP_H */
b4f81b20
AM		 46diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_tuple.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
47--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-08-19 21:31:32.670499464 +0200
48+++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_conntrack_tuple.h 2004-08-19 21:32:30.810660816 +0200
bab37e86
PS		 49@@ -25,6 +25,9 @@
50 struct {
51 u_int16_t id;
52 } icmp;
53+ struct {
54+ u_int16_t port;
55+ } sctp;
56 };
57
58 /* The manipulable part of the tuple. */
59@@ -55,6 +58,9 @@
60 struct {
61 u_int8_t type, code;
62 } icmp;
63+ struct {
64+ u_int16_t port;
65+ } sctp;
66 } u;
67
68 /* The protocol. */
b4f81b20
AM		 69diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_logging.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_logging.h
70--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_logging.h 1970-01-01 01:00:00.000000000 +0100
71+++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_logging.h 2004-08-19 21:32:30.813660360 +0200
e0dfec11
PS		 72@@ -0,0 +1,5 @@
73+/* IPv4 macros for the internal logging interface. */
74+#ifndef __IP_LOGGING_H
75+#define __IP_LOGGING_H
76+
77+#endif /*__IP_LOGGING_H*/
b4f81b20
AM		 78diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_queue.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_queue.h
79--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ip_queue.h 2004-08-19 21:31:32.665500224 +0200
80+++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ip_queue.h 2004-08-19 21:32:30.816659904 +0200
38896796
PS		 81@@ -7,7 +7,7 @@
82 #ifndef _IP_QUEUE_H
83 #define _IP_QUEUE_H
e0dfec11 84
38896796
PS		 85-#include <linux/if.h>
86+#include <net/if.h>
e0dfec11 87
38896796
PS		 88 /* Messages sent from kernel */
89 typedef struct ipq_packet_msg {
6fe1750b 90@@ -39,10 +39,20 @@
9b0600c6 91 unsigned char payload[0]; /* Optional replacement packet */
92 } ipq_verdict_msg_t;
93
94+typedef struct ipq_vwmark_msg {
95+ unsigned int value; /* Verdict to hand to netfilter */
96+ unsigned long id; /* Packet ID for this verdict */
97+ size_t data_len; /* Length of replacement data */
98+ unsigned char payload[0]; /* Optional replacement packet */
99+ unsigned long nfmark; /* Mark for the Packet */
100+} ipq_vwmark_msg_t;
101+
102+
103 typedef struct ipq_peer_msg {
104 union {
105 ipq_verdict_msg_t verdict;
106 ipq_mode_msg_t mode;
107+ ipq_vwmark_msg_t vwmark;
108 } msg;
109 } ipq_peer_msg_t;
110
6fe1750b 111@@ -59,6 +69,7 @@
9b0600c6 112 #define IPQM_MODE (IPQM_BASE + 1) /* Mode request from peer */
113 #define IPQM_VERDICT (IPQM_BASE + 2) /* Verdict from peer */
114 #define IPQM_PACKET (IPQM_BASE + 3) /* Packet from kernel */
115-#define IPQM_MAX (IPQM_BASE + 4)
116+#define IPQM_VWMARK (IPQM_BASE + 4) /* Verdict and mark from peer */
117+#define IPQM_MAX (IPQM_BASE + 5)
118
119 #endif /*_IP_QUEUE_H*/
b4f81b20
AM		 120diff -urN linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_account.h linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_account.h
121--- linux-libc-headers-2.6.8.0.org/include/linux/netfilter_ipv4/ipt_account.h 1970-01-01 01:00:00.000000000 +0100
122+++ linux-libc-headers-2.6.8.0/include/linux/netfilter_ipv4/ipt_account.h 2004-08-19 21:32:35.740911304 +0200
4f894449
PS		 123@@ -0,0 +1,21 @@
124+/*
125+ * accounting match (ipt_account.c)
126