package/iptables: refresh patches

SVN-Revision: 20465
This commit is contained in:
Gabor Juhos 2010-03-26 14:28:40 +00:00
parent 22d0b13b78
commit d6fb9649de
3 changed files with 10 additions and 12 deletions

View File

@ -1,6 +1,5 @@
diff -Nur a/libxt_layer7.c b/libxt_layer7.c --- /dev/null
--- a/extensions/libxt_layer7.c 1970-01-01 01:00:00.000000000 +0100 +++ b/extensions/libxt_layer7.c
+++ b/extensions/libxt_layer7.c 2008-08-22 16:00:52.000000000 +0200
@@ -0,0 +1,368 @@ @@ -0,0 +1,368 @@
+/* +/*
+ Shared library add-on to iptables for layer 7 matching support. + Shared library add-on to iptables for layer 7 matching support.
@ -370,9 +369,8 @@ diff -Nur a/libxt_layer7.c b/libxt_layer7.c
+{ +{
+ xtables_register_match(&layer7); + xtables_register_match(&layer7);
+} +}
diff -Nur a/libxt_layer7.man b/libxt_layer7.man --- /dev/null
--- a/extensions/libxt_layer7.man 1970-01-01 01:00:00.000000000 +0100 +++ b/extensions/libxt_layer7.man
+++ b/extensions/libxt_layer7.man 2008-08-22 16:00:52.000000000 +0200
@@ -0,0 +1,14 @@ @@ -0,0 +1,14 @@
+This module matches packets based on the application layer data of +This module matches packets based on the application layer data of
+their connections. It uses regular expression matching to compare +their connections. It uses regular expression matching to compare

View File

@ -1,6 +1,6 @@
--- a/libiptc/libiptc.c --- a/libiptc/libiptc.c
+++ b/libiptc/libiptc.c +++ b/libiptc/libiptc.c
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@ static const char *hooknames[] = {
struct ipt_error_target struct ipt_error_target
{ {
STRUCT_ENTRY_TARGET t; STRUCT_ENTRY_TARGET t;

View File

@ -22,7 +22,7 @@
static void multiport_help_v1(void) static void multiport_help_v1(void)
{ {
printf( printf(
@@ -71,26 +56,6 @@ @@ -71,26 +56,6 @@ proto_to_name(u_int8_t proto)
} }
} }
@ -49,7 +49,7 @@
static void static void
parse_multi_ports_v1(const char *portstring, parse_multi_ports_v1(const char *portstring,
struct xt_multiport_v1 *multiinfo, struct xt_multiport_v1 *multiinfo,
@@ -154,73 +119,6 @@ @@ -154,73 +119,6 @@ check_proto(u_int16_t pnum, u_int8_t inv
/* Function which parses command options; returns true if it /* Function which parses command options; returns true if it
ate an option */ ate an option */
static int static int
@ -123,7 +123,7 @@
__multiport_parse_v1(int c, char **argv, int invert, unsigned int *flags, __multiport_parse_v1(int c, char **argv, int invert, unsigned int *flags,
struct xt_entry_match **match, u_int16_t pnum, struct xt_entry_match **match, u_int16_t pnum,
u_int8_t invflags) u_int8_t invflags)
@@ -313,55 +211,6 @@ @@ -313,55 +211,6 @@ print_port(u_int16_t port, u_int8_t prot
} }
/* Prints out the matchinfo. */ /* Prints out the matchinfo. */
@ -179,7 +179,7 @@
static void __multiport_print_v1(const struct xt_entry_match *match, static void __multiport_print_v1(const struct xt_entry_match *match,
int numeric, u_int16_t proto) int numeric, u_int16_t proto)
{ {
@@ -418,48 +267,6 @@ @@ -418,48 +267,6 @@ static void multiport_print6_v1(const vo
} }
/* Saves the union ipt_matchinfo in parsable form to stdout. */ /* Saves the union ipt_matchinfo in parsable form to stdout. */
@ -228,7 +228,7 @@
static void __multiport_save_v1(const struct xt_entry_match *match, static void __multiport_save_v1(const struct xt_entry_match *match,
u_int16_t proto) u_int16_t proto)
{ {
@@ -513,34 +320,6 @@ @@ -513,34 +320,6 @@ static struct xtables_match multiport_mt
{ {
.family = NFPROTO_IPV4, .family = NFPROTO_IPV4,
.name = "multiport", .name = "multiport",