Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
fd0ec0e6
Commit
fd0ec0e6
authored
Jul 10, 2009
by
Jan Engelhardt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
netfilter: xtables: consolidate code into xt_request_find_match
Signed-off-by:
Jan Engelhardt
<
jengelh@medozas.de
>
parent
d2a7b6ba
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
24 deletions
+30
-24
include/linux/netfilter/x_tables.h
include/linux/netfilter/x_tables.h
+2
-0
net/bridge/netfilter/ebtables.c
net/bridge/netfilter/ebtables.c
+1
-4
net/ipv4/netfilter/ip_tables.c
net/ipv4/netfilter/ip_tables.c
+8
-10
net/ipv6/netfilter/ip6_tables.c
net/ipv6/netfilter/ip6_tables.c
+8
-10
net/netfilter/x_tables.c
net/netfilter/x_tables.c
+11
-0
No files found.
include/linux/netfilter/x_tables.h
View file @
fd0ec0e6
...
@@ -436,6 +436,8 @@ extern struct xt_table_info *xt_replace_table(struct xt_table *table,
...
@@ -436,6 +436,8 @@ extern struct xt_table_info *xt_replace_table(struct xt_table *table,
extern
struct
xt_match
*
xt_find_match
(
u8
af
,
const
char
*
name
,
u8
revision
);
extern
struct
xt_match
*
xt_find_match
(
u8
af
,
const
char
*
name
,
u8
revision
);
extern
struct
xt_target
*
xt_find_target
(
u8
af
,
const
char
*
name
,
u8
revision
);
extern
struct
xt_target
*
xt_find_target
(
u8
af
,
const
char
*
name
,
u8
revision
);
extern
struct
xt_match
*
xt_request_find_match
(
u8
af
,
const
char
*
name
,
u8
revision
);
extern
struct
xt_target
*
xt_request_find_target
(
u8
af
,
const
char
*
name
,
extern
struct
xt_target
*
xt_request_find_target
(
u8
af
,
const
char
*
name
,
u8
revision
);
u8
revision
);
extern
int
xt_find_revision
(
u8
af
,
const
char
*
name
,
u8
revision
,
extern
int
xt_find_revision
(
u8
af
,
const
char
*
name
,
u8
revision
,
...
...
net/bridge/netfilter/ebtables.c
View file @
fd0ec0e6
...
@@ -361,12 +361,9 @@ ebt_check_match(struct ebt_entry_match *m, struct xt_mtchk_param *par,
...
@@ -361,12 +361,9 @@ ebt_check_match(struct ebt_entry_match *m, struct xt_mtchk_param *par,
left
-
sizeof
(
struct
ebt_entry_match
)
<
m
->
match_size
)
left
-
sizeof
(
struct
ebt_entry_match
)
<
m
->
match_size
)
return
-
EINVAL
;
return
-
EINVAL
;
match
=
try_then_request_module
(
xt_find_match
(
NFPROTO_BRIDGE
,
match
=
xt_request_find_match
(
NFPROTO_BRIDGE
,
m
->
u
.
name
,
0
);
m
->
u
.
name
,
0
),
"ebt_%s"
,
m
->
u
.
name
);
if
(
IS_ERR
(
match
))
if
(
IS_ERR
(
match
))
return
PTR_ERR
(
match
);
return
PTR_ERR
(
match
);
if
(
match
==
NULL
)
return
-
ENOENT
;
m
->
u
.
match
=
match
;
m
->
u
.
match
=
match
;
par
->
match
=
match
;
par
->
match
=
match
;
...
...
net/ipv4/netfilter/ip_tables.c
View file @
fd0ec0e6
...
@@ -629,12 +629,11 @@ find_check_match(struct ipt_entry_match *m, struct xt_mtchk_param *par)
...
@@ -629,12 +629,11 @@ find_check_match(struct ipt_entry_match *m, struct xt_mtchk_param *par)
struct
xt_match
*
match
;
struct
xt_match
*
match
;
int
ret
;
int
ret
;
match
=
try_then_request_module
(
xt_find_match
(
AF_INET
,
m
->
u
.
user
.
name
,
match
=
xt_request_find_match
(
NFPROTO_IPV4
,
m
->
u
.
user
.
name
,
m
->
u
.
user
.
revision
),
m
->
u
.
user
.
revision
);
"ipt_%s"
,
m
->
u
.
user
.
name
);
if
(
IS_ERR
(
match
))
{
if
(
IS_ERR
(
match
)
||
!
match
)
{
duprintf
(
"find_check_match: `%s' not found
\n
"
,
m
->
u
.
user
.
name
);
duprintf
(
"find_check_match: `%s' not found
\n
"
,
m
->
u
.
user
.
name
);
return
match
?
PTR_ERR
(
match
)
:
-
ENOENT
;
return
PTR_ERR
(
match
)
;
}
}
m
->
u
.
kernel
.
match
=
match
;
m
->
u
.
kernel
.
match
=
match
;
...
@@ -1472,13 +1471,12 @@ compat_find_calc_match(struct ipt_entry_match *m,
...
@@ -1472,13 +1471,12 @@ compat_find_calc_match(struct ipt_entry_match *m,
{
{
struct
xt_match
*
match
;
struct
xt_match
*
match
;
match
=
try_then_request_module
(
xt_find_match
(
AF_INET
,
m
->
u
.
user
.
name
,
match
=
xt_request_find_match
(
NFPROTO_IPV4
,
m
->
u
.
user
.
name
,
m
->
u
.
user
.
revision
),
m
->
u
.
user
.
revision
);
"ipt_%s"
,
m
->
u
.
user
.
name
);
if
(
IS_ERR
(
match
))
{
if
(
IS_ERR
(
match
)
||
!
match
)
{
duprintf
(
"compat_check_calc_match: `%s' not found
\n
"
,
duprintf
(
"compat_check_calc_match: `%s' not found
\n
"
,
m
->
u
.
user
.
name
);
m
->
u
.
user
.
name
);
return
match
?
PTR_ERR
(
match
)
:
-
ENOENT
;
return
PTR_ERR
(
match
)
;
}
}
m
->
u
.
kernel
.
match
=
match
;
m
->
u
.
kernel
.
match
=
match
;
*
size
+=
xt_compat_match_offset
(
match
);
*
size
+=
xt_compat_match_offset
(
match
);
...
...
net/ipv6/netfilter/ip6_tables.c
View file @
fd0ec0e6
...
@@ -660,12 +660,11 @@ find_check_match(struct ip6t_entry_match *m, struct xt_mtchk_param *par)
...
@@ -660,12 +660,11 @@ find_check_match(struct ip6t_entry_match *m, struct xt_mtchk_param *par)
struct
xt_match
*
match
;
struct
xt_match
*
match
;
int
ret
;
int
ret
;
match
=
try_then_request_module
(
xt_find_match
(
AF_INET6
,
m
->
u
.
user
.
name
,
match
=
xt_request_find_match
(
NFPROTO_IPV6
,
m
->
u
.
user
.
name
,
m
->
u
.
user
.
revision
),
m
->
u
.
user
.
revision
);
"ip6t_%s"
,
m
->
u
.
user
.
name
);
if
(
IS_ERR
(
match
))
{
if
(
IS_ERR
(
match
)
||
!
match
)
{
duprintf
(
"find_check_match: `%s' not found
\n
"
,
m
->
u
.
user
.
name
);
duprintf
(
"find_check_match: `%s' not found
\n
"
,
m
->
u
.
user
.
name
);
return
match
?
PTR_ERR
(
match
)
:
-
ENOENT
;
return
PTR_ERR
(
match
)
;
}
}
m
->
u
.
kernel
.
match
=
match
;
m
->
u
.
kernel
.
match
=
match
;
...
@@ -1506,13 +1505,12 @@ compat_find_calc_match(struct ip6t_entry_match *m,
...
@@ -1506,13 +1505,12 @@ compat_find_calc_match(struct ip6t_entry_match *m,
{
{
struct
xt_match
*
match
;
struct
xt_match
*
match
;
match
=
try_then_request_module
(
xt_find_match
(
AF_INET6
,
m
->
u
.
user
.
name
,
match
=
xt_request_find_match
(
NFPROTO_IPV6
,
m
->
u
.
user
.
name
,
m
->
u
.
user
.
revision
),
m
->
u
.
user
.
revision
);
"ip6t_%s"
,
m
->
u
.
user
.
name
);
if
(
IS_ERR
(
match
))
{
if
(
IS_ERR
(
match
)
||
!
match
)
{
duprintf
(
"compat_check_calc_match: `%s' not found
\n
"
,
duprintf
(
"compat_check_calc_match: `%s' not found
\n
"
,
m
->
u
.
user
.
name
);
m
->
u
.
user
.
name
);
return
match
?
PTR_ERR
(
match
)
:
-
ENOENT
;
return
PTR_ERR
(
match
)
;
}
}
m
->
u
.
kernel
.
match
=
match
;
m
->
u
.
kernel
.
match
=
match
;
*
size
+=
xt_compat_match_offset
(
match
);
*
size
+=
xt_compat_match_offset
(
match
);
...
...
net/netfilter/x_tables.c
View file @
fd0ec0e6
...
@@ -214,6 +214,17 @@ struct xt_match *xt_find_match(u8 af, const char *name, u8 revision)
...
@@ -214,6 +214,17 @@ struct xt_match *xt_find_match(u8 af, const char *name, u8 revision)
}
}
EXPORT_SYMBOL
(
xt_find_match
);
EXPORT_SYMBOL
(
xt_find_match
);
struct
xt_match
*
xt_request_find_match
(
uint8_t
nfproto
,
const
char
*
name
,
uint8_t
revision
)
{
struct
xt_match
*
match
;
match
=
try_then_request_module
(
xt_find_match
(
nfproto
,
name
,
revision
),
"%st_%s"
,
xt_prefix
[
nfproto
],
name
);
return
(
match
!=
NULL
)
?
match
:
ERR_PTR
(
-
ENOENT
);
}
EXPORT_SYMBOL_GPL
(
xt_request_find_match
);
/* Find target, grabs ref. Returns ERR_PTR() on error. */
/* Find target, grabs ref. Returns ERR_PTR() on error. */
struct
xt_target
*
xt_find_target
(
u8
af
,
const
char
*
name
,
u8
revision
)
struct
xt_target
*
xt_find_target
(
u8
af
,
const
char
*
name
,
u8
revision
)
{
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment