update iptables to 1.4.0 (2.6 kernels only), refresh kernel patches
[openwrt/openwrt.git] / package / iptables / patches / 1.3.8 / 003-layer7_2.17_pktmatch.patch
1 Index: iptables-1.3.8/extensions/libipt_layer7.c
2 ===================================================================
3 --- iptables-1.3.8.orig/extensions/libipt_layer7.c
4 +++ iptables-1.3.8/extensions/libipt_layer7.c
5 @@ -37,7 +37,8 @@ static void help(void)
6 "LAYER7 match v%s options:\n"
7 "--l7dir <directory> : Look for patterns here instead of /etc/l7-protocols/\n"
8 " (--l7dir must be specified before --l7proto if used!)\n"
9 - "--l7proto [!] <name> : Match the protocol defined in /etc/l7-protocols/name.pat\n",
10 + "--l7proto [!] <name> : Match the protocol defined in /etc/l7-protocols/name.pat\n"
11 + "--l7pkt : Skip connection tracking and match individual packets\n",
12 IPTABLES_VERSION);
13 fputc('\n', stdout);
14 }
15 @@ -45,6 +46,7 @@ static void help(void)
16 static struct option opts[] = {
17 { .name = "l7proto", .has_arg = 1, .flag = 0, .val = '1' },
18 { .name = "l7dir", .has_arg = 1, .flag = 0, .val = '2' },
19 + { .name = "l7pkt", .has_arg = 0, .flag = 0, .val = '3' },
20 { .name = 0 }
21 };
22
23 @@ -333,6 +335,9 @@ static int parse(int c, char **argv, int
24
25 *flags = 1;
26 break;
27 + case '3':
28 + layer7info->pkt = 1;
29 + break;
30
31 default:
32 return 0;
33 @@ -365,6 +370,9 @@ static void print(const struct ipt_ip *i
34
35 print_protocol(((struct ipt_layer7_info *)match->data)->protocol,
36 ((struct ipt_layer7_info *)match->data)->invert, numeric);
37 +
38 + if (((struct ipt_layer7_info *)match->data)->pkt)
39 + printf("l7pkt ");
40 }
41 /* Saves the union ipt_matchinfo in parsable form to stdout. */
42 static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)