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:
a82c852
)
iptables-test: Fix build failure against 2.6.37-rc1 headers
author
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 16 Nov 2010 14:08:09 +0000
(15:08 +0100)
committer
Samuel Ortiz
<sameo@linux.intel.com>
Tue, 16 Nov 2010 14:08:09 +0000
(15:08 +0100)
tools/iptables-test.c
patch
|
blob
|
history
diff --git
a/tools/iptables-test.c
b/tools/iptables-test.c
index
ff9f5c7
..
e316cc9
100644
(file)
--- a/
tools/iptables-test.c
+++ b/
tools/iptables-test.c
@@
-76,7
+76,7
@@
static const char *hooknames[] = {
#define ALIGN(s) (((s) + ((MIN_ALIGN)-1)) & ~((MIN_ALIGN)-1))
#define ALIGN(s) (((s) + ((MIN_ALIGN)-1)) & ~((MIN_ALIGN)-1))
-struct
ipt_
error_target {
+struct error_target {
struct xt_entry_target t;
char error[IPT_TABLE_MAXNAMELEN];
};
struct xt_entry_target t;
char error[IPT_TABLE_MAXNAMELEN];
};
@@
-453,7
+453,7
@@
static int connman_iptables_add_chain(struct connman_iptables *table,
GList *last;
struct ipt_entry *entry_head;
struct ipt_entry *entry_return;
GList *last;
struct ipt_entry *entry_head;
struct ipt_entry *entry_return;
- struct
ipt_
error_target *error;
+ struct error_target *error;
struct ipt_standard_target *standard;
u_int16_t entry_head_size, entry_return_size;
struct ipt_standard_target *standard;
u_int16_t entry_head_size, entry_return_size;
@@
-470,7
+470,7
@@
static int connman_iptables_add_chain(struct connman_iptables *table,
/* head entry */
entry_head_size = sizeof(struct ipt_entry) +
/* head entry */
entry_head_size = sizeof(struct ipt_entry) +
- sizeof(struct
ipt_
error_target);
+ sizeof(struct error_target);
entry_head = g_try_malloc0(entry_head_size);
if (entry_head == NULL)
goto err;
entry_head = g_try_malloc0(entry_head_size);
if (entry_head == NULL)
goto err;
@@
-480,9
+480,9
@@
static int connman_iptables_add_chain(struct connman_iptables *table,
entry_head->target_offset = sizeof(struct ipt_entry);
entry_head->next_offset = entry_head_size;
entry_head->target_offset = sizeof(struct ipt_entry);
entry_head->next_offset = entry_head_size;
- error = (struct
ipt_
error_target *) entry_head->elems;
+ error = (struct error_target *) entry_head->elems;
strcpy(error->t.u.user.name, IPT_ERROR_TARGET);
strcpy(error->t.u.user.name, IPT_ERROR_TARGET);
- error->t.u.user.target_size = ALIGN(sizeof(struct
ipt_
error_target));
+ error->t.u.user.target_size = ALIGN(sizeof(struct error_target));
strcpy(error->error, name);
if (connman_add_entry(table, entry_head, last, -1) < 0)
strcpy(error->error, name);
if (connman_add_entry(table, entry_head, last, -1) < 0)