diff options
Diffstat (limited to 'ip6tables.c')
| -rw-r--r-- | ip6tables.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ip6tables.c b/ip6tables.c index 967a5f80..58c7e2df 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -768,10 +768,10 @@ make_delete_mask(const struct xtables_rule_match *matches, size = sizeof(struct ip6t_entry); for (matchp = matches; matchp; matchp = matchp->next) - size += IP6T_ALIGN(sizeof(struct ip6t_entry_match)) + matchp->match->size; + size += XT_ALIGN(sizeof(struct ip6t_entry_match)) + matchp->match->size; mask = xtables_calloc(1, size - + IP6T_ALIGN(sizeof(struct ip6t_entry_target)) + + XT_ALIGN(sizeof(struct ip6t_entry_target)) + target->size); memset(mask, 0xFF, sizeof(struct ip6t_entry)); @@ -779,13 +779,13 @@ make_delete_mask(const struct xtables_rule_match *matches, for (matchp = matches; matchp; matchp = matchp->next) { memset(mptr, 0xFF, - IP6T_ALIGN(sizeof(struct ip6t_entry_match)) + XT_ALIGN(sizeof(struct ip6t_entry_match)) + matchp->match->userspacesize); - mptr += IP6T_ALIGN(sizeof(struct ip6t_entry_match)) + matchp->match->size; + mptr += XT_ALIGN(sizeof(struct ip6t_entry_match)) + matchp->match->size; } memset(mptr, 0xFF, - IP6T_ALIGN(sizeof(struct ip6t_entry_target)) + XT_ALIGN(sizeof(struct ip6t_entry_target)) + target->userspacesize); return mask; @@ -1306,7 +1306,7 @@ static void command_default(struct iptables_command_state *cs) cs->proto_used = 1; - size = IP6T_ALIGN(sizeof(struct ip6t_entry_match)) + m->size; + size = XT_ALIGN(sizeof(struct ip6t_entry_match)) + m->size; m->m = xtables_calloc(1, size); m->m->u.match_size = size; @@ -1351,7 +1351,7 @@ static void command_jump(struct iptables_command_state *cs) if (cs->target == NULL) return; - size = IP6T_ALIGN(sizeof(struct ip6t_entry_target)) + cs->target->size; + size = XT_ALIGN(sizeof(struct ip6t_entry_target)) + cs->target->size; cs->target->t = xtables_calloc(1, size); cs->target->t->u.target_size = size; @@ -1381,7 +1381,7 @@ static void command_match(struct iptables_command_state *cs) "unexpected ! flag before --match"); m = xtables_find_match(optarg, XTF_LOAD_MUST_SUCCEED, &cs->matches); - size = IP6T_ALIGN(sizeof(struct ip6t_entry_match)) + m->size; + size = XT_ALIGN(sizeof(struct ip6t_entry_match)) + m->size; m->m = xtables_calloc(1, size); m->m->u.match_size = size; strcpy(m->m->u.user.name, m->name); |