From 2325c0fedf7507f94aa3bb11cc65a70d33836f8f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 27 Aug 2011 11:12:49 +0200 Subject: libiptc: combine common types Make an xt_chainlabel type out of ipt_chainlabel and ip6t_chainlabel, and add backward-API #defines. The ABI naturally does not change either, so no soversion bump. Signed-off-by: Jan Engelhardt --- include/libiptc/libip6tc.h | 3 ++- include/libiptc/libiptc.h | 3 ++- include/libiptc/xtcshared.h | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 include/libiptc/xtcshared.h (limited to 'include/libiptc') diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index 4f2d1f87..55e0bfc9 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -10,10 +10,11 @@ # include /* INT_MAX in ip6_tables.h */ #endif #include +#include struct ip6tc_handle; -typedef char ip6t_chainlabel[32]; +#define ip6t_chainlabel xt_chainlabel #define IP6TC_LABEL_ACCEPT "ACCEPT" #define IP6TC_LABEL_DROP "DROP" diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index 3497d6ae..ccbf6bff 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -10,6 +10,7 @@ # include /* INT_MAX in ip_tables.h */ #endif #include +#include #ifdef __cplusplus extern "C" { @@ -17,7 +18,7 @@ extern "C" { struct iptc_handle; -typedef char ipt_chainlabel[32]; +#define ipt_chainlabel xt_chainlabel #define IPTC_LABEL_ACCEPT "ACCEPT" #define IPTC_LABEL_DROP "DROP" diff --git a/include/libiptc/xtcshared.h b/include/libiptc/xtcshared.h new file mode 100644 index 00000000..aaf87a4b --- /dev/null +++ b/include/libiptc/xtcshared.h @@ -0,0 +1,6 @@ +#ifndef _LIBXTC_SHARED_H +#define _LIBXTC_SHARED_H 1 + +typedef char xt_chainlabel[32]; + +#endif /* _LIBXTC_SHARED_H */ -- cgit v1.2.3 From 7e5e866a36a76c153e5903b8251f90cfe07a1d34 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 27 Aug 2011 11:16:16 +0200 Subject: libiptc: replace ipt_chainlabel by xt_chainlabel Signed-off-by: Jan Engelhardt --- include/libiptc/libip6tc.h | 38 +++++++++++++++++++------------------- include/libiptc/libiptc.h | 38 +++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 38 deletions(-) (limited to 'include/libiptc') diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index 55e0bfc9..6332073f 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -59,89 +59,89 @@ const char *ip6tc_get_policy(const char *chain, /* Rule numbers start at 1 for the first rule. */ /* Insert the entry `fw' in chain `chain' into position `rulenum'. */ -int ip6tc_insert_entry(const ip6t_chainlabel chain, +int ip6tc_insert_entry(const xt_chainlabel chain, const struct ip6t_entry *e, unsigned int rulenum, struct ip6tc_handle *handle); /* Atomically replace rule `rulenum' in `chain' with `fw'. */ -int ip6tc_replace_entry(const ip6t_chainlabel chain, +int ip6tc_replace_entry(const xt_chainlabel chain, const struct ip6t_entry *e, unsigned int rulenum, 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, +int ip6tc_append_entry(const xt_chainlabel chain, const struct ip6t_entry *e, struct ip6tc_handle *handle); /* Check whether a matching rule exists */ -int ip6tc_check_entry(const ip6t_chainlabel chain, +int ip6tc_check_entry(const xt_chainlabel chain, const struct ip6t_entry *origfw, unsigned char *matchmask, struct ip6tc_handle *handle); /* Delete the first rule in `chain' which matches `fw'. */ -int ip6tc_delete_entry(const ip6t_chainlabel chain, +int ip6tc_delete_entry(const xt_chainlabel chain, const struct ip6t_entry *origfw, unsigned char *matchmask, struct ip6tc_handle *handle); /* Delete the rule in position `rulenum' in `chain'. */ -int ip6tc_delete_num_entry(const ip6t_chainlabel chain, +int ip6tc_delete_num_entry(const xt_chainlabel chain, unsigned int rulenum, 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, +const char *ip6tc_check_packet(const xt_chainlabel chain, struct ip6t_entry *, struct ip6tc_handle *handle); /* Flushes the entries in the given chain (ie. empties chain). */ -int ip6tc_flush_entries(const ip6t_chainlabel chain, +int ip6tc_flush_entries(const xt_chainlabel chain, struct ip6tc_handle *handle); /* Zeroes the counters in a chain. */ -int ip6tc_zero_entries(const ip6t_chainlabel chain, +int ip6tc_zero_entries(const xt_chainlabel chain, struct ip6tc_handle *handle); /* Creates a new chain. */ -int ip6tc_create_chain(const ip6t_chainlabel chain, +int ip6tc_create_chain(const xt_chainlabel chain, struct ip6tc_handle *handle); /* Deletes a chain. */ -int ip6tc_delete_chain(const ip6t_chainlabel chain, +int ip6tc_delete_chain(const xt_chainlabel chain, struct ip6tc_handle *handle); /* Renames a chain. */ -int ip6tc_rename_chain(const ip6t_chainlabel oldname, - const ip6t_chainlabel newname, +int ip6tc_rename_chain(const xt_chainlabel oldname, + const xt_chainlabel newname, struct ip6tc_handle *handle); /* Sets the policy on a built-in chain. */ -int ip6tc_set_policy(const ip6t_chainlabel chain, - const ip6t_chainlabel policy, +int ip6tc_set_policy(const xt_chainlabel chain, + const xt_chainlabel policy, struct ip6t_counters *counters, struct ip6tc_handle *handle); /* Get the number of references to this chain */ -int ip6tc_get_references(unsigned int *ref, const ip6t_chainlabel chain, +int ip6tc_get_references(unsigned int *ref, const xt_chainlabel chain, struct ip6tc_handle *handle); /* read packet and byte counters for a specific rule */ -struct ip6t_counters *ip6tc_read_counter(const ip6t_chainlabel chain, +struct ip6t_counters *ip6tc_read_counter(const xt_chainlabel chain, unsigned int rulenum, struct ip6tc_handle *handle); /* zero packet and byte counters for a specific rule */ -int ip6tc_zero_counter(const ip6t_chainlabel chain, +int ip6tc_zero_counter(const xt_chainlabel chain, unsigned int rulenum, struct ip6tc_handle *handle); /* set packet and byte counters for a specific rule */ -int ip6tc_set_counter(const ip6t_chainlabel chain, +int ip6tc_set_counter(const xt_chainlabel chain, unsigned int rulenum, struct ip6t_counters *counters, struct ip6tc_handle *handle); diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index ccbf6bff..ded4d974 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -63,91 +63,91 @@ const char *iptc_get_policy(const char *chain, /* Rule numbers start at 1 for the first rule. */ /* Insert the entry `e' in chain `chain' into position `rulenum'. */ -int iptc_insert_entry(const ipt_chainlabel chain, +int iptc_insert_entry(const xt_chainlabel chain, const struct ipt_entry *e, unsigned int rulenum, struct iptc_handle *handle); /* Atomically replace rule `rulenum' in `chain' with `e'. */ -int iptc_replace_entry(const ipt_chainlabel chain, +int iptc_replace_entry(const xt_chainlabel chain, const struct ipt_entry *e, unsigned int rulenum, 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, +int iptc_append_entry(const xt_chainlabel chain, const struct ipt_entry *e, struct iptc_handle *handle); /* Check whether a mathching rule exists */ -int iptc_check_entry(const ipt_chainlabel chain, +int iptc_check_entry(const xt_chainlabel chain, const struct ipt_entry *origfw, unsigned char *matchmask, 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, +int iptc_delete_entry(const xt_chainlabel chain, const struct ipt_entry *origfw, unsigned char *matchmask, struct iptc_handle *handle); /* Delete the rule in position `rulenum' in `chain'. */ -int iptc_delete_num_entry(const ipt_chainlabel chain, +int iptc_delete_num_entry(const xt_chainlabel chain, unsigned int rulenum, 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, +const char *iptc_check_packet(const xt_chainlabel chain, struct ipt_entry *entry, struct iptc_handle *handle); /* Flushes the entries in the given chain (ie. empties chain). */ -int iptc_flush_entries(const ipt_chainlabel chain, +int iptc_flush_entries(const xt_chainlabel chain, struct iptc_handle *handle); /* Zeroes the counters in a chain. */ -int iptc_zero_entries(const ipt_chainlabel chain, +int iptc_zero_entries(const xt_chainlabel chain, struct iptc_handle *handle); /* Creates a new chain. */ -int iptc_create_chain(const ipt_chainlabel chain, +int iptc_create_chain(const xt_chainlabel chain, struct iptc_handle *handle); /* Deletes a chain. */ -int iptc_delete_chain(const ipt_chainlabel chain, +int iptc_delete_chain(const xt_chainlabel chain, struct iptc_handle *handle); /* Renames a chain. */ -int iptc_rename_chain(const ipt_chainlabel oldname, - const ipt_chainlabel newname, +int iptc_rename_chain(const xt_chainlabel oldname, + const xt_chainlabel newname, struct iptc_handle *handle); /* Sets the policy on a built-in chain. */ -int iptc_set_policy(const ipt_chainlabel chain, - const ipt_chainlabel policy, +int iptc_set_policy(const xt_chainlabel chain, + const xt_chainlabel policy, struct ipt_counters *counters, struct iptc_handle *handle); /* Get the number of references to this chain */ int iptc_get_references(unsigned int *ref, - const ipt_chainlabel chain, + const xt_chainlabel chain, struct iptc_handle *handle); /* read packet and byte counters for a specific rule */ -struct ipt_counters *iptc_read_counter(const ipt_chainlabel chain, +struct ipt_counters *iptc_read_counter(const xt_chainlabel chain, unsigned int rulenum, struct iptc_handle *handle); /* zero packet and byte counters for a specific rule */ -int iptc_zero_counter(const ipt_chainlabel chain, +int iptc_zero_counter(const xt_chainlabel chain, unsigned int rulenum, struct iptc_handle *handle); /* set packet and byte counters for a specific rule */ -int iptc_set_counter(const ipt_chainlabel chain, +int iptc_set_counter(const xt_chainlabel chain, unsigned int rulenum, struct ipt_counters *counters, struct iptc_handle *handle); -- cgit v1.2.3 From 1639fe86579f86f5f6a954a9b0adde2e16ad1980 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 27 Aug 2011 11:39:52 +0200 Subject: libiptc: combine common types: _handle No real API/ABI change incurred, since the definition of the structs' types is not visible anyhow. Signed-off-by: Jan Engelhardt --- include/libiptc/libip6tc.h | 61 ++++++++++++++++++++++----------------------- include/libiptc/libiptc.h | 61 ++++++++++++++++++++++----------------------- include/libiptc/xtcshared.h | 1 + 3 files changed, 61 insertions(+), 62 deletions(-) (limited to 'include/libiptc') diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index 6332073f..f85dda71 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -12,8 +12,7 @@ #include #include -struct ip6tc_handle; - +#define ip6tc_handle xtc_handle #define ip6t_chainlabel xt_chainlabel #define IP6TC_LABEL_ACCEPT "ACCEPT" @@ -22,37 +21,37 @@ struct ip6tc_handle; #define IP6TC_LABEL_RETURN "RETURN" /* Does this chain exist? */ -int ip6tc_is_chain(const char *chain, struct ip6tc_handle *const handle); +int ip6tc_is_chain(const char *chain, struct xtc_handle *const handle); /* Take a snapshot of the rules. Returns NULL on error. */ -struct ip6tc_handle *ip6tc_init(const char *tablename); +struct xtc_handle *ip6tc_init(const char *tablename); /* Cleanup after ip6tc_init(). */ -void ip6tc_free(struct ip6tc_handle *h); +void ip6tc_free(struct xtc_handle *h); /* Iterator functions to run through the chains. Returns NULL at end. */ -const char *ip6tc_first_chain(struct ip6tc_handle *handle); -const char *ip6tc_next_chain(struct ip6tc_handle *handle); +const char *ip6tc_first_chain(struct xtc_handle *handle); +const char *ip6tc_next_chain(struct xtc_handle *handle); /* Get first rule in the given chain: NULL for empty chain. */ const struct ip6t_entry *ip6tc_first_rule(const char *chain, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Returns NULL when rules run out. */ const struct ip6t_entry *ip6tc_next_rule(const struct ip6t_entry *prev, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Returns a pointer to the target name of this position. */ const char *ip6tc_get_target(const struct ip6t_entry *e, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Is this a built-in chain? */ -int ip6tc_builtin(const char *chain, struct ip6tc_handle *const handle); +int ip6tc_builtin(const char *chain, struct xtc_handle *const handle); /* Get the policy of a given built-in chain */ const char *ip6tc_get_policy(const char *chain, struct ip6t_counters *counters, - struct ip6tc_handle *handle); + struct xtc_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,92 +61,92 @@ const char *ip6tc_get_policy(const char *chain, int ip6tc_insert_entry(const xt_chainlabel chain, const struct ip6t_entry *e, unsigned int rulenum, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Atomically replace rule `rulenum' in `chain' with `fw'. */ int ip6tc_replace_entry(const xt_chainlabel chain, const struct ip6t_entry *e, unsigned int rulenum, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Append entry `fw' to chain `chain'. Equivalent to insert with rulenum = length of chain. */ int ip6tc_append_entry(const xt_chainlabel chain, const struct ip6t_entry *e, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Check whether a matching rule exists */ int ip6tc_check_entry(const xt_chainlabel chain, const struct ip6t_entry *origfw, unsigned char *matchmask, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Delete the first rule in `chain' which matches `fw'. */ int ip6tc_delete_entry(const xt_chainlabel chain, const struct ip6t_entry *origfw, unsigned char *matchmask, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Delete the rule in position `rulenum' in `chain'. */ int ip6tc_delete_num_entry(const xt_chainlabel chain, unsigned int rulenum, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Check the packet `fw' on chain `chain'. Returns the verdict, or NULL and sets errno. */ const char *ip6tc_check_packet(const xt_chainlabel chain, struct ip6t_entry *, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Flushes the entries in the given chain (ie. empties chain). */ int ip6tc_flush_entries(const xt_chainlabel chain, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Zeroes the counters in a chain. */ int ip6tc_zero_entries(const xt_chainlabel chain, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Creates a new chain. */ int ip6tc_create_chain(const xt_chainlabel chain, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Deletes a chain. */ int ip6tc_delete_chain(const xt_chainlabel chain, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Renames a chain. */ int ip6tc_rename_chain(const xt_chainlabel oldname, const xt_chainlabel newname, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Sets the policy on a built-in chain. */ int ip6tc_set_policy(const xt_chainlabel chain, const xt_chainlabel policy, struct ip6t_counters *counters, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Get the number of references to this chain */ int ip6tc_get_references(unsigned int *ref, const xt_chainlabel chain, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* read packet and byte counters for a specific rule */ struct ip6t_counters *ip6tc_read_counter(const xt_chainlabel chain, unsigned int rulenum, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* zero packet and byte counters for a specific rule */ int ip6tc_zero_counter(const xt_chainlabel chain, unsigned int rulenum, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* set packet and byte counters for a specific rule */ int ip6tc_set_counter(const xt_chainlabel chain, unsigned int rulenum, struct ip6t_counters *counters, - struct ip6tc_handle *handle); + struct xtc_handle *handle); /* Makes the actual changes. */ -int ip6tc_commit(struct ip6tc_handle *handle); +int ip6tc_commit(struct xtc_handle *handle); /* Get raw socket. */ int ip6tc_get_raw_socket(void); @@ -158,6 +157,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(struct ip6tc_handle *const); +extern void dump_entries6(struct xtc_handle *const); #endif /* _LIBIP6TC_H */ diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index ded4d974..cf91725b 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -16,8 +16,7 @@ extern "C" { #endif -struct iptc_handle; - +#define iptc_handle xtc_handle #define ipt_chainlabel xt_chainlabel #define IPTC_LABEL_ACCEPT "ACCEPT" @@ -26,37 +25,37 @@ struct iptc_handle; #define IPTC_LABEL_RETURN "RETURN" /* Does this chain exist? */ -int iptc_is_chain(const char *chain, struct iptc_handle *const handle); +int iptc_is_chain(const char *chain, struct xtc_handle *const handle); /* Take a snapshot of the rules. Returns NULL on error. */ -struct iptc_handle *iptc_init(const char *tablename); +struct xtc_handle *iptc_init(const char *tablename); /* Cleanup after iptc_init(). */ -void iptc_free(struct iptc_handle *h); +void iptc_free(struct xtc_handle *h); /* Iterator functions to run through the chains. Returns NULL at end. */ -const char *iptc_first_chain(struct iptc_handle *handle); -const char *iptc_next_chain(struct iptc_handle *handle); +const char *iptc_first_chain(struct xtc_handle *handle); +const char *iptc_next_chain(struct xtc_handle *handle); /* Get first rule in the given chain: NULL for empty chain. */ const struct ipt_entry *iptc_first_rule(const char *chain, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Returns NULL when rules run out. */ const struct ipt_entry *iptc_next_rule(const struct ipt_entry *prev, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Returns a pointer to the target name of this entry. */ const char *iptc_get_target(const struct ipt_entry *e, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Is this a built-in chain? */ -int iptc_builtin(const char *chain, struct iptc_handle *const handle); +int iptc_builtin(const char *chain, struct xtc_handle *const handle); /* Get the policy of a given built-in chain */ const char *iptc_get_policy(const char *chain, struct ipt_counters *counter, - struct iptc_handle *handle); + struct xtc_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). */ @@ -66,94 +65,94 @@ const char *iptc_get_policy(const char *chain, int iptc_insert_entry(const xt_chainlabel chain, const struct ipt_entry *e, unsigned int rulenum, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Atomically replace rule `rulenum' in `chain' with `e'. */ int iptc_replace_entry(const xt_chainlabel chain, const struct ipt_entry *e, unsigned int rulenum, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Append entry `e' to chain `chain'. Equivalent to insert with rulenum = length of chain. */ int iptc_append_entry(const xt_chainlabel chain, const struct ipt_entry *e, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Check whether a mathching rule exists */ int iptc_check_entry(const xt_chainlabel chain, const struct ipt_entry *origfw, unsigned char *matchmask, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Delete the first rule in `chain' which matches `e', subject to matchmask (array of length == origfw) */ int iptc_delete_entry(const xt_chainlabel chain, const struct ipt_entry *origfw, unsigned char *matchmask, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Delete the rule in position `rulenum' in `chain'. */ int iptc_delete_num_entry(const xt_chainlabel chain, unsigned int rulenum, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Check the packet `e' on chain `chain'. Returns the verdict, or NULL and sets errno. */ const char *iptc_check_packet(const xt_chainlabel chain, struct ipt_entry *entry, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Flushes the entries in the given chain (ie. empties chain). */ int iptc_flush_entries(const xt_chainlabel chain, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Zeroes the counters in a chain. */ int iptc_zero_entries(const xt_chainlabel chain, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Creates a new chain. */ int iptc_create_chain(const xt_chainlabel chain, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Deletes a chain. */ int iptc_delete_chain(const xt_chainlabel chain, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Renames a chain. */ int iptc_rename_chain(const xt_chainlabel oldname, const xt_chainlabel newname, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Sets the policy on a built-in chain. */ int iptc_set_policy(const xt_chainlabel chain, const xt_chainlabel policy, struct ipt_counters *counters, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Get the number of references to this chain */ int iptc_get_references(unsigned int *ref, const xt_chainlabel chain, - struct iptc_handle *handle); + struct xtc_handle *handle); /* read packet and byte counters for a specific rule */ struct ipt_counters *iptc_read_counter(const xt_chainlabel chain, unsigned int rulenum, - struct iptc_handle *handle); + struct xtc_handle *handle); /* zero packet and byte counters for a specific rule */ int iptc_zero_counter(const xt_chainlabel chain, unsigned int rulenum, - struct iptc_handle *handle); + struct xtc_handle *handle); /* set packet and byte counters for a specific rule */ int iptc_set_counter(const xt_chainlabel chain, unsigned int rulenum, struct ipt_counters *counters, - struct iptc_handle *handle); + struct xtc_handle *handle); /* Makes the actual changes. */ -int iptc_commit(struct iptc_handle *handle); +int iptc_commit(struct xtc_handle *handle); /* Get raw socket. */ int iptc_get_raw_socket(void); @@ -161,7 +160,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(struct iptc_handle *const); +extern void dump_entries(struct xtc_handle *const); #ifdef __cplusplus } diff --git a/include/libiptc/xtcshared.h b/include/libiptc/xtcshared.h index aaf87a4b..89a51511 100644 --- a/include/libiptc/xtcshared.h +++ b/include/libiptc/xtcshared.h @@ -2,5 +2,6 @@ #define _LIBXTC_SHARED_H 1 typedef char xt_chainlabel[32]; +struct xtc_handle; #endif /* _LIBXTC_SHARED_H */ -- cgit v1.2.3 From 14da56743c6cdf25da35b7b5ca7a5d201771990d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 27 Aug 2011 09:56:16 +0200 Subject: src: resolve old macro names that are indirections Command used: git grep -f <(pcregrep -hior '(?<=#define\s)IP6?(T_\w+)(?=\s+X\1)' include/) and then fix all occurrences. Signed-off-by: Jan Engelhardt --- include/libiptc/libip6tc.h | 8 ++++---- include/libiptc/libiptc.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'include/libiptc') diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index f85dda71..61c1e7f5 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -50,7 +50,7 @@ int ip6tc_builtin(const char *chain, struct xtc_handle *const handle); /* Get the policy of a given built-in chain */ const char *ip6tc_get_policy(const char *chain, - struct ip6t_counters *counters, + struct xt_counters *counters, struct xtc_handle *handle); /* These functions return TRUE for OK or 0 and set errno. If errno == @@ -122,7 +122,7 @@ int ip6tc_rename_chain(const xt_chainlabel oldname, /* Sets the policy on a built-in chain. */ int ip6tc_set_policy(const xt_chainlabel chain, const xt_chainlabel policy, - struct ip6t_counters *counters, + struct xt_counters *counters, struct xtc_handle *handle); /* Get the number of references to this chain */ @@ -130,7 +130,7 @@ int ip6tc_get_references(unsigned int *ref, const xt_chainlabel chain, struct xtc_handle *handle); /* read packet and byte counters for a specific rule */ -struct ip6t_counters *ip6tc_read_counter(const xt_chainlabel chain, +struct xt_counters *ip6tc_read_counter(const xt_chainlabel chain, unsigned int rulenum, struct xtc_handle *handle); @@ -142,7 +142,7 @@ int ip6tc_zero_counter(const xt_chainlabel chain, /* set packet and byte counters for a specific rule */ int ip6tc_set_counter(const xt_chainlabel chain, unsigned int rulenum, - struct ip6t_counters *counters, + struct xt_counters *counters, struct xtc_handle *handle); /* Makes the actual changes. */ diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index cf91725b..6f64f5a9 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -54,7 +54,7 @@ int iptc_builtin(const char *chain, struct xtc_handle *const handle); /* Get the policy of a given built-in chain */ const char *iptc_get_policy(const char *chain, - struct ipt_counters *counter, + struct xt_counters *counter, struct xtc_handle *handle); /* These functions return TRUE for OK or 0 and set errno. If errno == @@ -127,7 +127,7 @@ int iptc_rename_chain(const xt_chainlabel oldname, /* Sets the policy on a built-in chain. */ int iptc_set_policy(const xt_chainlabel chain, const xt_chainlabel policy, - struct ipt_counters *counters, + struct xt_counters *counters, struct xtc_handle *handle); /* Get the number of references to this chain */ @@ -136,7 +136,7 @@ int iptc_get_references(unsigned int *ref, struct xtc_handle *handle); /* read packet and byte counters for a specific rule */ -struct ipt_counters *iptc_read_counter(const xt_chainlabel chain, +struct xt_counters *iptc_read_counter(const xt_chainlabel chain, unsigned int rulenum, struct xtc_handle *handle); @@ -148,7 +148,7 @@ int iptc_zero_counter(const xt_chainlabel chain, /* set packet and byte counters for a specific rule */ int iptc_set_counter(const xt_chainlabel chain, unsigned int rulenum, - struct ipt_counters *counters, + struct xt_counters *counters, struct xtc_handle *handle); /* Makes the actual changes. */ -- cgit v1.2.3 From de4d2d3b716d83a6d3831aaf902c5adb5d1d14c9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 27 Aug 2011 12:50:32 +0200 Subject: libiptc: use a family-invariant xtc_ops struct for code reduction Signed-off-by: Jan Engelhardt --- include/libiptc/libip6tc.h | 2 ++ include/libiptc/libiptc.h | 2 ++ include/libiptc/xtcshared.h | 13 +++++++++++++ 3 files changed, 17 insertions(+) (limited to 'include/libiptc') diff --git a/include/libiptc/libip6tc.h b/include/libiptc/libip6tc.h index 61c1e7f5..c656bc43 100644 --- a/include/libiptc/libip6tc.h +++ b/include/libiptc/libip6tc.h @@ -159,4 +159,6 @@ int ipv6_prefix_length(const struct in6_addr *a); extern void dump_entries6(struct xtc_handle *const); +extern const struct xtc_ops ip6tc_ops; + #endif /* _LIBIP6TC_H */ diff --git a/include/libiptc/libiptc.h b/include/libiptc/libiptc.h index 6f64f5a9..24cdbdb7 100644 --- a/include/libiptc/libiptc.h +++ b/include/libiptc/libiptc.h @@ -162,6 +162,8 @@ const char *iptc_strerror(int err); extern void dump_entries(struct xtc_handle *const); +extern const struct xtc_ops iptc_ops; + #ifdef __cplusplus } #endif diff --git a/include/libiptc/xtcshared.h b/include/libiptc/xtcshared.h index 89a51511..773ebc4c 100644 --- a/include/libiptc/xtcshared.h +++ b/include/libiptc/xtcshared.h @@ -3,5 +3,18 @@ typedef char xt_chainlabel[32]; struct xtc_handle; +struct xt_counters; + +struct xtc_ops { + int (*commit)(struct xtc_handle *); + void (*free)(struct xtc_handle *); + int (*builtin)(const char *, struct xtc_handle *const); + int (*is_chain)(const char *, struct xtc_handle *const); + int (*flush_entries)(const xt_chainlabel, struct xtc_handle *); + int (*create_chain)(const xt_chainlabel, struct xtc_handle *); + int (*set_policy)(const xt_chainlabel, const xt_chainlabel, + struct xt_counters *, struct xtc_handle *); + const char *(*strerror)(int); +}; #endif /* _LIBXTC_SHARED_H */ -- cgit v1.2.3