From fd1873110f8e57be578df17fc9d03536b10f4f73 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 10 Nov 2008 16:59:27 +0100 Subject: libiptc: remove typedef indirection Don't you hate it when iptc_handle_t *x actually is a double-indirection struct iptc_handle **? This also shows the broken constness model, since "const iptc_handle_t x" = "iptc_handle_t const x" = "struct iptc_handle *const x", which is like no const at all. Lots of things to do then. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy --- include/libiptc/libip6tc.h | 61 +++++++++++++++++++++++----------------------- include/libiptc/libiptc.h | 61 +++++++++++++++++++++++----------------------- 2 files changed, 60 insertions(+), 62 deletions(-) (limited to 'include/libiptc') diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index 6e8a5657..9f8c08f6 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -11,6 +11,8 @@ #endif #define IP6T_ALIGN(s) (((s) + (IP6T_MIN_ALIGN-1)) & ~(IP6T_MIN_ALIGN-1)) +struct ip6tc_handle; + typedef char ip6t_chainlabel[32]; #define IP6TC_LABEL_ACCEPT "ACCEPT" @@ -18,41 +20,38 @@ typedef char ip6t_chainlabel[32]; #define IP6TC_LABEL_QUEUE "QUEUE" #define IP6TC_LABEL_RETURN "RETURN" -/* Transparent handle type. */ -typedef struct ip6tc_handle *ip6tc_handle_t; - /* Does this chain exist? */ -int ip6tc_is_chain(const char *chain, const ip6tc_handle_t handle); +int ip6tc_is_chain(const char *chain, struct ip6tc_handle *const handle); /* Take a snapshot of the rules. Returns NULL on error. */ -ip6tc_handle_t ip6tc_init(const char *tablename); +struct ip6tc_handle *ip6tc_init(const char *tablename); /* Cleanup after ip6tc_init(). */ -void ip6tc_free(ip6tc_handle_t *h); +void ip6tc_free(struct ip6tc_handle **h); /* Iterator functions to run through the chains. Returns NULL at end. */ -const char *ip6tc_first_chain(ip6tc_handle_t *handle); -const char *ip6tc_next_chain(ip6tc_handle_t *handle); +const char *ip6tc_first_chain(struct ip6tc_handle **handle); +const char *ip6tc_next_chain(struct ip6tc_handle **handle); /* Get first rule in the given chain: NULL for empty chain. */ const struct ip6t_entry *ip6tc_first_rule(const char *chain, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Returns NULL when rules run out. */ const struct ip6t_entry *ip6tc_next_rule(const struct ip6t_entry *prev, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Returns a pointer to the target name of this position. */ const char *ip6tc_get_target(const struct ip6t_entry *e, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Is this a built-in chain? */ -int ip6tc_builtin(const char *chain, const ip6tc_handle_t handle); +int ip6tc_builtin(const char *chain, struct ip6tc_handle *const handle); /* Get the policy of a given built-in chain */ const char *ip6tc_get_policy(const char *chain, struct ip6t_counters *counters, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* These functions return TRUE for OK or 0 and set errno. If errno == 0, it means there was a version error (ie. upgrade libiptc). */ @@ -62,86 +61,86 @@ const char *ip6tc_get_policy(const char *chain, int ip6tc_insert_entry(const ip6t_chainlabel chain, const struct ip6t_entry *e, unsigned int rulenum, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Atomically replace rule `rulenum' in `chain' with `fw'. */ int ip6tc_replace_entry(const ip6t_chainlabel chain, const struct ip6t_entry *e, unsigned int rulenum, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Append entry `fw' to chain `chain'. Equivalent to insert with rulenum = length of chain. */ int ip6tc_append_entry(const ip6t_chainlabel chain, const struct ip6t_entry *e, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Delete the first rule in `chain' which matches `fw'. */ int ip6tc_delete_entry(const ip6t_chainlabel chain, const struct ip6t_entry *origfw, unsigned char *matchmask, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Delete the rule in position `rulenum' in `chain'. */ int ip6tc_delete_num_entry(const ip6t_chainlabel chain, unsigned int rulenum, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Check the packet `fw' on chain `chain'. Returns the verdict, or NULL and sets errno. */ const char *ip6tc_check_packet(const ip6t_chainlabel chain, struct ip6t_entry *, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Flushes the entries in the given chain (ie. empties chain). */ int ip6tc_flush_entries(const ip6t_chainlabel chain, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Zeroes the counters in a chain. */ int ip6tc_zero_entries(const ip6t_chainlabel chain, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Creates a new chain. */ int ip6tc_create_chain(const ip6t_chainlabel chain, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Deletes a chain. */ int ip6tc_delete_chain(const ip6t_chainlabel chain, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Renames a chain. */ int ip6tc_rename_chain(const ip6t_chainlabel oldname, const ip6t_chainlabel newname, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Sets the policy on a built-in chain. */ int ip6tc_set_policy(const ip6t_chainlabel chain, const ip6t_chainlabel policy, struct ip6t_counters *counters, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Get the number of references to this chain */ int ip6tc_get_references(unsigned int *ref, const ip6t_chainlabel chain, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* read packet and byte counters for a specific rule */ struct ip6t_counters *ip6tc_read_counter(const ip6t_chainlabel chain, unsigned int rulenum, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* zero packet and byte counters for a specific rule */ int ip6tc_zero_counter(const ip6t_chainlabel chain, unsigned int rulenum, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* set packet and byte counters for a specific rule */ int ip6tc_set_counter(const ip6t_chainlabel chain, unsigned int rulenum, struct ip6t_counters *counters, - ip6tc_handle_t *handle); + struct ip6tc_handle **handle); /* Makes the actual changes. */ -int ip6tc_commit(ip6tc_handle_t *handle); +int ip6tc_commit(struct ip6tc_handle **handle); /* Get raw socket. */ int ip6tc_get_raw_socket(void); @@ -152,6 +151,6 @@ const char *ip6tc_strerror(int err); /* Return prefix length, or -1 if not contiguous */ int ipv6_prefix_length(const struct in6_addr *a); -extern void dump_entries6(const ip6tc_handle_t); +extern void dump_entries6(struct ip6tc_handle *const); #endif /* _LIBIP6TC_H */ diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index 1f6f95d8..dd1ec6b5 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -19,6 +19,8 @@ extern "C" { #define IPT_ALIGN(s) (((s) + ((IPT_MIN_ALIGN)-1)) & ~((IPT_MIN_ALIGN)-1)) +struct iptc_handle; + typedef char ipt_chainlabel[32]; #define IPTC_LABEL_ACCEPT "ACCEPT" @@ -26,41 +28,38 @@ typedef char ipt_chainlabel[32]; #define IPTC_LABEL_QUEUE "QUEUE" #define IPTC_LABEL_RETURN "RETURN" -/* Transparent handle type. */ -typedef struct iptc_handle *iptc_handle_t; - /* Does this chain exist? */ -int iptc_is_chain(const char *chain, const iptc_handle_t handle); +int iptc_is_chain(const char *chain, struct iptc_handle *const handle); /* Take a snapshot of the rules. Returns NULL on error. */ -iptc_handle_t iptc_init(const char *tablename); +struct iptc_handle *iptc_init(const char *tablename); /* Cleanup after iptc_init(). */ -void iptc_free(iptc_handle_t *h); +void iptc_free(struct iptc_handle **h); /* Iterator functions to run through the chains. Returns NULL at end. */ -const char *iptc_first_chain(iptc_handle_t *handle); -const char *iptc_next_chain(iptc_handle_t *handle); +const char *iptc_first_chain(struct iptc_handle **handle); +const char *iptc_next_chain(struct iptc_handle **handle); /* Get first rule in the given chain: NULL for empty chain. */ const struct ipt_entry *iptc_first_rule(const char *chain, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Returns NULL when rules run out. */ const struct ipt_entry *iptc_next_rule(const struct ipt_entry *prev, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Returns a pointer to the target name of this entry. */ const char *iptc_get_target(const struct ipt_entry *e, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Is this a built-in chain? */ -int iptc_builtin(const char *chain, const iptc_handle_t handle); +int iptc_builtin(const char *chain, struct iptc_handle *const handle); /* Get the policy of a given built-in chain */ const char *iptc_get_policy(const char *chain, struct ipt_counters *counter, - iptc_handle_t *handle); + struct iptc_handle **handle); /* These functions return TRUE for OK or 0 and set errno. If errno == 0, it means there was a version error (ie. upgrade libiptc). */ @@ -70,88 +69,88 @@ const char *iptc_get_policy(const char *chain, int iptc_insert_entry(const ipt_chainlabel chain, const struct ipt_entry *e, unsigned int rulenum, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Atomically replace rule `rulenum' in `chain' with `e'. */ int iptc_replace_entry(const ipt_chainlabel chain, const struct ipt_entry *e, unsigned int rulenum, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Append entry `e' to chain `chain'. Equivalent to insert with rulenum = length of chain. */ int iptc_append_entry(const ipt_chainlabel chain, const struct ipt_entry *e, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Delete the first rule in `chain' which matches `e', subject to matchmask (array of length == origfw) */ int iptc_delete_entry(const ipt_chainlabel chain, const struct ipt_entry *origfw, unsigned char *matchmask, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Delete the rule in position `rulenum' in `chain'. */ int iptc_delete_num_entry(const ipt_chainlabel chain, unsigned int rulenum, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Check the packet `e' on chain `chain'. Returns the verdict, or NULL and sets errno. */ const char *iptc_check_packet(const ipt_chainlabel chain, struct ipt_entry *entry, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Flushes the entries in the given chain (ie. empties chain). */ int iptc_flush_entries(const ipt_chainlabel chain, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Zeroes the counters in a chain. */ int iptc_zero_entries(const ipt_chainlabel chain, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Creates a new chain. */ int iptc_create_chain(const ipt_chainlabel chain, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Deletes a chain. */ int iptc_delete_chain(const ipt_chainlabel chain, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Renames a chain. */ int iptc_rename_chain(const ipt_chainlabel oldname, const ipt_chainlabel newname, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Sets the policy on a built-in chain. */ int iptc_set_policy(const ipt_chainlabel chain, const ipt_chainlabel policy, struct ipt_counters *counters, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Get the number of references to this chain */ int iptc_get_references(unsigned int *ref, const ipt_chainlabel chain, - iptc_handle_t *handle); + struct iptc_handle **handle); /* read packet and byte counters for a specific rule */ struct ipt_counters *iptc_read_counter(const ipt_chainlabel chain, unsigned int rulenum, - iptc_handle_t *handle); + struct iptc_handle **handle); /* zero packet and byte counters for a specific rule */ int iptc_zero_counter(const ipt_chainlabel chain, unsigned int rulenum, - iptc_handle_t *handle); + struct iptc_handle **handle); /* set packet and byte counters for a specific rule */ int iptc_set_counter(const ipt_chainlabel chain, unsigned int rulenum, struct ipt_counters *counters, - iptc_handle_t *handle); + struct iptc_handle **handle); /* Makes the actual changes. */ -int iptc_commit(iptc_handle_t *handle); +int iptc_commit(struct iptc_handle **handle); /* Get raw socket. */ int iptc_get_raw_socket(void); @@ -159,7 +158,7 @@ int iptc_get_raw_socket(void); /* Translates errno numbers into more human-readable form than strerror. */ const char *iptc_strerror(int err); -extern void dump_entries(const iptc_handle_t); +extern void dump_entries(struct iptc_handle *const); #ifdef __cplusplus } -- cgit v1.2.3