X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fgetdata.c;h=5456b6599907c1e6b36a8e115c4963f61c04fab0;hb=c81af2df4585433c0a86f09cb60cd40e4eef95a9;hp=1a7cba8f2955cee9a07e94c027e9c837d5a4d90a;hpb=10488b0a040d2702273a7922c8b6bcebfb3cd85f;p=debian%2Fdhcpd-pools.git diff --git a/src/getdata.c b/src/getdata.c index 1a7cba8..5456b65 100644 --- a/src/getdata.c +++ b/src/getdata.c @@ -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 . */ #ifdef HAVE_CONFIG_H @@ -61,9 +60,10 @@ extern char *malloc(); int parse_leases(void) { FILE *dhcpd_leases; - char *line, *ipstring, *macstring, *macstring2; + char *line, *ipstring, *macstring = NULL; struct in_addr inp; struct stat lease_file_stats; + struct macaddr_t *macaddr_p = NULL; unsigned long leasesmallocsize; unsigned long touchesmallocsize; unsigned long backupsmallocsize; @@ -79,13 +79,15 @@ int parse_leases(void) #ifdef POSIX_FADV_WILLNEED posix_fadvise((long) dhcpd_leases, 0, 0, POSIX_FADV_WILLNEED); if (errno) { - err(EXIT_FAILURE, "parse_leases: fadvise %s", config.dhcpdlease_file); + err(EXIT_FAILURE, "parse_leases: fadvise %s", + config.dhcpdlease_file); } #endif /* POSIX_FADV_WILLNEED */ #ifdef POSIX_FADV_SEQUENTIAL posix_fadvise((long) dhcpd_leases, 0, 0, POSIX_FADV_SEQUENTIAL); if (errno) { - err(EXIT_FAILURE, "parse_leases: fadvise %s", config.dhcpdlease_file); + err(EXIT_FAILURE, "parse_leases: fadvise %s", + config.dhcpdlease_file); } #endif /* POSIX_FADV_SEQUENTIAL */ @@ -106,8 +108,12 @@ int parse_leases(void) line = safe_malloc(sizeof(long int) * MAXLEN); ipstring = safe_malloc(sizeof(long int) * MAXLEN); - macstring = safe_malloc(sizeof(long int) * MAXLEN); - macstring2 = safe_malloc(sizeof(long int) * MAXLEN); + if (config.output_format[0] == 'X') { + macstring = safe_malloc(sizeof(char) * 18); + macaddr = safe_malloc(sizeof(struct macaddr_t)); + macaddr_p = macaddr; + macaddr_p->next = NULL; + } while (!feof(dhcpd_leases)) { fgets(line, MAXLEN, dhcpd_leases); @@ -139,19 +145,25 @@ int parse_leases(void) assert(!(backupsmallocsize < num_backups)); } - /* FIXME: move to output.c and use the FILE - * *outfile */ - if ((config.output_format[0] == 'X') + if ((macaddr != NULL) && (sw_active_lease == 1) && (strstr(line, "hardware ethernet"))) { nth_field(3, macstring, line); - macstring[strlen(macstring) - 1] = '\0'; - - printf - ("\n\t%s\n\t%s\n\n", - ipstring, macstring); + macstring[17] = '\0'; + macaddr_p->ethernet = safe_strdup(macstring); + macaddr_p->ip = safe_strdup(ipstring); + macaddr_p->next = + safe_malloc(sizeof(struct macaddr_t)); + macaddr_p = macaddr_p->next; + macaddr_p->next = NULL; } } + free(line); + free(ipstring); + if (macaddr != NULL) { + free(macstring); + } + fclose(dhcpd_leases); return 0; } @@ -200,10 +212,8 @@ int is_interesting_config_clause(char *s) } /* FIXME: This spagetti monster function need to be rewrote at least ones. */ -char *parse_config(int is_include, char *config_file, - char *current_shared_name, - char *next_free_shared_name, - struct shared_network_t *shared_p) +void parse_config(int is_include, char *config_file, + struct shared_network_t *shared_p) { FILE *dhcpd_config; int i = 0, newclause = true, argument = false, comment = @@ -213,14 +223,11 @@ char *parse_config(int is_include, char *config_file, struct in_addr inp; struct range_t *range_p; - char *last_shared_name; - last_shared_name = SHARED_NETWORKS_NAMES + shared_net_names; - word = safe_malloc(sizeof(char) * MAXLEN); if (is_include) { /* Default place holder for ranges "All networks". */ - shared_p->name = current_shared_name; + shared_p->name = shared_networks->name; } /* Open configuration file */ @@ -307,8 +314,6 @@ char *parse_config(int is_include, char *config_file, braces--; /* End of shared-network */ if (braces_shared == braces) { - current_shared_name = - shared_net_names; /* FIXME: Using 1000 is lame, but * works. */ braces_shared = 1000; @@ -374,9 +379,14 @@ char *parse_config(int is_include, char *config_file, range_p->backups = 0; range_p->shared_net = shared_p; num_ranges++; - if (RANGES < num_ranges) { - errx(EXIT_FAILURE, - "parse_config: Range space full! Increase RANGES and recompile."); + if (RANGES < num_ranges + 1) { + RANGES *= 2; + ranges = + safe_realloc(ranges, + sizeof(struct + range_t) * + RANGES); + range_p = ranges + num_ranges; } newclause = true; break; @@ -393,29 +403,21 @@ char *parse_config(int is_include, char *config_file, break; case 1: /* printf ("shared-network named: %s\n", word); */ - strcpy(next_free_shared_name, word); + num_shared_networks++; shared_p = shared_networks + num_shared_networks; - num_shared_networks++; - shared_p++; - shared_p->name = next_free_shared_name; + shared_p->name = safe_strdup(word); shared_p->available = 0; shared_p->used = 0; shared_p->touched = 0; shared_p->backups = 0; - /* Temporary abuse of argument - * variable */ - argument = - strlen(next_free_shared_name) + 1; - if (next_free_shared_name + argument < - last_shared_name) { - next_free_shared_name += argument; - } else { - /* FIXME: make this go + if (SHARED_NETWORKS < + num_shared_networks + 2) { + /* FIXME: make this * away by reallocationg * more space. */ errx(EXIT_FAILURE, - "parse_config: End of shared-network space, increase SHARED_NETWORKS_NAMES and recompile"); + "parse_config: increase default.h SHARED_NETWORKS and recompile"); } argument = 0; braces_shared = braces; @@ -423,11 +425,7 @@ char *parse_config(int is_include, char *config_file, case 4: /* printf ("include file: %s\n", word); */ argument = 0; - next_free_shared_name = - parse_config(false, word, - current_shared_name, - next_free_shared_name, - shared_p); + parse_config(false, word, shared_p); newclause = true; break; case 0: @@ -441,5 +439,6 @@ char *parse_config(int is_include, char *config_file, } } free(word); - return next_free_shared_name; + fclose(dhcpd_config); + return; }