diff options
author | rusty <rusty> | 2000-05-15 02:17:52 +0000 |
---|---|---|
committer | rusty <rusty> | 2000-05-15 02:17:52 +0000 |
commit | b4e3645f81cea70c28bb5f91bcd2fffc002cba71 (patch) | |
tree | b9b903689b4459516d298c943cc88f84df573f22 /libiptc/libiptc.c | |
parent | 72d16369f738fe1235f4486b901c42070f23440e (diff) |
Philip Blundell's IPv6 fixes.
Diffstat (limited to 'libiptc/libiptc.c')
-rw-r--r-- | libiptc/libiptc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libiptc/libiptc.c b/libiptc/libiptc.c index 141a584..ddbea74 100644 --- a/libiptc/libiptc.c +++ b/libiptc/libiptc.c @@ -478,7 +478,7 @@ get_chain_end(const TC_HANDLE_T handle, unsigned int start) /* Iterator functions to run through the chains. */ const char * -iptc_first_chain(TC_HANDLE_T *handle) +TC_FIRST_CHAIN(TC_HANDLE_T *handle) { if ((*handle)->cache_chain_heads == NULL && !populate_cache(*handle)) @@ -505,7 +505,7 @@ TC_NEXT_CHAIN(TC_HANDLE_T *handle) /* Get first rule in the given chain: NULL for empty chain. */ const STRUCT_ENTRY * -iptc_first_rule(const char *chain, TC_HANDLE_T *handle) +TC_FIRST_RULE(const char *chain, TC_HANDLE_T *handle) { struct chain_cache *c; @@ -525,7 +525,7 @@ iptc_first_rule(const char *chain, TC_HANDLE_T *handle) /* Returns NULL when rules run out. */ const STRUCT_ENTRY * -iptc_next_rule(const STRUCT_ENTRY *prev, TC_HANDLE_T *handle) +TC_NEXT_RULE(const STRUCT_ENTRY *prev, TC_HANDLE_T *handle) { if ((void *)prev + prev->next_offset == (void *)(*handle)->cache_rule_end) @@ -831,7 +831,7 @@ standard_map(STRUCT_ENTRY *e, int verdict) t = (STRUCT_STANDARD_TARGET *)GET_TARGET(e); if (t->target.u.target_size - != IPT_ALIGN(sizeof(STRUCT_STANDARD_TARGET))) { + != ALIGN(sizeof(STRUCT_STANDARD_TARGET))) { errno = EINVAL; return 0; } @@ -1236,18 +1236,18 @@ TC_CREATE_CHAIN(const IPT_CHAINLABEL chain, TC_HANDLE_T *handle) newc.head.target_offset = sizeof(STRUCT_ENTRY); newc.head.next_offset = sizeof(STRUCT_ENTRY) - + IPT_ALIGN(sizeof(struct ipt_error_target)); + + ALIGN(sizeof(struct ipt_error_target)); strcpy(newc.name.t.u.user.name, ERROR_TARGET); - newc.name.t.u.target_size = IPT_ALIGN(sizeof(struct ipt_error_target)); + newc.name.t.u.target_size = ALIGN(sizeof(struct ipt_error_target)); strcpy(newc.name.error, chain); newc.ret.target_offset = sizeof(STRUCT_ENTRY); newc.ret.next_offset = sizeof(STRUCT_ENTRY) - + IPT_ALIGN(sizeof(STRUCT_STANDARD_TARGET)); + + ALIGN(sizeof(STRUCT_STANDARD_TARGET)); strcpy(newc.target.target.u.user.name, STANDARD_TARGET); newc.target.target.u.target_size - = IPT_ALIGN(sizeof(STRUCT_STANDARD_TARGET)); + = ALIGN(sizeof(STRUCT_STANDARD_TARGET)); newc.target.verdict = RETURN; /* Add just before terminal entry */ |