projects
/
framework
/
connectivity
/
connman.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
edf0d5e
)
tools: Add support for rule matches list to iptables_test
author
Tomasz Bursztyka
<tomasz.bursztyka@linux.intel.com>
Thu, 27 Oct 2011 07:24:56 +0000
(10:24 +0300)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Fri, 28 Oct 2011 19:26:13 +0000
(21:26 +0200)
tools/iptables-test.c
patch
|
blob
|
history
diff --git
a/tools/iptables-test.c
b/tools/iptables-test.c
index
b3b4782
..
5a3df95
100644
(file)
--- a/
tools/iptables-test.c
+++ b/
tools/iptables-test.c
@@
-533,15
+533,15
@@
err_head:
static struct ipt_entry *new_rule(struct ipt_ip *ip,
char *target_name, struct xtables_target *xt_t,
static struct ipt_entry *new_rule(struct ipt_ip *ip,
char *target_name, struct xtables_target *xt_t,
-
char *match_name, struct xtables_match *xt_
m)
+
struct xtables_rule_match *xt_r
m)
{
{
+ struct xtables_rule_match *tmp_xt_rm;
struct ipt_entry *new_entry;
size_t match_size, target_size;
struct ipt_entry *new_entry;
size_t match_size, target_size;
- if (xt_m)
- match_size = xt_m->m->u.match_size;
- else
- match_size = 0;
+ match_size = 0;
+ for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL; tmp_xt_rm = tmp_xt_rm->next)
+ match_size += tmp_xt_rm->match->m->u.match_size;
if (xt_t)
target_size = ALIGN(xt_t->t->u.target_size);
if (xt_t)
target_size = ALIGN(xt_t->t->u.target_size);
@@
-558,11
+558,13
@@
static struct ipt_entry *new_rule(struct ipt_ip *ip,
new_entry->target_offset = sizeof(struct ipt_entry) + match_size;
new_entry->next_offset = sizeof(struct ipt_entry) + target_size +
match_size;
new_entry->target_offset = sizeof(struct ipt_entry) + match_size;
new_entry->next_offset = sizeof(struct ipt_entry) + target_size +
match_size;
- if (xt_m) {
- struct xt_entry_match *entry_match;
- entry_match = (struct xt_entry_match *)new_entry->elems;
- memcpy(entry_match, xt_m->m, match_size);
+ match_size = 0;
+ for (tmp_xt_rm = xt_rm; tmp_xt_rm != NULL;
+ tmp_xt_rm = tmp_xt_rm->next) {
+ memcpy(new_entry->elems + match_size, tmp_xt_rm->match->m,
+ tmp_xt_rm->match->m->u.match_size);
+ match_size += tmp_xt_rm->match->m->u.match_size;
}
if (xt_t) {
}
if (xt_t) {
@@
-608,8
+610,7
@@
static void update_hooks(struct connman_iptables *table, GList *chain_head,
static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
- char *match_name, struct xtables_match *xt_m,
- int *builtin)
+ int *builtin, struct xtables_rule_match *xt_rm)
{
GList *chain_tail, *chain_head;
struct ipt_entry *new_entry;
{
GList *chain_tail, *chain_head;
struct ipt_entry *new_entry;
@@
-623,7
+624,7
@@
static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
if (chain_tail == NULL)
return NULL;
if (chain_tail == NULL)
return NULL;
- new_entry = new_rule(ip, target_name, xt_t,
match_name, xt_
m);
+ new_entry = new_rule(ip, target_name, xt_t,
xt_r
m);
if (new_entry == NULL)
return NULL;
if (new_entry == NULL)
return NULL;
@@
-648,7
+649,7
@@
static struct ipt_entry *prepare_rule_inclusion(struct connman_iptables *table,
static int connman_iptables_append_rule(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
static int connman_iptables_append_rule(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
-
char *match_name, struct xtables_match *xt_
m)
+
struct xtables_rule_match *xt_r
m)
{
GList *chain_tail;
struct ipt_entry *new_entry;
{
GList *chain_tail;
struct ipt_entry *new_entry;
@@
-659,7
+660,7
@@
static int connman_iptables_append_rule(struct connman_iptables *table,
return -EINVAL;
new_entry = prepare_rule_inclusion(table, ip, chain_name,
return -EINVAL;
new_entry = prepare_rule_inclusion(table, ip, chain_name,
-
target_name, xt_t, match_name, xt_m, &builtin
);
+
target_name, xt_t, &builtin, xt_rm
);
if (new_entry == NULL)
return -EINVAL;
if (new_entry == NULL)
return -EINVAL;
@@
-673,7
+674,7
@@
static int connman_iptables_append_rule(struct connman_iptables *table,
static int connman_iptables_insert_rule(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
static int connman_iptables_insert_rule(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
-
char *match_name, struct xtables_match *xt_
m)
+
struct xtables_rule_match *xt_r
m)
{
GList *chain_head;
struct ipt_entry *new_entry;
{
GList *chain_head;
struct ipt_entry *new_entry;
@@
-684,7
+685,7
@@
static int connman_iptables_insert_rule(struct connman_iptables *table,
return -EINVAL;
new_entry = prepare_rule_inclusion(table, ip, chain_name,
return -EINVAL;
new_entry = prepare_rule_inclusion(table, ip, chain_name,
-
target_name, xt_t, match_name, xt_m, &builtin
);
+
target_name, xt_t, &builtin, xt_rm
);
if (new_entry == NULL)
return -EINVAL;
if (new_entry == NULL)
return -EINVAL;
@@
-757,7
+758,8
@@
static gboolean is_same_match(struct xt_entry_match *xt_e_m1,
static int connman_iptables_delete_rule(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
static int connman_iptables_delete_rule(struct connman_iptables *table,
struct ipt_ip *ip, char *chain_name,
char *target_name, struct xtables_target *xt_t,
- char *match_name, struct xtables_match *xt_m)
+ struct xtables_match *xt_m,
+ struct xtables_rule_match *xt_rm)
{
GList *chain_tail, *chain_head, *list;
struct xt_entry_target *xt_e_t = NULL;
{
GList *chain_tail, *chain_head, *list;
struct xt_entry_target *xt_e_t = NULL;
@@
-779,7
+781,7
@@
static int connman_iptables_delete_rule(struct connman_iptables *table,
if (!xt_t && !xt_m)
return -EINVAL;
if (!xt_t && !xt_m)
return -EINVAL;
- entry_test = new_rule(ip, target_name, xt_t,
match_name, xt_
m);
+ entry_test = new_rule(ip, target_name, xt_t,
xt_r
m);
if (entry_test == NULL)
return -EINVAL;
if (entry_test == NULL)
return -EINVAL;
@@
-1624,7
+1626,7
@@
int main(int argc, char *argv[])
chain, match_name);
connman_iptables_delete_rule(table, &ip, chain,
chain, match_name);
connman_iptables_delete_rule(table, &ip, chain,
- target_name, xt_t,
match_name, xt_
m);
+ target_name, xt_t,
xt_m, xt_r
m);
goto commit;
}
goto commit;
}
@@
-1634,13
+1636,13
@@
int main(int argc, char *argv[])
chain, match_name);
connman_iptables_insert_rule(table, &ip, chain,
chain, match_name);
connman_iptables_insert_rule(table, &ip, chain,
-
target_name, xt_t, match_name, xt_
m);
+
target_name, xt_t, xt_r
m);
} else {
printf("Appending %s to %s (match %s)\n", target_name,
chain, match_name);
connman_iptables_append_rule(table, &ip, chain,
} else {
printf("Appending %s to %s (match %s)\n", target_name,
chain, match_name);
connman_iptables_append_rule(table, &ip, chain,
-
target_name, xt_t, match_name, xt_
m);
+
target_name, xt_t, xt_r
m);
}
}
}
}