patch-2.3.99-pre4 linux/include/linux/netfilter_ipv4/ip_queue.h

• Lines: 71
• Date: Thu Mar 30 16:54:53 2000
• Orig file: v2.3.99-pre3/linux/include/linux/netfilter_ipv4/ip_queue.h
• Orig date: Sun Mar 19 18:35:31 2000

diff -u --recursive --new-file v2.3.99-pre3/linux/include/linux/netfilter_ipv4/ip_queue.h linux/include/linux/netfilter_ipv4/ip_queue.h
@@ -2,7 +2,7 @@
  * This is a module which is used for queueing IPv4 packets and
  * communicating with userspace via netlink.
  *
- * (C) 2000 James Morris
+ * (C) 2000 James Morris, this code is GPL.
  */
 #ifndef _IP_QUEUE_H
 #define _IP_QUEUE_H
@@ -27,7 +27,7 @@
 	char indev_name[IFNAMSIZ];	/* Name of incoming interface */
 	char outdev_name[IFNAMSIZ];	/* Name of outgoing interface */
 	size_t data_len;		/* Length of packet data */
-	/* Optional packet data follows */
+	unsigned char payload[0];	/* Optional packet data */
 } ipq_packet_msg_t;
 
 /* Messages sent from userspace */
@@ -40,7 +40,7 @@
 	unsigned int value;		/* Verdict to hand to netfilter */
 	unsigned long id;		/* Packet ID for this verdict */
 	size_t data_len;		/* Length of replacement data */
-	/* Optional replacement data follows */
+	unsigned char payload[0];	/* Optional replacement packet */
 } ipq_verdict_msg_t;
 
 typedef struct ipq_peer_msg {
@@ -50,37 +50,19 @@
 	} msg;
 } ipq_peer_msg_t;
 
-/* Each queued packet has one of these states */
+/* Packet delivery modes */
 enum {
-	IPQ_PS_NEW,		/* Newly arrived packet */
-	IPQ_PS_WAITING,		/* User has been notified of packet, 
-	                           we're waiting for a verdict */
-	IPQ_PS_VERDICT		/* Packet has been assigned verdict,
-	                           waiting to be reinjected */
-};
-#define IPQ_PS_MAX IPQ_PS_VERDICT
-
-/* The queue operates in one of these states */
-enum {
-	IPQ_QS_HOLD,		/* Hold all packets in queue */
-	IPQ_QS_COPY,		/* Copy metadata and/or packets to user */
-	IPQ_QS_FLUSH		/* Flush and drop all queue entries */
-};
-#define IPQ_QS_MAX IPQ_QS_FLUSH
-
-/* Modes requested by peer */
-enum {
-	IPQ_COPY_NONE,		/* Copy nothing */
+	IPQ_COPY_NONE,		/* Initial mode, packets are dropped */
 	IPQ_COPY_META,		/* Copy metadata */
 	IPQ_COPY_PACKET		/* Copy metadata + packet (range) */
-};	
+};
 #define IPQ_COPY_MAX IPQ_COPY_PACKET
 
 /* Types of messages */
 #define IPQM_BASE	0x10	/* standard netlink messages below this */
-#define IPQM_MODE	(IPQM_BASE + 1)	/* Mode request from peer */
-#define IPQM_VERDICT	(IPQM_BASE + 2)	/* Verdict from peer */ 
-#define IPQM_PACKET	(IPQM_BASE + 3)	/* Packet from kernel */
+#define IPQM_MODE	(IPQM_BASE + 1)		/* Mode request from peer */
+#define IPQM_VERDICT	(IPQM_BASE + 2)		/* Verdict from peer */ 
+#define IPQM_PACKET	(IPQM_BASE + 3)		/* Packet from kernel */
 #define IPQM_MAX	(IPQM_BASE + 4)
 
 #endif /*_IP_QUEUE_H*/