X-Git-Url: http://git.asbjorn.biz/?p=debian%2Fdhcpd-pools.git;a=blobdiff_plain;f=src%2Fdhcpd-pools.h;h=e3835ad5c2f1bf2ca81157fce51a30cdc30210d5;hp=0d85615480562c45edd2299438b76e97943c9912;hb=b492802dfa7bf928bbafe74194ca4f154c70f743;hpb=849c8f5e73d671c7f9e3f74f0652a0876d7a2787 diff --git a/src/dhcpd-pools.h b/src/dhcpd-pools.h index 0d85615..e3835ad 100644 --- a/src/dhcpd-pools.h +++ b/src/dhcpd-pools.h @@ -1,19 +1,18 @@ -/* -** Copyright (C) 2006- Sami Kerola -** -** This program is free software; you can redistribute it and/or modify +/* http://dhcpd-pools.sourceforge.net/ +** Copyright 2006- Sami Kerola +** +** This program is free software: you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or +** the Free Software Foundation, either version 3 of the License, or ** (at your option) any later version. -** +** ** This program is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ** GNU General Public License for more details. -** +** ** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +** along with this program. If not, see . */ #ifndef DHCPD_POOLS_H @@ -25,41 +24,77 @@ #define _POSIX_SOURCE 1 #define POSIXLY_CORRECT 1 -#ifdef HAVE_STDLIB_H +#ifdef HAVE_STDLIB_H #include -#else /* Not STDC_HEADERS */ -extern void exit (); -extern char *malloc (); -#endif /* STDC_HEADERS */ +#else +extern void exit(); +extern char *malloc(); +#endif /* STDC_HEADERS */ -/* Structures and unions */ -struct configuration_t +#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME +# ifdef HAVE___PROGNAME +extern char *__progname; +# define program_invocation_short_name __progname +# else /* HAVE___PROGNAME */ +# ifdef HAVE_GETEXECNAME +# include +# define program_invocation_short_name \ + prog_inv_sh_nm_from_file(getexecname(), 0) +# else /* HAVE_GETEXECNAME */ +# define program_invocation_short_name \ + prog_inv_sh_nm_from_file(__FILE__, 1) +# endif /* HAVE_PROGRAM_INVOCATION_SHORT_NAME */ +static char prog_inv_sh_nm_buf[256]; +static inline char *prog_inv_sh_nm_from_file(char *f, char stripext) { - char *dhcpdconf_file; - char *dhcpdlease_file; - char output_format[2]; - char sort[6]; - int reverse_order; - char *output_file; - int output_limit[2]; + char *t; + if ((t = strrchr(f, '/')) != NULL) { + t++; + } else { + t = f; + } + strncpy(prog_inv_sh_nm_buf, t, sizeof(prog_inv_sh_nm_buf) - 1); + prog_inv_sh_nm_buf[sizeof(prog_inv_sh_nm_buf) - 1] = '\0'; + + if (stripext && (t = strrchr(prog_inv_sh_nm_buf, '.')) != NULL) { + *t = '\0'; + } + return prog_inv_sh_nm_buf; +} +# endif +#endif + +/* Structures and unions */ +struct configuration_t { + char *dhcpdconf_file; + char *dhcpdlease_file; + char output_format[2]; + char sort[6]; + int reverse_order; + char *output_file; + int output_limit[2]; }; -struct shared_network_t -{ - char *name; - unsigned long int available; - unsigned long int used; - unsigned long int touched; - unsigned long int backups; +struct shared_network_t { + char *name; + unsigned long int available; + unsigned long int used; + unsigned long int touched; + unsigned long int backups; }; -struct range_t -{ - struct shared_network_t *shared_net; - unsigned long int first_ip; - unsigned long int last_ip; - unsigned long int count; - unsigned long int touched; - unsigned long int backups; +struct range_t { + struct shared_network_t *shared_net; + unsigned long int first_ip; + unsigned long int last_ip; + unsigned long int count; + unsigned long int touched; + unsigned long int backups; +}; +struct macaddr_t { + char *ethernet; + char *ip; + struct macaddr_t *next; }; + /* Global variables */ static int const true = 1; static int const false = 0; @@ -87,24 +122,43 @@ unsigned long int num_touches; unsigned long int *backups; unsigned long int num_backups; +struct macaddr_t *macaddr; + /* Function prototypes */ -int prepare_memory (void); -int parse_leases (void); -char * parse_config (int, char *, char *, char *, struct shared_network_t *); -int nth_field (int n, char *dest, const char *src); -int prepare_data (void); -int do_counting (void); -void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges); +int prepare_memory(void); +int parse_leases(void); +char *parse_config(int, char *, char *, char *, struct shared_network_t *) + __attribute__ ((nonnull(2, 3, 4))); +int nth_field(int n, char *dest, const char *src) + __attribute__ ((nonnull(2, 3))) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + __attribute__ ((__hot__)) +#endif + ; +int prepare_data(void); +int do_counting(void); +void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges) + __attribute__ ((nonnull(1, 2))); /* General support functions */ -void *safe_malloc (const size_t size); -void print_version (void); -void usage (int status); +void *safe_malloc(const size_t size) +#if __GNUC__ >= 3 + __attribute__ ((__malloc__)) +#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) + __attribute__ ((__alloc_size__((1)))) +#endif +#endif + ; +void *safe_realloc(void *ptr, const size_t size); +char *safe_strdup(const char *str) __attribute__ ((nonnull(1))); +void print_version(void) __attribute__ ((noreturn)); +void usage(int status) __attribute__ ((noreturn)); /* qsort required functions... */ /* ...for ranges and... */ -int intcomp (const void *x, const void *y); -int rangecomp (const void *r1, const void *r2); +int intcomp(const void *x, const void *y) __attribute__ ((nonnull(1, 2))); +int rangecomp(const void *r1, const void *r2) + __attribute__ ((nonnull(1, 2))); /* sort function pointer and functions */ -int sort_name (void); +int sort_name(void); unsigned long int (*returner) (struct range_t r); unsigned long int ret_ip(struct range_t r); unsigned long int ret_cur(struct range_t r); @@ -114,15 +168,17 @@ unsigned long int ret_touched(struct range_t r); unsigned long int ret_tc(struct range_t r); unsigned long int ret_tcperc(struct range_t r); void field_selector(char c); -int get_order(struct range_t *left, struct range_t *right); -void mergesort_ranges (struct range_t *orig, int size, struct range_t *temp); +int get_order(struct range_t *left, struct range_t *right) + __attribute__ ((nonnull(1, 2))); +void mergesort_ranges(struct range_t *orig, int size, struct range_t *temp) + __attribute__ ((nonnull(1, 3))); /* output function pointer and functions */ int (*output_analysis) (void); -int output_txt (void); -int output_html (void); -int output_xml (void); -int output_csv (void); +int output_txt(void); +int output_html(void); +int output_xml(void); +int output_csv(void); /* Memory release, file closing etc */ -void clean_up (void); +void clean_up(void); -#endif /* DHCPD_POOLS_H */ +#endif /* DHCPD_POOLS_H */