mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-10 19:25:20 +02:00
fix my latest commit and remove old patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2477 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico
parent
5cf4c5a03c
commit
611360aee8
@ -1,720 +0,0 @@
|
|||||||
diff -urN linux-2.4.29.old/include/linux/netfilter_ipv4/ipt_ipp2p.h linux-2.4.29/include/linux/netfilter_ipv4/ipt_ipp2p.h
|
|
||||||
--- linux-2.4.29.old/include/linux/netfilter_ipv4/ipt_ipp2p.h 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux-2.4.29/include/linux/netfilter_ipv4/ipt_ipp2p.h 2005-03-12 00:44:17.000000000 +0100
|
|
||||||
@@ -0,0 +1,29 @@
|
|
||||||
+#ifndef __IPT_IPP2P_H
|
|
||||||
+#define __IPT_IPP2P_H
|
|
||||||
+#define IPP2P_VERSION "0.7.4"
|
|
||||||
+
|
|
||||||
+struct ipt_p2p_info {
|
|
||||||
+ int cmd;
|
|
||||||
+ int debug;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#endif //__IPT_IPP2P_H
|
|
||||||
+
|
|
||||||
+#define SHORT_HAND_IPP2P 1 /* --ipp2p switch*/
|
|
||||||
+#define SHORT_HAND_DATA 4 /* --ipp2p-data switch*/
|
|
||||||
+#define SHORT_HAND_NONE 5 /* no short hand*/
|
|
||||||
+
|
|
||||||
+#define IPP2P_EDK 2
|
|
||||||
+#define IPP2P_DATA_KAZAA 8
|
|
||||||
+#define IPP2P_DATA_EDK 16
|
|
||||||
+#define IPP2P_DATA_DC 32
|
|
||||||
+#define IPP2P_DC 64
|
|
||||||
+#define IPP2P_DATA_GNU 128
|
|
||||||
+#define IPP2P_GNU 256
|
|
||||||
+#define IPP2P_KAZAA 512
|
|
||||||
+#define IPP2P_BIT 1024
|
|
||||||
+#define IPP2P_APPLE 2048
|
|
||||||
+#define IPP2P_SOUL 4096
|
|
||||||
+#define IPP2P_WINMX 8192
|
|
||||||
+#define IPP2P_ARES 16384
|
|
||||||
+
|
|
||||||
diff -urN linux-2.4.29.old/net/ipv4/netfilter/Config.in linux-2.4.29/net/ipv4/netfilter/Config.in
|
|
||||||
--- linux-2.4.29.old/net/ipv4/netfilter/Config.in 2005-03-12 00:40:38.000000000 +0100
|
|
||||||
+++ linux-2.4.29/net/ipv4/netfilter/Config.in 2005-03-12 00:42:57.000000000 +0100
|
|
||||||
@@ -26,6 +26,7 @@
|
|
||||||
dep_tristate ' TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES
|
|
||||||
+ dep_tristate ' peer to peer traffic match support' CONFIG_IP_NF_MATCH_IPP2P $CONFIG_IP_NF_IPTABLES
|
|
||||||
|
|
||||||
dep_tristate ' DSCP match support' CONFIG_IP_NF_MATCH_DSCP $CONFIG_IP_NF_IPTABLES
|
|
||||||
|
|
||||||
diff -urN linux-2.4.29.old/net/ipv4/netfilter/ipt_ipp2p.c linux-2.4.29/net/ipv4/netfilter/ipt_ipp2p.c
|
|
||||||
--- linux-2.4.29.old/net/ipv4/netfilter/ipt_ipp2p.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux-2.4.29/net/ipv4/netfilter/ipt_ipp2p.c 2005-03-12 00:44:02.000000000 +0100
|
|
||||||
@@ -0,0 +1,661 @@
|
|
||||||
+#if defined(MODVERSIONS)
|
|
||||||
+#include <linux/modversions.h>
|
|
||||||
+#endif
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ip_tables.h>
|
|
||||||
+#include <linux/version.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ipt_ipp2p.h>
|
|
||||||
+//#include "ipt_ipp2p.h"
|
|
||||||
+#include <net/tcp.h>
|
|
||||||
+#include <net/udp.h>
|
|
||||||
+
|
|
||||||
+#define get_u8(X,O) (*(__u8 *)(X + O))
|
|
||||||
+#define get_u16(X,O) (*(__u16 *)(X + O))
|
|
||||||
+#define get_u32(X,O) (*(__u32 *)(X + O))
|
|
||||||
+
|
|
||||||
+MODULE_AUTHOR("Eicke Friedrich <ipp2p@ipp2p.org>");
|
|
||||||
+MODULE_DESCRIPTION("An extension to iptables to identify P2P traffic.");
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for UDP eDonkey/eMule/Kad commands*/
|
|
||||||
+int
|
|
||||||
+udp_search_edk (unsigned char *haystack, int packet_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ t += 8;
|
|
||||||
+
|
|
||||||
+ switch (t[0]) {
|
|
||||||
+ case 0xe3: { /*edonkey*/
|
|
||||||
+ switch (t[1]) {
|
|
||||||
+ /* e3 9a + 16Bytes Hash | size == 26 */
|
|
||||||
+ case 0x9a: if (packet_len == 26) return ((IPP2P_EDK * 100) + 1);
|
|
||||||
+ /* e3 96 xx yy zz kk | size == 14 | server status request */
|
|
||||||
+ case 0x96: if (packet_len == 14) return ((IPP2P_EDK * 100) + 2);
|
|
||||||
+ /* e3 a2 | size == 10 or 14 <-- recheck*/
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ case 0xc5: { /*emule*/
|
|
||||||
+ switch (t[1]) {
|
|
||||||
+ /* c5 91 xx yy | size == 12 (8+4) | xx != 0x00 -- xx yy queue rating */
|
|
||||||
+ case 0x91: if ((packet_len == 12) && (t[2] != 0x00)) return ((IPP2P_EDK * 100) + 3);
|
|
||||||
+ /* c5 90 xx .. yy | size == 26 (8+2+16) | xx .. yy == hash -- file ping */
|
|
||||||
+ case 0x90: if ((packet_len == 26) && (t[2] != 0x00)) return ((IPP2P_EDK * 100) + 4);
|
|
||||||
+ /* c5 92 | size == 10 (8+2) -- file not found */
|
|
||||||
+ case 0x92: if (packet_len == 10) return ((IPP2P_EDK * 100) + 5);
|
|
||||||
+ /* c5 93 | size == 10 (8+2) -- queue full */
|
|
||||||
+ case 0x93: if (packet_len == 10) return ((IPP2P_EDK * 100) + 6);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ case 0xe4: { /*kad*/
|
|
||||||
+ switch (t[1]) {
|
|
||||||
+ /* e4 50 | size == 12 */
|
|
||||||
+ case 0x50: if (packet_len == 12) return ((IPP2P_EDK * 100) + 7);
|
|
||||||
+ /* e4 58 | size == 14 */
|
|
||||||
+ case 0x58: if ((packet_len == 14) && (t[2] != 0x00)) return ((IPP2P_EDK * 100) + 8);
|
|
||||||
+ /* e4 59 | size == 10 */
|
|
||||||
+ case 0x59: if (packet_len == 10) return ((IPP2P_EDK * 100) + 9);
|
|
||||||
+ /* e4 30 .. | t[18] == 0x01 | size > 26 | --> search */
|
|
||||||
+ case 0x30: if ((packet_len > 26) && (t[18] == 0x01)) return ((IPP2P_EDK * 100) + 10);
|
|
||||||
+ /* e4 28 .. 00 | t[68] == 0x00 | size > 76 */
|
|
||||||
+ case 0x28: if ((packet_len > 76) && (t[68] == 0x00)) return ((IPP2P_EDK * 100) + 11);
|
|
||||||
+ /* e4 20 .. | size == 43 */
|
|
||||||
+ case 0x20: if ((packet_len == 43) && (t[2] != 0x00) && (t[34] != 0x00)) return ((IPP2P_EDK * 100) + 12);
|
|
||||||
+ /* e4 00 .. 00 | size == 35 ? */
|
|
||||||
+ case 0x00: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 13);
|
|
||||||
+ /* e4 10 .. 00 | size == 35 ? */
|
|
||||||
+ case 0x10: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 14);
|
|
||||||
+ /* e4 18 .. 00 | size == 35 ? */
|
|
||||||
+ case 0x18: if ((packet_len == 35) && (t[26] == 0x00)) return ((IPP2P_EDK * 100) + 15);
|
|
||||||
+ /* e4 40 .. | t[18] == 0x01 | t[19] == 0x00 | size > 40 */
|
|
||||||
+ case 0x40: if ((packet_len > 40) && (t[18] == 0x01) && (t[19] == 0x00)) return ((IPP2P_EDK * 100) + 16);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ default: return 0;
|
|
||||||
+ } /* end of switch (t[0]) */
|
|
||||||
+}/*udp_search_edk*/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for UDP Gnutella commands*/
|
|
||||||
+int
|
|
||||||
+udp_search_gnu (unsigned char *haystack, int packet_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ t += 8;
|
|
||||||
+
|
|
||||||
+ if (memcmp(t, "GND", 3) == 0) return ((IPP2P_GNU * 100) + 1);
|
|
||||||
+ if (memcmp(t, "GNUTELLA ", 9) == 0) return ((IPP2P_GNU * 100) + 2);
|
|
||||||
+ return 0;
|
|
||||||
+}/*udp_search_gnu*/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for UDP KaZaA commands*/
|
|
||||||
+int
|
|
||||||
+udp_search_kazaa (unsigned char *haystack, int packet_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+
|
|
||||||
+ if (t[packet_len-1] == 0x00){
|
|
||||||
+ t += (packet_len - 6);
|
|
||||||
+ if (memcmp(t, "KaZaA", 5) == 0) return (IPP2P_KAZAA * 100);
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}/*udp_search_kazaa*/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for UDP BitTorrent commands*/
|
|
||||||
+int
|
|
||||||
+udp_search_bit (unsigned char *haystack, int packet_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+
|
|
||||||
+ /* packet_len has to be 24 */
|
|
||||||
+ if (packet_len != 24) return 0;
|
|
||||||
+
|
|
||||||
+ t += 8;
|
|
||||||
+
|
|
||||||
+ /* ^ 00 00 04 17 27 10 19 80 */
|
|
||||||
+ if ((ntohl(get_u32(t, 0)) == 0x00000417) && (ntohl(get_u32(t, 4)) == 0x27101980)) return (IPP2P_BIT * 100);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}/*udp_search_bit*/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for Ares commands*/
|
|
||||||
+int
|
|
||||||
+search_ares (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ t += head_len;
|
|
||||||
+
|
|
||||||
+ if ((packet_len - head_len) == 6){ /* possible connect command*/
|
|
||||||
+ if ((t[0] == 0x03) && (t[1] == 0x00) && (t[2] == 0x5a) && (t[3] == 0x04) && (t[4] == 0x03) && (t[5] == 0x05))
|
|
||||||
+ return ((IPP2P_ARES * 100) + 1); /* found connect packet: 03 00 5a 04 03 05 */
|
|
||||||
+ }
|
|
||||||
+ if ((packet_len - head_len) == 60){ /* possible download command*/
|
|
||||||
+ if ((t[59] == 0x0a) && (t[58] == 0x0a)){
|
|
||||||
+ if (memcmp(t, "PUSH SHA1:", 10) == 0) /* found download command */
|
|
||||||
+ return ((IPP2P_ARES * 100) + 2);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+} /*search_ares*/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for SoulSeek commands*/
|
|
||||||
+int
|
|
||||||
+search_soul (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ t += head_len;
|
|
||||||
+
|
|
||||||
+ if (get_u16(t, 0) == (packet_len - head_len - 4)){
|
|
||||||
+ /* xx xx 00 00 yy zz 00 00 .. | xx = sizeof(payload) - 4 */
|
|
||||||
+ if ((get_u16(t,2) == 0x0000) &&(t[4] != 0x00) && (get_u16(t,6) == 0x0000))
|
|
||||||
+ return ((IPP2P_SOUL * 100) + 1);
|
|
||||||
+ } else {
|
|
||||||
+ /* 00 00 00 00 00 00 00 00 + sizeof(payload) == 8*/
|
|
||||||
+ if (((packet_len - head_len) == 8) && (get_u32(t, 0) == 0x00000000) && (get_u32(t, 4) == 0x00000000))
|
|
||||||
+ return ((IPP2P_SOUL * 100) + 2);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* 01 xx 00 00 00 yy .. zz 00 00 00 .. | xx == sizeof(nick) | yy .. zz == nick */
|
|
||||||
+ if ((t[0] == 0x01) && (t[2] == 0x00) && (get_u16(t,3) == 0x0000) && ((packet_len - head_len) > ((get_u8(t,1))+6)) &&
|
|
||||||
+ (t[(get_u8(t,1))+4] != 0x00) && (t[(get_u8(t,1))+5] == 0x01) && (t[(get_u8(t,1))+6] == 0x00))
|
|
||||||
+ return ((IPP2P_SOUL * 100) + 3);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for WinMX commands*/
|
|
||||||
+int
|
|
||||||
+search_winmx (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ int c;
|
|
||||||
+ t += head_len;
|
|
||||||
+
|
|
||||||
+ if (((packet_len - head_len) == 4) && (memcmp(t, "SEND", 4) == 0)) return ((IPP2P_WINMX * 100) + 1);
|
|
||||||
+ if (((packet_len - head_len) == 3) && (memcmp(t, "GET", 3) == 0)) return ((IPP2P_WINMX * 100) + 2);
|
|
||||||
+ if (packet_len < (head_len + 10)) return 0;
|
|
||||||
+
|
|
||||||
+ if ((memcmp(t, "SEND", 4) == 0) || (memcmp(t, "GET", 3) == 0)){
|
|
||||||
+ c = head_len + 4;
|
|
||||||
+ t += 4;
|
|
||||||
+ while (c < packet_len - 5) {
|
|
||||||
+ if ((t[0] == 0x20) && (t[1] == 0x22)){
|
|
||||||
+ c += 2;
|
|
||||||
+ t += 2;
|
|
||||||
+ while (c < packet_len - 2) {
|
|
||||||
+ if ((t[0] == 0x22) && (t[1] == 0x20)) return ((IPP2P_WINMX * 100) + 3);
|
|
||||||
+ t++;
|
|
||||||
+ c++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ t++;
|
|
||||||
+ c++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+} /*search_winmx*/
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for appleJuice commands*/
|
|
||||||
+int
|
|
||||||
+search_apple (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ t += head_len;
|
|
||||||
+
|
|
||||||
+ if ((memcmp(t, "ajprot", 6) == 0) && (t[6] == 0x0d) && (t[7] == 0x0a)) return (IPP2P_APPLE * 100);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*Search for BitTorrent commands*/
|
|
||||||
+int
|
|
||||||
+search_bittorrent (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ if (*(haystack+head_len) != 0x13) return 0; /*Bail out of first byte != 0x13*/
|
|
||||||
+
|
|
||||||
+ t += head_len + 1;
|
|
||||||
+
|
|
||||||
+ if (memcmp(t, "BitTorrent protocol", 19) == 0) return (IPP2P_BIT * 100);
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*check for Kazaa get command*/
|
|
||||||
+int
|
|
||||||
+search_kazaa (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+
|
|
||||||
+ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0;
|
|
||||||
+
|
|
||||||
+ t += head_len;
|
|
||||||
+ if (memcmp(t, "GET /.hash=", 11) == 0)
|
|
||||||
+ return (IPP2P_DATA_KAZAA * 100);
|
|
||||||
+ else
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*check for gnutella get command*/
|
|
||||||
+int
|
|
||||||
+search_gnu (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+
|
|
||||||
+ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0;
|
|
||||||
+
|
|
||||||
+ t += head_len;
|
|
||||||
+ if (memcmp(t, "GET /get/", 9) == 0) return ((IPP2P_DATA_GNU * 100) + 1);
|
|
||||||
+ if (memcmp(t, "GET /uri-res/", 13) == 0) return ((IPP2P_DATA_GNU * 100) + 2);
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*check for gnutella get commands and other typical data*/
|
|
||||||
+int
|
|
||||||
+search_all_gnu (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ int c;
|
|
||||||
+
|
|
||||||
+ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0;
|
|
||||||
+
|
|
||||||
+ t += head_len;
|
|
||||||
+
|
|
||||||
+ if (memcmp(t, "GNUTELLA CONNECT/", 17) == 0) return ((IPP2P_GNU * 100) + 1);
|
|
||||||
+ if (memcmp(t, "GNUTELLA/", 9) == 0) return ((IPP2P_GNU * 100) + 2);
|
|
||||||
+
|
|
||||||
+ if ((memcmp(t, "GET /get/", 9) == 0) || (memcmp(t, "GET /uri-res/", 13) == 0))
|
|
||||||
+ {
|
|
||||||
+ c = head_len + 8;
|
|
||||||
+ t += 8;
|
|
||||||
+ while (c < packet_len - 22) {
|
|
||||||
+ if ((t[0] == 0x0d) && (t[1] == 0x0a)) {
|
|
||||||
+ t += 2;
|
|
||||||
+ c += 2;
|
|
||||||
+ if ((memcmp(t, "X-Gnutella-", 11) == 0) || (memcmp(t, "X-Queue:", 8) == 0)) return ((IPP2P_GNU * 100) + 3);
|
|
||||||
+ } else {
|
|
||||||
+ t++;
|
|
||||||
+ c++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*check for KaZaA download commands and other typical data*/
|
|
||||||
+int
|
|
||||||
+search_all_kazaa (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ int c;
|
|
||||||
+
|
|
||||||
+ if (!((*(haystack + packet_len - 2) == 0x0d) && (*(haystack + packet_len - 1) == 0x0a))) return 0;
|
|
||||||
+
|
|
||||||
+ t += head_len;
|
|
||||||
+ if (memcmp(t, "GIVE ", 5) == 0) return ((IPP2P_KAZAA * 100) + 1);
|
|
||||||
+
|
|
||||||
+ if (memcmp(t, "GET /", 5) == 0) {
|
|
||||||
+ c = head_len + 8;
|
|
||||||
+ t += 8;
|
|
||||||
+ while (c < packet_len - 22) {
|
|
||||||
+ if ((t[0] == 0x0d) && (t[1] == 0x0a)) {
|
|
||||||
+ t += 2;
|
|
||||||
+ c += 2;
|
|
||||||
+ if ( memcmp(t, "X-Kazaa-Username: ", 18) == 0 ) return ((IPP2P_KAZAA * 100) + 2);
|
|
||||||
+ if ( memcmp(t, "User-Agent: PeerEnabler/", 24) == 0 ) return ((IPP2P_KAZAA * 100) + 3);
|
|
||||||
+ } else {
|
|
||||||
+ t++;
|
|
||||||
+ c++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+/*fast check for edonkey file segment transfer command*/
|
|
||||||
+int
|
|
||||||
+search_edk (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ if (*(haystack+head_len) != 0xe3)
|
|
||||||
+ return 0;
|
|
||||||
+ else {
|
|
||||||
+ if (*(haystack+head_len+5) == 0x47)
|
|
||||||
+ return (IPP2P_DATA_EDK * 100);
|
|
||||||
+ else
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*intensive but slower search for some edonkey packets including size-check*/
|
|
||||||
+int
|
|
||||||
+search_all_edk (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+ int cmd;
|
|
||||||
+
|
|
||||||
+ if (*(haystack+head_len) == 0xd4) {
|
|
||||||
+ t += head_len;
|
|
||||||
+ cmd = get_u16(t, 1);
|
|
||||||
+ if (cmd == (packet_len - head_len - 5)) {
|
|
||||||
+ switch (t[5]) {
|
|
||||||
+ case 0x82: return ((IPP2P_EDK * 100) + 42);
|
|
||||||
+ case 0x15: return ((IPP2P_EDK * 100) + 43);
|
|
||||||
+ default: return 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ if (*(haystack+head_len) == 0xc5) { /*search for additional eMule packets*/
|
|
||||||
+ t += head_len;
|
|
||||||
+ cmd = get_u16(t, 1);
|
|
||||||
+
|
|
||||||
+ if (cmd == (packet_len - head_len - 5)) {
|
|
||||||
+ switch (t[5]) {
|
|
||||||
+ case 0x01: return ((IPP2P_EDK * 100) + 30);
|
|
||||||
+ case 0x02: return ((IPP2P_EDK * 100) + 31);
|
|
||||||
+ case 0x60: return ((IPP2P_EDK * 100) + 32);
|
|
||||||
+ case 0x81: return ((IPP2P_EDK * 100) + 33);
|
|
||||||
+ case 0x82: return ((IPP2P_EDK * 100) + 34);
|
|
||||||
+ case 0x85: return ((IPP2P_EDK * 100) + 35);
|
|
||||||
+ case 0x86: return ((IPP2P_EDK * 100) + 36);
|
|
||||||
+ case 0x87: return ((IPP2P_EDK * 100) + 37);
|
|
||||||
+ case 0x40: return ((IPP2P_EDK * 100) + 38);
|
|
||||||
+ case 0x92: return ((IPP2P_EDK * 100) + 39);
|
|
||||||
+ case 0x93: return ((IPP2P_EDK * 100) + 40);
|
|
||||||
+ case 0x12: return ((IPP2P_EDK * 100) + 41);
|
|
||||||
+ default: return 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ if (*(haystack+head_len) != 0xe3)
|
|
||||||
+ return 0;
|
|
||||||
+ else {
|
|
||||||
+ t += head_len;
|
|
||||||
+ cmd = get_u16(t, 1);
|
|
||||||
+ if (cmd == (packet_len - head_len - 5)) {
|
|
||||||
+ switch (t[5]) {
|
|
||||||
+ case 0x01: return ((IPP2P_EDK * 100) + 1); /*Client: hello or Server:hello*/
|
|
||||||
+ case 0x50: return ((IPP2P_EDK * 100) + 2); /*Client: file status*/
|
|
||||||
+ case 0x16: return ((IPP2P_EDK * 100) + 3); /*Client: search*/
|
|
||||||
+ case 0x58: return ((IPP2P_EDK * 100) + 4); /*Client: file request*/
|
|
||||||
+ case 0x48: return ((IPP2P_EDK * 100) + 5); /*???*/
|
|
||||||
+ case 0x54: return ((IPP2P_EDK * 100) + 6); /*???*/
|
|
||||||
+ case 0x47: return ((IPP2P_EDK * 100) + 7); /*Client: file segment request*/
|
|
||||||
+ case 0x46: return ((IPP2P_EDK * 100) + 8); /*Client: download segment*/
|
|
||||||
+ case 0x4c: return ((IPP2P_EDK * 100) + 9); /*Client: Hello-Answer*/
|
|
||||||
+ case 0x4f: return ((IPP2P_EDK * 100) + 10); /*Client: file status request*/
|
|
||||||
+ case 0x59: return ((IPP2P_EDK * 100) + 11); /*Client: file request answer*/
|
|
||||||
+ case 0x65: return ((IPP2P_EDK * 100) + 12); /*Client: ???*/
|
|
||||||
+ case 0x66: return ((IPP2P_EDK * 100) + 13); /*Client: ???*/
|
|
||||||
+ case 0x51: return ((IPP2P_EDK * 100) + 14); /*Client: ???*/
|
|
||||||
+ case 0x52: return ((IPP2P_EDK * 100) + 15); /*Client: ???*/
|
|
||||||
+ case 0x4d: return ((IPP2P_EDK * 100) + 16); /*Client: ???*/
|
|
||||||
+ case 0x5c: return ((IPP2P_EDK * 100) + 17); /*Client: ???*/
|
|
||||||
+ case 0x38: return ((IPP2P_EDK * 100) + 18); /*Client: ???*/
|
|
||||||
+ case 0x69: return ((IPP2P_EDK * 100) + 19); /*Client: ???*/
|
|
||||||
+ case 0x19: return ((IPP2P_EDK * 100) + 20); /*Client: ???*/
|
|
||||||
+ case 0x42: return ((IPP2P_EDK * 100) + 21); /*Client: ???*/
|
|
||||||
+ case 0x34: return ((IPP2P_EDK * 100) + 22); /*Client: ???*/
|
|
||||||
+ case 0x94: return ((IPP2P_EDK * 100) + 23); /*Client: ???*/
|
|
||||||
+ case 0x1c: return ((IPP2P_EDK * 100) + 24); /*Client: ???*/
|
|
||||||
+ case 0x6a: return ((IPP2P_EDK * 100) + 25); /*Client: ???*/
|
|
||||||
+ default: return 0;
|
|
||||||
+ }
|
|
||||||
+ } else {
|
|
||||||
+ if (cmd > packet_len - head_len - 5) {
|
|
||||||
+ if ((t[3] == 0x00) && (t[4] == 0x00)) {
|
|
||||||
+ if (t[5] == 0x01) return ((IPP2P_EDK * 100) + 26);
|
|
||||||
+ if (t[5] == 0x4c) return ((IPP2P_EDK * 100) + 27);
|
|
||||||
+ }
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ } /*non edk packet*/
|
|
||||||
+ if (t[cmd+5] == 0xe3) return ((IPP2P_EDK * 100) + 28);/*found another edk-command*/
|
|
||||||
+ if (t[cmd+5] == 0xc5) return ((IPP2P_EDK * 100) + 29);/*found an emule-command*/
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*fast check for Direct Connect send command*/
|
|
||||||
+int
|
|
||||||
+search_dc (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+
|
|
||||||
+ if (*(haystack+head_len) != 0x24 )
|
|
||||||
+ return 0;
|
|
||||||
+ else {
|
|
||||||
+ t += head_len + 1;
|
|
||||||
+ if (memcmp(t, "Send|", 5) == 0)
|
|
||||||
+ return (IPP2P_DATA_DC * 100);
|
|
||||||
+ else
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/*intensive but slower check for all direct connect packets*/
|
|
||||||
+int
|
|
||||||
+search_all_dc (unsigned char *haystack, int packet_len, int head_len)
|
|
||||||
+{
|
|
||||||
+ unsigned char *t = haystack;
|
|
||||||
+
|
|
||||||
+ if ((*(haystack + head_len) == 0x24) && (*(haystack + packet_len - 1) == 0x7c)) {
|
|
||||||
+ t += head_len + 1;
|
|
||||||
+ if (memcmp(t, "Lock ", 5) == 0) return ((IPP2P_DC * 100) + 1); /*hub: hello*/
|
|
||||||
+ if (memcmp(t, "Key ", 4) == 0) return ((IPP2P_DC * 100) + 2); /*client: hello*/
|
|
||||||
+ if (memcmp(t, "Hello ", 6) == 0) return ((IPP2P_DC * 100) + 3); /*hub:connected*/
|
|
||||||
+ if (memcmp(t, "MyNick ", 7) == 0) return ((IPP2P_DC * 100) + 4); /*client-client: hello*/
|
|
||||||
+ if (memcmp(t, "Search ", 7) == 0) return ((IPP2P_DC * 100) + 5); /*client: search*/
|
|
||||||
+ if (memcmp(t, "Send", 4) == 0) return ((IPP2P_DC * 100) + 6); /*client: start download*/
|
|
||||||
+ return 0;
|
|
||||||
+ } else
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static struct {
|
|
||||||
+ int command;
|
|
||||||
+ __u8 short_hand; /*for fucntions included in short hands*/
|
|
||||||
+ int packet_len;
|
|
||||||
+ int (*function_name) (unsigned char *, int, int);
|
|
||||||
+} matchlist[] = {
|
|
||||||
+ {IPP2P_EDK,SHORT_HAND_IPP2P,40, &search_all_edk},
|
|
||||||
+ {IPP2P_DATA_KAZAA,SHORT_HAND_DATA,200, &search_kazaa},
|
|
||||||
+ {IPP2P_DATA_EDK,SHORT_HAND_DATA,60, &search_edk},
|
|
||||||
+ {IPP2P_DATA_DC,SHORT_HAND_DATA,26, &search_dc},
|
|
||||||
+ {IPP2P_DC,SHORT_HAND_IPP2P,25, search_all_dc},
|
|
||||||
+ {IPP2P_DATA_GNU,SHORT_HAND_DATA,40, &search_gnu},
|
|
||||||
+ {IPP2P_GNU,SHORT_HAND_IPP2P,35, &search_all_gnu},
|
|
||||||
+ {IPP2P_KAZAA,SHORT_HAND_IPP2P,35, &search_all_kazaa},
|
|
||||||
+ {IPP2P_BIT,SHORT_HAND_NONE,40, &search_bittorrent},
|
|
||||||
+ {IPP2P_APPLE,SHORT_HAND_NONE,20, &search_apple},
|
|
||||||
+ {IPP2P_SOUL,SHORT_HAND_NONE,25, &search_soul},
|
|
||||||
+ {IPP2P_WINMX,SHORT_HAND_NONE,20, &search_winmx},
|
|
||||||
+ {IPP2P_ARES,SHORT_HAND_NONE,25, &search_ares},
|
|
||||||
+ {0,0,0,NULL}
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static struct {
|
|
||||||
+ int command;
|
|
||||||
+ __u8 short_hand; /*for fucntions included in short hands*/
|
|
||||||
+ int packet_len;
|
|
||||||
+ int (*function_name) (unsigned char *, int);
|
|
||||||
+} udp_list[] = {
|
|
||||||
+ {IPP2P_KAZAA,SHORT_HAND_IPP2P,14, &udp_search_kazaa},
|
|
||||||
+ {IPP2P_BIT,SHORT_HAND_NONE,23, &udp_search_bit},
|
|
||||||
+ {IPP2P_GNU,SHORT_HAND_IPP2P,11, &udp_search_gnu},
|
|
||||||
+ {IPP2P_EDK,SHORT_HAND_IPP2P,9, &udp_search_edk},
|
|
||||||
+ {0,0,0,NULL}
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+match(const struct sk_buff *skb,
|
|
||||||
+ const struct net_device *in,
|
|
||||||
+ const struct net_device *out,
|
|
||||||
+ const void *matchinfo,
|
|
||||||
+ int offset,
|
|
||||||
+
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
|
|
||||||
+ const void *hdr,
|
|
||||||
+ u_int16_t datalen,
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+ int *hotdrop)
|
|
||||||
+{
|
|
||||||
+ const struct ipt_p2p_info *info = matchinfo;
|
|
||||||
+ unsigned char *haystack;
|
|
||||||
+ struct iphdr *ip = skb->nh.iph;
|
|
||||||
+ int p2p_result = 0, i = 0;
|
|
||||||
+ int head_len;
|
|
||||||
+ int hlen = ntohs(ip->tot_len)-(ip->ihl*4); /*hlen = packet-data length*/
|
|
||||||
+
|
|
||||||
+ /*must not be a fragment*/
|
|
||||||
+ if (offset) {
|
|
||||||
+ if (info->debug) printk("IPP2P.match: offset found %i \n",offset);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /*make sure that skb is linear*/
|
|
||||||
+ if(skb_is_nonlinear(skb)){
|
|
||||||
+ if (info->debug) printk("IPP2P.match: nonlinear skb found\n");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+ haystack=(char *)ip+(ip->ihl*4); /*haystack = packet data*/
|
|
||||||
+
|
|
||||||
+ switch (ip->protocol){
|
|
||||||
+ case IPPROTO_TCP: /*what to do with a TCP packet*/
|
|
||||||
+ {
|
|
||||||
+ struct tcphdr *tcph = (void *) ip + ip->ihl * 4;
|
|
||||||
+
|
|
||||||
+ if (tcph->fin) return 0; /*if FIN bit is set bail out*/
|
|
||||||
+ if (tcph->syn) return 0; /*if SYN bit is set bail out*/
|
|
||||||
+ if (tcph->rst) return 0; /*if RST bit is set bail out*/
|
|
||||||
+ head_len = tcph->doff * 4; /*get TCP-Header-Size*/
|
|
||||||
+ while (matchlist[i].command) {
|
|
||||||
+ if ((((info->cmd & matchlist[i].command) == matchlist[i].command) ||
|
|
||||||
+ ((info->cmd & matchlist[i].short_hand) == matchlist[i].short_hand)) &&
|
|
||||||
+ (hlen > matchlist[i].packet_len)) {
|
|
||||||
+ p2p_result = matchlist[i].function_name(haystack, hlen, head_len);
|
|
||||||
+ if (p2p_result)
|
|
||||||
+ {
|
|
||||||
+ if (info->debug) printk("IPP2P.debug:TCP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n",
|
|
||||||
+ p2p_result, NIPQUAD(ip->saddr),ntohs(tcph->source), NIPQUAD(ip->daddr),ntohs(tcph->dest),hlen);
|
|
||||||
+ return p2p_result;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+ return p2p_result;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ case IPPROTO_UDP: /*what to do with an UDP packet*/
|
|
||||||
+ {
|
|
||||||
+ struct udphdr *udph = (void *) ip + ip->ihl * 4;
|
|
||||||
+
|
|
||||||
+ while (udp_list[i].command){
|
|
||||||
+ if ((((info->cmd & udp_list[i].command) == udp_list[i].command) ||
|
|
||||||
+ ((info->cmd & udp_list[i].short_hand) == udp_list[i].short_hand)) &&
|
|
||||||
+ (hlen > udp_list[i].packet_len)) {
|
|
||||||
+ p2p_result = udp_list[i].function_name(haystack, hlen);
|
|
||||||
+ if (p2p_result){
|
|
||||||
+ if (info->debug) printk("IPP2P.debug:UDP-match: %i from: %u.%u.%u.%u:%i to: %u.%u.%u.%u:%i Length: %i\n",
|
|
||||||
+ p2p_result, NIPQUAD(ip->saddr),ntohs(udph->source), NIPQUAD(ip->daddr),ntohs(udph->dest),hlen);
|
|
||||||
+ return p2p_result;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+ return p2p_result;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ default: return 0;
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+checkentry(const char *tablename,
|
|
||||||
+ const struct ipt_ip *ip,
|
|
||||||
+ void *matchinfo,
|
|
||||||
+ unsigned int matchsize,
|
|
||||||
+ unsigned int hook_mask)
|
|
||||||
+{
|
|
||||||
+ /* Must specify -p tcp */
|
|
||||||
+/* if (ip->proto != IPPROTO_TCP || (ip->invflags & IPT_INV_PROTO)) {
|
|
||||||
+ * printk("ipp2p: Only works on TCP packets, use -p tcp\n");
|
|
||||||
+ * return 0;
|
|
||||||
+ * }*/
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static struct ipt_match ipp2p_match = {
|
|
||||||
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
|
|
||||||
+ { NULL, NULL },
|
|
||||||
+ "ipp2p",
|
|
||||||
+ &match,
|
|
||||||
+ &checkentry,
|
|
||||||
+ NULL,
|
|
||||||
+ THIS_MODULE
|
|
||||||
+#endif
|
|
||||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
|
|
||||||
+ .name = "ipp2p",
|
|
||||||
+ .match = &match,
|
|
||||||
+ .checkentry = &checkentry,
|
|
||||||
+ .me = THIS_MODULE,
|
|
||||||
+#endif
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+static int __init init(void)
|
|
||||||
+{
|
|
||||||
+ printk(KERN_INFO "IPP2P v%s loading\n", IPP2P_VERSION);
|
|
||||||
+ return ipt_register_match(&ipp2p_match);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void __exit fini(void)
|
|
||||||
+{
|
|
||||||
+ ipt_unregister_match(&ipp2p_match);
|
|
||||||
+ printk(KERN_INFO "IPP2P v%s unloaded\n", IPP2P_VERSION);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+module_init(init);
|
|
||||||
+module_exit(fini);
|
|
||||||
+
|
|
||||||
+
|
|
||||||
diff -urN linux-2.4.29.old/net/ipv4/netfilter/Makefile linux-2.4.29/net/ipv4/netfilter/Makefile
|
|
||||||
--- linux-2.4.29.old/net/ipv4/netfilter/Makefile 2005-03-12 00:40:38.000000000 +0100
|
|
||||||
+++ linux-2.4.29/net/ipv4/netfilter/Makefile 2005-03-12 00:42:57.000000000 +0100
|
|
||||||
@@ -67,6 +67,7 @@
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_MARK) += ipt_mark.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_MAC) += ipt_mac.o
|
|
||||||
+obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_PKTTYPE) += ipt_pkttype.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,20 +0,0 @@
|
|||||||
--- ../../buildroot-unpacked/build_mipsel/linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-28 22:59:36.000000000 -0500
|
|
||||||
+++ linux/net/ipv4/netfilter/ip_conntrack_core.c 2004-11-30 05:05:32.000000000 -0500
|
|
||||||
@@ -1386,7 +1386,7 @@
|
|
||||||
nf_unregister_sockopt(&so_getorigdst);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int hashsize = 0;
|
|
||||||
+static int hashsize = 5953;
|
|
||||||
MODULE_PARM(hashsize, "i");
|
|
||||||
|
|
||||||
int __init ip_conntrack_init(void)
|
|
||||||
@@ -1407,7 +1407,7 @@
|
|
||||||
if (ip_conntrack_htable_size < 16)
|
|
||||||
ip_conntrack_htable_size = 16;
|
|
||||||
}
|
|
||||||
- ip_conntrack_max = 8 * ip_conntrack_htable_size;
|
|
||||||
+ ip_conntrack_max = ip_conntrack_htable_size;
|
|
||||||
|
|
||||||
printk("ip_conntrack version %s (%u buckets, %d max)"
|
|
||||||
" - %Zd bytes per conntrack\n", IP_CONNTRACK_VERSION,
|
|
||||||
@ -1,180 +0,0 @@
|
|||||||
diff -urN linux-2.4.30.old/Documentation/Configure.help linux-2.4.30.dev/Documentation/Configure.help
|
|
||||||
--- linux-2.4.30.old/Documentation/Configure.help 2005-04-27 11:35:46.000000000 +0200
|
|
||||||
+++ linux-2.4.30.dev/Documentation/Configure.help 2005-04-27 11:43:49.000000000 +0200
|
|
||||||
@@ -3209,6 +3209,15 @@
|
|
||||||
If you want to compile it as a module, say M here and read
|
|
||||||
<file:Documentation/modules.txt>. If unsure, say `N'.
|
|
||||||
|
|
||||||
+TTL target support
|
|
||||||
+CONFIG_IP_NF_TARGET_TTL
|
|
||||||
+ This option adds a `TTL' target, which enables the user to set
|
|
||||||
+ the TTL value or increment / decrement the TTL value by a given
|
|
||||||
+ amount.
|
|
||||||
+
|
|
||||||
+ If you want to compile it as a module, say M here and read
|
|
||||||
+ Documentation/modules.txt. If unsure, say `N'.
|
|
||||||
+
|
|
||||||
ipchains (2.2-style) support
|
|
||||||
CONFIG_IP_NF_COMPAT_IPCHAINS
|
|
||||||
This option places ipchains (with masquerading and redirection
|
|
||||||
diff -urN linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h linux-2.4.30.dev/include/linux/netfilter_ipv4/ipt_TTL.h
|
|
||||||
--- linux-2.4.30.old/include/linux/netfilter_ipv4/ipt_TTL.h 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux-2.4.30.dev/include/linux/netfilter_ipv4/ipt_TTL.h 2005-04-27 11:43:49.000000000 +0200
|
|
||||||
@@ -0,0 +1,21 @@
|
|
||||||
+/* TTL modification module for IP tables
|
|
||||||
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org> */
|
|
||||||
+
|
|
||||||
+#ifndef _IPT_TTL_H
|
|
||||||
+#define _IPT_TTL_H
|
|
||||||
+
|
|
||||||
+enum {
|
|
||||||
+ IPT_TTL_SET = 0,
|
|
||||||
+ IPT_TTL_INC,
|
|
||||||
+ IPT_TTL_DEC
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#define IPT_TTL_MAXMODE IPT_TTL_DEC
|
|
||||||
+
|
|
||||||
+struct ipt_TTL_info {
|
|
||||||
+ u_int8_t mode;
|
|
||||||
+ u_int8_t ttl;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+#endif
|
|
||||||
diff -urN linux-2.4.30.old/net/ipv4/netfilter/Config.in linux-2.4.30.dev/net/ipv4/netfilter/Config.in
|
|
||||||
--- linux-2.4.30.old/net/ipv4/netfilter/Config.in 2005-04-27 11:35:45.000000000 +0200
|
|
||||||
+++ linux-2.4.30.dev/net/ipv4/netfilter/Config.in 2005-04-27 11:43:49.000000000 +0200
|
|
||||||
@@ -129,6 +129,7 @@
|
|
||||||
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
|
|
||||||
fi
|
|
||||||
dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
|
|
||||||
+ dep_tristate ' TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' TCPMSS target support' CONFIG_IP_NF_TARGET_TCPMSS $CONFIG_IP_NF_IPTABLES
|
|
||||||
fi
|
|
||||||
diff -urN linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c linux-2.4.30.dev/net/ipv4/netfilter/ipt_TTL.c
|
|
||||||
--- linux-2.4.30.old/net/ipv4/netfilter/ipt_TTL.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux-2.4.30.dev/net/ipv4/netfilter/ipt_TTL.c 2005-04-27 11:43:49.000000000 +0200
|
|
||||||
@@ -0,0 +1,110 @@
|
|
||||||
+/* TTL modification target for IP tables
|
|
||||||
+ * (C) 2000 by Harald Welte <laforge@gnumonks.org>
|
|
||||||
+ *
|
|
||||||
+ * Version: $Revision: 1.1 $
|
|
||||||
+ *
|
|
||||||
+ * This software is distributed under the terms of GNU GPL
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/skbuff.h>
|
|
||||||
+#include <linux/ip.h>
|
|
||||||
+#include <net/checksum.h>
|
|
||||||
+
|
|
||||||
+#include <linux/netfilter_ipv4/ip_tables.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ipt_TTL.h>
|
|
||||||
+
|
|
||||||
+MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
|
|
||||||
+MODULE_DESCRIPTION("IP tables TTL modification module");
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+
|
|
||||||
+static unsigned int ipt_ttl_target(struct sk_buff **pskb, unsigned int hooknum,
|
|
||||||
+ const struct net_device *in, const struct net_device *out,
|
|
||||||
+ const void *targinfo, void *userinfo)
|
|
||||||
+{
|
|
||||||
+ struct iphdr *iph = (*pskb)->nh.iph;
|
|
||||||
+ const struct ipt_TTL_info *info = targinfo;
|
|
||||||
+ u_int16_t diffs[2];
|
|
||||||
+ int new_ttl;
|
|
||||||
+
|
|
||||||
+ switch (info->mode) {
|
|
||||||
+ case IPT_TTL_SET:
|
|
||||||
+ new_ttl = info->ttl;
|
|
||||||
+ break;
|
|
||||||
+ case IPT_TTL_INC:
|
|
||||||
+ new_ttl = iph->ttl + info->ttl;
|
|
||||||
+ if (new_ttl > 255)
|
|
||||||
+ new_ttl = 255;
|
|
||||||
+ break;
|
|
||||||
+ case IPT_TTL_DEC:
|
|
||||||
+ new_ttl = iph->ttl - info->ttl;
|
|
||||||
+ if (new_ttl < 0)
|
|
||||||
+ new_ttl = 0;
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ new_ttl = iph->ttl;
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (new_ttl != iph->ttl) {
|
|
||||||
+ diffs[0] = htons(((unsigned)iph->ttl) << 8) ^ 0xFFFF;
|
|
||||||
+ iph->ttl = new_ttl;
|
|
||||||
+ diffs[1] = htons(((unsigned)iph->ttl) << 8);
|
|
||||||
+ iph->check = csum_fold(csum_partial((char *)diffs,
|
|
||||||
+ sizeof(diffs),
|
|
||||||
+ iph->check^0xFFFF));
|
|
||||||
+ (*pskb)->nfcache |= NFC_ALTERED;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return IPT_CONTINUE;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int ipt_ttl_checkentry(const char *tablename,
|
|
||||||
+ const struct ipt_entry *e,
|
|
||||||
+ void *targinfo,
|
|
||||||
+ unsigned int targinfosize,
|
|
||||||
+ unsigned int hook_mask)
|
|
||||||
+{
|
|
||||||
+ struct ipt_TTL_info *info = targinfo;
|
|
||||||
+
|
|
||||||
+ if (targinfosize != IPT_ALIGN(sizeof(struct ipt_TTL_info))) {
|
|
||||||
+ printk(KERN_WARNING "TTL: targinfosize %u != %Zu\n",
|
|
||||||
+ targinfosize,
|
|
||||||
+ IPT_ALIGN(sizeof(struct ipt_TTL_info)));
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (strcmp(tablename, "mangle")) {
|
|
||||||
+ printk(KERN_WARNING "TTL: can only be called from \"mangle\" table, not \"%s\"\n", tablename);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (info->mode > IPT_TTL_MAXMODE) {
|
|
||||||
+ printk(KERN_WARNING "TTL: invalid or unknown Mode %u\n",
|
|
||||||
+ info->mode);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if ((info->mode != IPT_TTL_SET) && (info->ttl == 0)) {
|
|
||||||
+ printk(KERN_WARNING "TTL: increment/decrement doesn't make sense with value 0\n");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct ipt_target ipt_TTL = { { NULL, NULL }, "TTL",
|
|
||||||
+ ipt_ttl_target, ipt_ttl_checkentry, NULL, THIS_MODULE };
|
|
||||||
+
|
|
||||||
+static int __init init(void)
|
|
||||||
+{
|
|
||||||
+ return ipt_register_target(&ipt_TTL);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void __exit fini(void)
|
|
||||||
+{
|
|
||||||
+ ipt_unregister_target(&ipt_TTL);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+module_init(init);
|
|
||||||
+module_exit(fini);
|
|
||||||
diff -urN linux-2.4.30.old/net/ipv4/netfilter/Makefile linux-2.4.30.dev/net/ipv4/netfilter/Makefile
|
|
||||||
--- linux-2.4.30.old/net/ipv4/netfilter/Makefile 2005-04-27 11:35:45.000000000 +0200
|
|
||||||
+++ linux-2.4.30.dev/net/ipv4/netfilter/Makefile 2005-04-27 11:43:49.000000000 +0200
|
|
||||||
@@ -112,6 +112,7 @@
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
|
|
||||||
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
|
|
||||||
+obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
|
|
||||||
|
|
||||||
@ -1,159 +0,0 @@
|
|||||||
diff -urN linux-2.4.30.orig/Documentation/Configure.help linux-2.4.30/Documentation/Configure.help
|
|
||||||
--- linux-2.4.30.orig/Documentation/Configure.help 2005-07-01 02:06:36.000000000 +0200
|
|
||||||
+++ linux-2.4.30/Documentation/Configure.help 2005-07-01 00:41:09.000000000 +0200
|
|
||||||
@@ -3086,6 +3086,17 @@
|
|
||||||
If you want to compile it as a module, say M here and read
|
|
||||||
<file:Documentation/modules.txt>. If unsure, say `N'.
|
|
||||||
|
|
||||||
+NETMAP target support
|
|
||||||
+CONFIG_IP_NF_TARGET_NETMAP
|
|
||||||
+ NETMAP is an implementation of static 1:1 NAT mapping of network
|
|
||||||
+ addresses. It maps the network address part, while keeping the
|
|
||||||
+ host address part intact. It is similar to Fast NAT, except that
|
|
||||||
+ Netfilter's connection tracking doesn't work well with Fast NAT.
|
|
||||||
+
|
|
||||||
+ If you want to compile it as a module, say M here and read
|
|
||||||
+ Documentation/modules.txt. The module will be called
|
|
||||||
+ ipt_NETMAP.o. If unsure, say `N'.
|
|
||||||
+
|
|
||||||
Packet mangling
|
|
||||||
CONFIG_IP_NF_MANGLE
|
|
||||||
This option adds a `mangle' table to iptables: see the man page for
|
|
||||||
diff -urN linux-2.4.30.orig/net/ipv4/netfilter/Config.in linux-2.4.30/net/ipv4/netfilter/Config.in
|
|
||||||
--- linux-2.4.30.orig/net/ipv4/netfilter/Config.in 2005-07-01 02:06:35.000000000 +0200
|
|
||||||
+++ linux-2.4.30/net/ipv4/netfilter/Config.in 2005-07-01 00:41:09.000000000 +0200
|
|
||||||
@@ -69,6 +69,7 @@
|
|
||||||
define_bool CONFIG_IP_NF_NAT_NEEDED y
|
|
||||||
dep_tristate ' MASQUERADE target support' CONFIG_IP_NF_TARGET_MASQUERADE $CONFIG_IP_NF_NAT
|
|
||||||
dep_tristate ' REDIRECT target support' CONFIG_IP_NF_TARGET_REDIRECT $CONFIG_IP_NF_NAT
|
|
||||||
+ dep_tristate ' NETMAP target support' CONFIG_IP_NF_TARGET_NETMAP $CONFIG_IP_NF_NAT
|
|
||||||
if [ "$CONFIG_IP_NF_PPTP" = "m" ]; then
|
|
||||||
define_tristate CONFIG_IP_NF_NAT_PPTP m
|
|
||||||
else
|
|
||||||
diff -urN linux-2.4.30.orig/net/ipv4/netfilter/ipt_NETMAP.c linux-2.4.30/net/ipv4/netfilter/ipt_NETMAP.c
|
|
||||||
--- linux-2.4.30.orig/net/ipv4/netfilter/ipt_NETMAP.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux-2.4.30/net/ipv4/netfilter/ipt_NETMAP.c 2005-07-01 00:41:09.000000000 +0200
|
|
||||||
@@ -0,0 +1,112 @@
|
|
||||||
+/* NETMAP - static NAT mapping of IP network addresses (1:1).
|
|
||||||
+ The mapping can be applied to source (POSTROUTING),
|
|
||||||
+ destination (PREROUTING), or both (with separate rules).
|
|
||||||
+
|
|
||||||
+ Author: Svenning Soerensen <svenning@post5.tele.dk>
|
|
||||||
+*/
|
|
||||||
+
|
|
||||||
+#include <linux/config.h>
|
|
||||||
+#include <linux/ip.h>
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/netdevice.h>
|
|
||||||
+#include <linux/netfilter.h>
|
|
||||||
+#include <linux/netfilter_ipv4.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ip_nat_rule.h>
|
|
||||||
+
|
|
||||||
+#define MODULENAME "NETMAP"
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+MODULE_AUTHOR("Svenning Soerensen <svenning@post5.tele.dk>");
|
|
||||||
+MODULE_DESCRIPTION("iptables 1:1 NAT mapping of IP networks target");
|
|
||||||
+
|
|
||||||
+#if 0
|
|
||||||
+#define DEBUGP printk
|
|
||||||
+#else
|
|
||||||
+#define DEBUGP(format, args...)
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+check(const char *tablename,
|
|
||||||
+ const struct ipt_entry *e,
|
|
||||||
+ void *targinfo,
|
|
||||||
+ unsigned int targinfosize,
|
|
||||||
+ unsigned int hook_mask)
|
|
||||||
+{
|
|
||||||
+ const struct ip_nat_multi_range *mr = targinfo;
|
|
||||||
+
|
|
||||||
+ if (strcmp(tablename, "nat") != 0) {
|
|
||||||
+ DEBUGP(MODULENAME":check: bad table `%s'.\n", tablename);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ if (targinfosize != IPT_ALIGN(sizeof(*mr))) {
|
|
||||||
+ DEBUGP(MODULENAME":check: size %u.\n", targinfosize);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ if (hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_POST_ROUTING))) {
|
|
||||||
+ DEBUGP(MODULENAME":check: bad hooks %x.\n", hook_mask);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ if (!(mr->range[0].flags & IP_NAT_RANGE_MAP_IPS)) {
|
|
||||||
+ DEBUGP(MODULENAME":check: bad MAP_IPS.\n");
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ if (mr->rangesize != 1) {
|
|
||||||
+ DEBUGP(MODULENAME":check: bad rangesize %u.\n", mr->rangesize);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static unsigned int
|
|
||||||
+target(struct sk_buff **pskb,
|
|
||||||
+ unsigned int hooknum,
|
|
||||||
+ const struct net_device *in,
|
|
||||||
+ const struct net_device *out,
|
|
||||||
+ const void *targinfo,
|
|
||||||
+ void *userinfo)
|
|
||||||
+{
|
|
||||||
+ struct ip_conntrack *ct;
|
|
||||||
+ enum ip_conntrack_info ctinfo;
|
|
||||||
+ u_int32_t new_ip, netmask;
|
|
||||||
+ const struct ip_nat_multi_range *mr = targinfo;
|
|
||||||
+ struct ip_nat_multi_range newrange;
|
|
||||||
+
|
|
||||||
+ IP_NF_ASSERT(hooknum == NF_IP_PRE_ROUTING
|
|
||||||
+ || hooknum == NF_IP_POST_ROUTING);
|
|
||||||
+ ct = ip_conntrack_get(*pskb, &ctinfo);
|
|
||||||
+
|
|
||||||
+ netmask = ~(mr->range[0].min_ip ^ mr->range[0].max_ip);
|
|
||||||
+
|
|
||||||
+ if (hooknum == NF_IP_PRE_ROUTING)
|
|
||||||
+ new_ip = (*pskb)->nh.iph->daddr & ~netmask;
|
|
||||||
+ else
|
|
||||||
+ new_ip = (*pskb)->nh.iph->saddr & ~netmask;
|
|
||||||
+ new_ip |= mr->range[0].min_ip & netmask;
|
|
||||||
+
|
|
||||||
+ newrange = ((struct ip_nat_multi_range)
|
|
||||||
+ { 1, { { mr->range[0].flags | IP_NAT_RANGE_MAP_IPS,
|
|
||||||
+ new_ip, new_ip,
|
|
||||||
+ mr->range[0].min, mr->range[0].max } } });
|
|
||||||
+
|
|
||||||
+ /* Hand modified range to generic setup. */
|
|
||||||
+ return ip_nat_setup_info(ct, &newrange, hooknum);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct ipt_target target_module = {
|
|
||||||
+ .name = MODULENAME,
|
|
||||||
+ .target = target,
|
|
||||||
+ .checkentry = check,
|
|
||||||
+ .me = THIS_MODULE
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int __init init(void)
|
|
||||||
+{
|
|
||||||
+ return ipt_register_target(&target_module);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void __exit fini(void)
|
|
||||||
+{
|
|
||||||
+ ipt_unregister_target(&target_module);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+module_init(init);
|
|
||||||
+module_exit(fini);
|
|
||||||
diff -urN linux-2.4.30.orig/net/ipv4/netfilter/Makefile linux-2.4.30/net/ipv4/netfilter/Makefile
|
|
||||||
--- linux-2.4.30.orig/net/ipv4/netfilter/Makefile 2005-07-01 02:06:35.000000000 +0200
|
|
||||||
+++ linux-2.4.30/net/ipv4/netfilter/Makefile 2005-07-01 00:41:09.000000000 +0200
|
|
||||||
@@ -110,6 +110,7 @@
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
|
|
||||||
+obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
|
|
||||||
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
|
||||||
@ -1,351 +0,0 @@
|
|||||||
diff -urN linux.old/include/linux/netfilter_ipv4/ip_conntrack.h linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h
|
|
||||||
--- linux.old/include/linux/netfilter_ipv4/ip_conntrack.h 2005-08-20 20:02:06.619827000 +0200
|
|
||||||
+++ linux.dev/include/linux/netfilter_ipv4/ip_conntrack.h 2005-08-20 20:19:23.302029232 +0200
|
|
||||||
@@ -226,6 +226,9 @@
|
|
||||||
unsigned int app_data_len;
|
|
||||||
} layer7;
|
|
||||||
#endif
|
|
||||||
+#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
|
|
||||||
+ unsigned long mark;
|
|
||||||
+#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
/* get master conntrack via master expectation */
|
|
||||||
diff -urN linux.old/include/linux/netfilter_ipv4/ipt_CONNMARK.h linux.dev/include/linux/netfilter_ipv4/ipt_CONNMARK.h
|
|
||||||
--- linux.old/include/linux/netfilter_ipv4/ipt_CONNMARK.h 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/include/linux/netfilter_ipv4/ipt_CONNMARK.h 2005-08-20 20:19:41.058329864 +0200
|
|
||||||
@@ -0,0 +1,25 @@
|
|
||||||
+#ifndef _IPT_CONNMARK_H_target
|
|
||||||
+#define _IPT_CONNMARK_H_target
|
|
||||||
+
|
|
||||||
+/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
|
|
||||||
+ * by Henrik Nordstrom <hno@marasystems.com>
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License as published by
|
|
||||||
+ * the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ * (at your option) any later version.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+enum {
|
|
||||||
+ IPT_CONNMARK_SET = 0,
|
|
||||||
+ IPT_CONNMARK_SAVE,
|
|
||||||
+ IPT_CONNMARK_RESTORE
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+struct ipt_connmark_target_info {
|
|
||||||
+ unsigned long mark;
|
|
||||||
+ unsigned long mask;
|
|
||||||
+ u_int8_t mode;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#endif /*_IPT_CONNMARK_H_target*/
|
|
||||||
diff -urN linux.old/include/linux/netfilter_ipv4/ipt_connmark.h linux.dev/include/linux/netfilter_ipv4/ipt_connmark.h
|
|
||||||
--- linux.old/include/linux/netfilter_ipv4/ipt_connmark.h 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/include/linux/netfilter_ipv4/ipt_connmark.h 2005-08-20 20:19:41.058329864 +0200
|
|
||||||
@@ -0,0 +1,18 @@
|
|
||||||
+#ifndef _IPT_CONNMARK_H
|
|
||||||
+#define _IPT_CONNMARK_H
|
|
||||||
+
|
|
||||||
+/* Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
|
|
||||||
+ * by Henrik Nordstrom <hno@marasystems.com>
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License as published by
|
|
||||||
+ * the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ * (at your option) any later version.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+struct ipt_connmark_info {
|
|
||||||
+ unsigned long mark, mask;
|
|
||||||
+ u_int8_t invert;
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+#endif /*_IPT_CONNMARK_H*/
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/Config.in linux.dev/net/ipv4/netfilter/Config.in
|
|
||||||
--- linux.old/net/ipv4/netfilter/Config.in 2005-08-20 20:02:09.325416000 +0200
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/Config.in 2005-08-20 20:29:11.546602464 +0200
|
|
||||||
@@ -6,7 +6,8 @@
|
|
||||||
|
|
||||||
tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP_NF_CONNTRACK
|
|
||||||
if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
|
|
||||||
- dep_tristate ' FTP protocol support' CONFIG_IP_NF_FTP $CONFIG_IP_NF_CONNTRACK
|
|
||||||
+ bool ' Connection mark tracking support' CONFIG_IP_NF_CONNTRACK_MARK
|
|
||||||
+ dep_tristate ' FTP protocol support' CONFIG_IP_NF_FTP $CONFIG_IP_NF_CONNTRACKa
|
|
||||||
dep_tristate ' Amanda protocol support' CONFIG_IP_NF_AMANDA $CONFIG_IP_NF_CONNTRACK
|
|
||||||
dep_tristate ' TFTP protocol support' CONFIG_IP_NF_TFTP $CONFIG_IP_NF_CONNTRACK
|
|
||||||
dep_tristate ' IRC protocol support' CONFIG_IP_NF_IRC $CONFIG_IP_NF_CONNTRACK
|
|
||||||
@@ -42,6 +43,9 @@
|
|
||||||
if [ "$CONFIG_IP_NF_CONNTRACK" != "n" ]; then
|
|
||||||
dep_tristate ' Connection state match support' CONFIG_IP_NF_MATCH_STATE $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' Connection tracking match support' CONFIG_IP_NF_MATCH_CONNTRACK $CONFIG_IP_NF_CONNTRACK $CONFIG_IP_NF_IPTABLES
|
|
||||||
+ if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
|
|
||||||
+ dep_tristate ' Connection mark match support' CONFIG_IP_NF_MATCH_CONNMARK $CONFIG_IP_NF_IPTABLES
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
|
|
||||||
dep_tristate ' Unclean match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_UNCLEAN $CONFIG_IP_NF_IPTABLES
|
|
||||||
@@ -125,6 +129,9 @@
|
|
||||||
|
|
||||||
dep_tristate ' MARK target support' CONFIG_IP_NF_TARGET_MARK $CONFIG_IP_NF_MANGLE
|
|
||||||
fi
|
|
||||||
+ if [ "$CONFIG_IP_NF_CONNTRACK_MARK" != "n" ]; then
|
|
||||||
+ dep_tristate ' CONNMARK target support' CONFIG_IP_NF_TARGET_CONNMARK $CONFIG_IP_NF_IPTABLES
|
|
||||||
+ fi
|
|
||||||
dep_tristate ' LOG target support' CONFIG_IP_NF_TARGET_LOG $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' TTL target support' CONFIG_IP_NF_TARGET_TTL $CONFIG_IP_NF_IPTABLES
|
|
||||||
dep_tristate ' ULOG target support' CONFIG_IP_NF_TARGET_ULOG $CONFIG_IP_NF_IPTABLES
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/Makefile linux.dev/net/ipv4/netfilter/Makefile
|
|
||||||
--- linux.old/net/ipv4/netfilter/Makefile 2005-08-20 20:02:09.326416000 +0200
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/Makefile 2005-08-20 20:29:54.081136232 +0200
|
|
||||||
@@ -93,6 +93,7 @@
|
|
||||||
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_STATE) += ipt_state.o
|
|
||||||
+obj-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_CONNTRACK) += ipt_conntrack.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_UNCLEAN) += ipt_unclean.o
|
|
||||||
obj-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss.o
|
|
||||||
@@ -110,6 +111,7 @@
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
|
|
||||||
obj-$(CONFIG_IP_NF_NAT_SNMP_BASIC) += ip_nat_snmp_basic.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
|
|
||||||
+obj-$(CONFIG_IP_NF_TARGET_CONNMARK) += ipt_CONNMARK.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
|
|
||||||
obj-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS.o
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_core.c linux.dev/net/ipv4/netfilter/ip_conntrack_core.c
|
|
||||||
--- linux.old/net/ipv4/netfilter/ip_conntrack_core.c 2005-08-20 20:02:06.828795000 +0200
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/ip_conntrack_core.c 2005-08-20 20:33:23.308328864 +0200
|
|
||||||
@@ -755,6 +755,9 @@
|
|
||||||
__set_bit(IPS_EXPECTED_BIT, &conntrack->status);
|
|
||||||
conntrack->master = expected;
|
|
||||||
expected->sibling = conntrack;
|
|
||||||
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
|
|
||||||
+ conntrack->mark = expected->expectant->mark;
|
|
||||||
+#endif
|
|
||||||
LIST_DELETE(&ip_conntrack_expect_list, expected);
|
|
||||||
expected->expectant->expecting--;
|
|
||||||
nf_conntrack_get(&master_ct(conntrack)->infos[0]);
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c
|
|
||||||
--- linux.old/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-08-20 20:02:06.583833000 +0200
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-08-20 20:32:15.364657872 +0200
|
|
||||||
@@ -107,6 +107,9 @@
|
|
||||||
len += sprintf(buffer + len, "[ASSURED] ");
|
|
||||||
len += sprintf(buffer + len, "use=%u ",
|
|
||||||
atomic_read(&conntrack->ct_general.use));
|
|
||||||
+ #if defined(CONFIG_IP_NF_CONNTRACK_MARK)
|
|
||||||
+ len += sprintf(buffer + len, "mark=%ld ", conntrack->mark);
|
|
||||||
+ #endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_IP_NF_MATCH_LAYER7) || defined(CONFIG_IP_NF_MATCH_LAYER7_MODULE)
|
|
||||||
if(conntrack->layer7.app_proto)
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ipt_CONNMARK.c linux.dev/net/ipv4/netfilter/ipt_CONNMARK.c
|
|
||||||
--- linux.old/net/ipv4/netfilter/ipt_CONNMARK.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/ipt_CONNMARK.c 2005-08-20 20:21:28.666970864 +0200
|
|
||||||
@@ -0,0 +1,118 @@
|
|
||||||
+/* This kernel module is used to modify the connection mark values, or
|
|
||||||
+ * to optionally restore the skb nfmark from the connection mark
|
|
||||||
+ *
|
|
||||||
+ * Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
|
|
||||||
+ * by Henrik Nordstrom <hno@marasystems.com>
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License as published by
|
|
||||||
+ * the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ * (at your option) any later version.
|
|
||||||
+ *
|
|
||||||
+ * This program is distributed in the hope that it will be useful,
|
|
||||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+ * GNU General Public License for more details.
|
|
||||||
+ *
|
|
||||||
+ * You should have received a copy of the GNU General Public License
|
|
||||||
+ * along with this program; if not, write to the Free Software
|
|
||||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
+ */
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/skbuff.h>
|
|
||||||
+#include <linux/ip.h>
|
|
||||||
+#include <net/checksum.h>
|
|
||||||
+
|
|
||||||
+MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
|
|
||||||
+MODULE_DESCRIPTION("IP tables CONNMARK matching module");
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+
|
|
||||||
+#include <linux/netfilter_ipv4/ip_tables.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ipt_CONNMARK.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ip_conntrack.h>
|
|
||||||
+
|
|
||||||
+static unsigned int
|
|
||||||
+target(struct sk_buff **pskb,
|
|
||||||
+ unsigned int hooknum,
|
|
||||||
+ const struct net_device *in,
|
|
||||||
+ const struct net_device *out,
|
|
||||||
+ const void *targinfo,
|
|
||||||
+ void *userinfo)
|
|
||||||
+{
|
|
||||||
+ const struct ipt_connmark_target_info *markinfo = targinfo;
|
|
||||||
+ unsigned long diff;
|
|
||||||
+ unsigned long nfmark;
|
|
||||||
+ unsigned long newmark;
|
|
||||||
+
|
|
||||||
+ enum ip_conntrack_info ctinfo;
|
|
||||||
+ struct ip_conntrack *ct = ip_conntrack_get((*pskb), &ctinfo);
|
|
||||||
+ if (ct) {
|
|
||||||
+ switch(markinfo->mode) {
|
|
||||||
+ case IPT_CONNMARK_SET:
|
|
||||||
+ newmark = (ct->mark & ~markinfo->mask) | markinfo->mark;
|
|
||||||
+ if (newmark != ct->mark)
|
|
||||||
+ ct->mark = newmark;
|
|
||||||
+ break;
|
|
||||||
+ case IPT_CONNMARK_SAVE:
|
|
||||||
+ newmark = (ct->mark & ~markinfo->mask) | ((*pskb)->nfmark & markinfo->mask);
|
|
||||||
+ if (ct->mark != newmark)
|
|
||||||
+ ct->mark = newmark;
|
|
||||||
+ break;
|
|
||||||
+ case IPT_CONNMARK_RESTORE:
|
|
||||||
+ nfmark = (*pskb)->nfmark;
|
|
||||||
+ diff = (ct->mark ^ nfmark & markinfo->mask);
|
|
||||||
+ if (diff != 0) {
|
|
||||||
+ (*pskb)->nfmark = nfmark ^ diff;
|
|
||||||
+ (*pskb)->nfcache |= NFC_ALTERED;
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return IPT_CONTINUE;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+checkentry(const char *tablename,
|
|
||||||
+ const struct ipt_entry *e,
|
|
||||||
+ void *targinfo,
|
|
||||||
+ unsigned int targinfosize,
|
|
||||||
+ unsigned int hook_mask)
|
|
||||||
+{
|
|
||||||
+ struct ipt_connmark_target_info *matchinfo = targinfo;
|
|
||||||
+ if (targinfosize != IPT_ALIGN(sizeof(struct ipt_connmark_target_info))) {
|
|
||||||
+ printk(KERN_WARNING "CONNMARK: targinfosize %u != %Zu\n",
|
|
||||||
+ targinfosize,
|
|
||||||
+ IPT_ALIGN(sizeof(struct ipt_connmark_target_info)));
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (matchinfo->mode == IPT_CONNMARK_RESTORE) {
|
|
||||||
+ if (strcmp(tablename, "mangle") != 0) {
|
|
||||||
+ printk(KERN_WARNING "CONNMARK: restore can only be called from \"mangle\" table, not \"%s\"\n", tablename);
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct ipt_target ipt_connmark_reg = {
|
|
||||||
+ .name = "CONNMARK",
|
|
||||||
+ .target = &target,
|
|
||||||
+ .checkentry = &checkentry,
|
|
||||||
+ .me = THIS_MODULE
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int __init init(void)
|
|
||||||
+{
|
|
||||||
+ return ipt_register_target(&ipt_connmark_reg);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void __exit fini(void)
|
|
||||||
+{
|
|
||||||
+ ipt_unregister_target(&ipt_connmark_reg);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+module_init(init);
|
|
||||||
+module_exit(fini);
|
|
||||||
diff -urN linux.old/net/ipv4/netfilter/ipt_connmark.c linux.dev/net/ipv4/netfilter/ipt_connmark.c
|
|
||||||
--- linux.old/net/ipv4/netfilter/ipt_connmark.c 1970-01-01 01:00:00.000000000 +0100
|
|
||||||
+++ linux.dev/net/ipv4/netfilter/ipt_connmark.c 2005-08-20 20:21:28.666970864 +0200
|
|
||||||
@@ -0,0 +1,83 @@
|
|
||||||
+/* This kernel module matches connection mark values set by the
|
|
||||||
+ * CONNMARK target
|
|
||||||
+ *
|
|
||||||
+ * Copyright (C) 2002,2004 MARA Systems AB <http://www.marasystems.com>
|
|
||||||
+ * by Henrik Nordstrom <hno@marasystems.com>
|
|
||||||
+ *
|
|
||||||
+ * This program is free software; you can redistribute it and/or modify
|
|
||||||
+ * it under the terms of the GNU General Public License as published by
|
|
||||||
+ * the Free Software Foundation; either version 2 of the License, or
|
|
||||||
+ * (at your option) any later version.
|
|
||||||
+ *
|
|
||||||
+ * This program is distributed in the hope that it will be useful,
|
|
||||||
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
+ * GNU General Public License for more details.
|
|
||||||
+ *
|
|
||||||
+ * You should have received a copy of the GNU General Public License
|
|
||||||
+ * along with this program; if not, write to the Free Software
|
|
||||||
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+#include <linux/module.h>
|
|
||||||
+#include <linux/skbuff.h>
|
|
||||||
+
|
|
||||||
+MODULE_AUTHOR("Henrik Nordstrom <hno@marasytems.com>");
|
|
||||||
+MODULE_DESCRIPTION("IP tables connmark match module");
|
|
||||||
+MODULE_LICENSE("GPL");
|
|
||||||
+
|
|
||||||
+#include <linux/netfilter_ipv4/ip_tables.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ipt_connmark.h>
|
|
||||||
+#include <linux/netfilter_ipv4/ip_conntrack.h>
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+match(const struct sk_buff *skb,
|
|
||||||
+ const struct net_device *in,
|
|
||||||
+ const struct net_device *out,
|
|
||||||
+ const void *matchinfo,
|
|
||||||
+ int offset,
|
|
||||||
+ const void *hdr,
|
|
||||||
+ u_int16_t datalen,
|
|
||||||
+ int *hotdrop)
|
|
||||||
+{
|
|
||||||
+ const struct ipt_connmark_info *info = matchinfo;
|
|
||||||
+ enum ip_conntrack_info ctinfo;
|
|
||||||
+ struct ip_conntrack *ct = ip_conntrack_get((struct sk_buff *)skb, &ctinfo);
|
|
||||||
+ if (!ct)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ return ((ct->mark & info->mask) == info->mark) ^ info->invert;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int
|
|
||||||
+checkentry(const char *tablename,
|
|
||||||
+ const struct ipt_ip *ip,
|
|
||||||
+ void *matchinfo,
|
|
||||||
+ unsigned int matchsize,
|
|
||||||
+ unsigned int hook_mask)
|
|
||||||
+{
|
|
||||||
+ if (matchsize != IPT_ALIGN(sizeof(struct ipt_connmark_info)))
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ return 1;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static struct ipt_match connmark_match = {
|
|
||||||
+ .name = "connmark",
|
|
||||||
+ .match = &match,
|
|
||||||
+ .checkentry = &checkentry,
|
|
||||||
+ .me = THIS_MODULE
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int __init init(void)
|
|
||||||
+{
|
|
||||||
+ return ipt_register_match(&connmark_match);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static void __exit fini(void)
|
|
||||||
+{
|
|
||||||
+ ipt_unregister_match(&connmark_match);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+module_init(init);
|
|
||||||
+module_exit(fini);
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user