mirror of
git://git.code.sf.net/p/dhcpd-pools/code
synced 2025-12-16 15:57:00 +00:00
all files: replace global variables with runtime config state structure
Earlier variables magically appeared to scope of functions that took void as argument. One could figure out perhaps they were globals, but programs that do that are unnessarily hard to follow. Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola
parent
adda925c1e
commit
1875a13733
12 changed files with 551 additions and 626 deletions
|
|
@ -35,8 +35,6 @@
|
|||
|
||||
/*! \file dhcpd-pools.h
|
||||
* \brief Global definitions of structures, enums, and function prototypes.
|
||||
* FIXME: The file has too many global variables. Most of them should be
|
||||
* removed, if not all.
|
||||
*/
|
||||
|
||||
#ifndef DHCPD_POOLS_H
|
||||
|
|
@ -76,6 +74,17 @@ union ipaddr_t {
|
|||
uint32_t v4;
|
||||
unsigned char v6[16];
|
||||
};
|
||||
|
||||
/*! \enum dhcpd_magic_numbers
|
||||
* \brief MAXLEN is maximum expected line length in dhcpd.conf and
|
||||
* dhcpd.leases, and SHARED_NETWORKS is maximum number of different shared
|
||||
* networks in dhcpd.conf file.
|
||||
*/
|
||||
enum dhcpd_magic_numbers {
|
||||
MAXLEN = 1024,
|
||||
SHARED_NETWORKS = 8192
|
||||
};
|
||||
|
||||
/*! \enum dhcp_version
|
||||
* \brief The IP version, IPv4 or IPv6, served by the dhcpd.
|
||||
*/
|
||||
|
|
@ -214,18 +223,24 @@ struct output_sort {
|
|||
comparer_t func;
|
||||
struct output_sort *next;
|
||||
};
|
||||
/*! \struct configuration_t
|
||||
* \brief Runtime configuration.
|
||||
/*! \struct conf_t
|
||||
* \brief Runtime configuration state.
|
||||
*/
|
||||
struct configuration_t {
|
||||
struct conf_t {
|
||||
struct shared_network_t *shared_networks;
|
||||
unsigned int num_shared_networks;
|
||||
struct range_t *ranges;
|
||||
unsigned int num_ranges;
|
||||
size_t ranges_size;
|
||||
struct leases_t *leases;
|
||||
char dhcpv6;
|
||||
enum dhcp_version ip_version;
|
||||
char *dhcpdconf_file;
|
||||
char *dhcpdlease_file;
|
||||
int output_format;
|
||||
const char *dhcpdconf_file;
|
||||
const char *dhcpdlease_file;
|
||||
const int output_format;
|
||||
struct output_sort *sorts;
|
||||
char *output_file;
|
||||
char *mustach_template;
|
||||
const char *output_file;
|
||||
const char *mustach_template;
|
||||
double warning;
|
||||
double critical;
|
||||
double warn_count;
|
||||
|
|
@ -237,50 +252,67 @@ struct configuration_t {
|
|||
snet_alarms:1,
|
||||
perfdata:1,
|
||||
all_as_shared:1,
|
||||
header_limit:3,
|
||||
header_limit:4,
|
||||
number_limit:3,
|
||||
skip_ok:1,
|
||||
color_mode:2;
|
||||
};
|
||||
|
||||
/* Global variables */
|
||||
/* \var config Runtime configuration. */
|
||||
extern struct configuration_t config;
|
||||
/* \var shared_networks Pointer holding shared network count results. */
|
||||
extern struct shared_network_t *shared_networks;
|
||||
/* \var num_shared_networks Number of shared networks found. */
|
||||
extern unsigned int num_shared_networks;
|
||||
/* \var ranges Pointer holding range count results. */
|
||||
extern struct range_t *ranges;
|
||||
/* \var num_ranges Number of ranges found. */
|
||||
extern unsigned int num_ranges;
|
||||
/* \var leases Pointer holding all leases. */
|
||||
extern struct leases_t *leases;
|
||||
/*! \var RANGES Maximum number of ranges. */
|
||||
extern unsigned int RANGES;
|
||||
|
||||
/* Function prototypes */
|
||||
extern void prepare_memory(void);
|
||||
extern void set_ipv_functions(int version);
|
||||
extern int parse_leases(const int print_mac_addreses);
|
||||
extern void parse_config(int, const char *restrict, struct shared_network_t *restrict)
|
||||
__attribute__ ((nonnull(2, 3)));
|
||||
extern void prepare_data(void);
|
||||
extern void do_counting(void);
|
||||
extern void flip_ranges(struct range_t *restrict flip_me, struct range_t *restrict tmp_ranges)
|
||||
__attribute__ ((nonnull(1, 2)));
|
||||
/* support functions */
|
||||
extern int (*parse_ipaddr) (const char *restrict src, union ipaddr_t *restrict dst);
|
||||
extern int parse_ipaddr_init(const char *restrict src,
|
||||
union ipaddr_t *restrict dst);
|
||||
extern int parse_ipaddr_v4(const char *restrict src, union ipaddr_t *restrict dst);
|
||||
extern int parse_ipaddr_v6(const char *restrict src, union ipaddr_t *restrict dst);
|
||||
|
||||
extern void parse_cidr(struct range_t *range_p, const char *word);
|
||||
/* analyze.c */
|
||||
extern void prepare_data(struct conf_t *state);
|
||||
extern void do_counting(struct conf_t *state);
|
||||
|
||||
/* getdata.c */
|
||||
extern int parse_leases(struct conf_t *state, const int print_mac_addreses);
|
||||
extern void parse_config(struct conf_t *state, const int is_include,
|
||||
const char *restrict config_file,
|
||||
struct shared_network_t *restrict shared_p);
|
||||
|
||||
/* hash.c */
|
||||
extern void (*add_lease) (struct conf_t *state, union ipaddr_t *addr, enum ltype type);
|
||||
extern void add_lease_init(struct conf_t *state, union ipaddr_t *addr, enum ltype type);
|
||||
extern void add_lease_v4(struct conf_t *state, union ipaddr_t *addr, enum ltype type);
|
||||
extern void add_lease_v6(struct conf_t *state, union ipaddr_t *addr, enum ltype type);
|
||||
|
||||
extern struct leases_t *(*find_lease) (struct conf_t *state, union ipaddr_t *addr);
|
||||
extern struct leases_t *find_lease_init(struct conf_t *state, union ipaddr_t *addr);
|
||||
extern struct leases_t *find_lease_v4(struct conf_t *state, union ipaddr_t *addr);
|
||||
extern struct leases_t *find_lease_v6(struct conf_t *state, union ipaddr_t *addr);
|
||||
|
||||
extern void delete_lease(struct conf_t *state, struct leases_t *lease);
|
||||
extern void delete_all_leases(struct conf_t *state);
|
||||
|
||||
/* mustach-dhcpd-pools.c */
|
||||
extern int mustach_dhcpd_pools(struct conf_t *state);
|
||||
|
||||
/* other.c */
|
||||
extern void set_ipv_functions(struct conf_t *state, int version);
|
||||
extern void flip_ranges(struct conf_t *state);
|
||||
extern void clean_up(struct conf_t *state);
|
||||
extern void parse_cidr(struct conf_t *state, struct range_t *range_p, const char *word);
|
||||
extern int parse_color_mode(const char *restrict optarg);
|
||||
extern double strtod_or_err(const char *restrict str, const char *restrict errmesg);
|
||||
extern void __attribute__ ((noreturn)) print_version(void);
|
||||
extern void __attribute__ ((noreturn)) usage(int status);
|
||||
|
||||
extern int (*parse_ipaddr) (struct conf_t *state, const char *restrict src,
|
||||
union ipaddr_t *restrict dst);
|
||||
extern int parse_ipaddr_init(struct conf_t *state, const char *restrict src,
|
||||
union ipaddr_t *restrict dst);
|
||||
extern int parse_ipaddr_v4(struct conf_t *state, const char *restrict src,
|
||||
union ipaddr_t *restrict dst);
|
||||
extern int parse_ipaddr_v6(struct conf_t *state, const char *restrict src,
|
||||
union ipaddr_t *restrict dst);
|
||||
|
||||
extern int (*xstrstr) (struct conf_t *state, const char *restrict str);
|
||||
extern int xstrstr_init(struct conf_t *state, const char *restrict str);
|
||||
extern int xstrstr_v4(struct conf_t *state, const char *restrict str);
|
||||
extern int xstrstr_v6(struct conf_t *state, const char *restrict str);
|
||||
|
||||
extern void (*copy_ipaddr) (union ipaddr_t *restrict dst, const union ipaddr_t *restrict src);
|
||||
extern void copy_ipaddr_init(union ipaddr_t *restrict dst,
|
||||
const union ipaddr_t *restrict src);
|
||||
extern void copy_ipaddr_init(union ipaddr_t *restrict dst, const union ipaddr_t *restrict src);
|
||||
extern void copy_ipaddr_v4(union ipaddr_t *restrict dst, const union ipaddr_t *restrict src);
|
||||
extern void copy_ipaddr_v6(union ipaddr_t *restrict dst, const union ipaddr_t *restrict src);
|
||||
|
||||
|
|
@ -294,26 +326,17 @@ extern double get_range_size_init(const struct range_t *r);
|
|||
extern double get_range_size_v4(const struct range_t *r);
|
||||
extern double get_range_size_v6(const struct range_t *r);
|
||||
|
||||
extern int (*xstrstr) (const char *restrict str);
|
||||
extern int xstrstr_init(const char *restrict str);
|
||||
extern int xstrstr_v4(const char *restrict str)
|
||||
_DP_ATTRIBUTE_HOT;
|
||||
extern int xstrstr_v6(const char *restrict str)
|
||||
_DP_ATTRIBUTE_HOT;
|
||||
/* output.c */
|
||||
extern void range_output_helper(struct conf_t *state, struct output_helper_t *oh,
|
||||
struct range_t *range_p);
|
||||
extern void shnet_output_helper(struct conf_t *state, struct output_helper_t *oh,
|
||||
struct shared_network_t *shared_p);
|
||||
extern int output_analysis(struct conf_t *state, const char output_format);
|
||||
|
||||
extern int parse_color_mode(const char *restrict optarg);
|
||||
extern double strtod_or_err(const char *restrict str, const char *restrict errmesg);
|
||||
extern void __attribute__ ((noreturn)) print_version(void);
|
||||
extern void __attribute__ ((noreturn)) usage(int status);
|
||||
/* qsort required functions... */
|
||||
/* ...for ranges and... */
|
||||
extern int (*ipcomp) (const union ipaddr_t *restrict a, const union ipaddr_t *restrict b);
|
||||
extern int ipcomp_init(const union ipaddr_t *restrict a,
|
||||
const union ipaddr_t *restrict b);
|
||||
extern int ipcomp_v4(const union ipaddr_t *restrict a,
|
||||
const union ipaddr_t *restrict b);
|
||||
extern int ipcomp_v6(const union ipaddr_t *restrict a,
|
||||
const union ipaddr_t *restrict b);
|
||||
/* sort.c */
|
||||
extern void mergesort_ranges(struct conf_t *state,
|
||||
struct range_t *restrict orig, unsigned int size,
|
||||
struct range_t *restrict temp, const int root_call);
|
||||
|
||||
extern int (*leasecomp) (const struct leases_t *restrict a, const struct leases_t *restrict b);
|
||||
extern int leasecomp_init(const struct leases_t *restrict a
|
||||
|
|
@ -322,6 +345,14 @@ extern int leasecomp_init(const struct leases_t *restrict a
|
|||
extern int leasecomp_v4(const struct leases_t *restrict a, const struct leases_t *restrict b);
|
||||
extern int leasecomp_v6(const struct leases_t *restrict a, const struct leases_t *restrict b);
|
||||
|
||||
extern int (*ipcomp) (const union ipaddr_t *restrict a, const union ipaddr_t *restrict b);
|
||||
extern int ipcomp_init(const union ipaddr_t *restrict a, const union ipaddr_t *restrict b);
|
||||
extern int ipcomp_v4(const union ipaddr_t *restrict a, const union ipaddr_t *restrict b);
|
||||
extern int ipcomp_v6(const union ipaddr_t *restrict a, const union ipaddr_t *restrict b);
|
||||
|
||||
extern int rangecomp(const void *restrict r1, const void *restrict r2)
|
||||
__attribute__ ((nonnull(1, 2)));
|
||||
|
||||
extern int comp_cur(struct range_t *r1, struct range_t *r2);
|
||||
extern int comp_double(double f1, double f2);
|
||||
extern int comp_ip(struct range_t *r1, struct range_t *r2);
|
||||
|
|
@ -330,35 +361,10 @@ extern int comp_percent(struct range_t *r1, struct range_t *r2);
|
|||
extern int comp_tc(struct range_t *r1, struct range_t *r2);
|
||||
extern int comp_tcperc(struct range_t *r1, struct range_t *r2);
|
||||
extern int comp_touched(struct range_t *r1, struct range_t *r2);
|
||||
extern int rangecomp(const void *restrict r1, const void *restrict r2)
|
||||
__attribute__ ((nonnull(1, 2)));
|
||||
/* sort function pointer and functions */
|
||||
|
||||
extern comparer_t field_selector(char c);
|
||||
extern double ret_percent(struct range_t r);
|
||||
extern double ret_tc(struct range_t r);
|
||||
extern double ret_tcperc(struct range_t r);
|
||||
extern void mergesort_ranges(struct range_t *restrict orig, int size,
|
||||
struct range_t *restrict temp)
|
||||
__attribute__ ((nonnull(1, 3)));
|
||||
/* output function */
|
||||
extern void range_output_helper(struct output_helper_t *oh, struct range_t *range_p);
|
||||
extern void shnet_output_helper(struct output_helper_t *oh, struct shared_network_t *shared_p);
|
||||
extern int output_analysis(const char);
|
||||
extern int mustach_dhcpd_pools(void);
|
||||
/* Memory release, file closing etc */
|
||||
extern void clean_up(void);
|
||||
/* Hash functions */
|
||||
extern void (*add_lease) (union ipaddr_t *addr, enum ltype type);
|
||||
extern void add_lease_init(union ipaddr_t *addr, enum ltype type);
|
||||
extern void add_lease_v4(union ipaddr_t *addr, enum ltype type);
|
||||
extern void add_lease_v6(union ipaddr_t *addr, enum ltype type);
|
||||
|
||||
extern struct leases_t *(*find_lease) (union ipaddr_t *addr);
|
||||
extern struct leases_t *find_lease_init(union ipaddr_t *addr);
|
||||
extern struct leases_t *find_lease_v4(union ipaddr_t *addr);
|
||||
extern struct leases_t *find_lease_v6(union ipaddr_t *addr);
|
||||
|
||||
extern void delete_lease(struct leases_t *lease);
|
||||
extern void delete_all_leases(void);
|
||||
|
||||
#endif /* DHCPD_POOLS_H */
|
||||
#endif /* DHCPD_POOLS_H */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue