shared network names to be dynamically allocated

This patch is a step a head to make data all structures
completely dynamic. After this the next obvious thing to do is to
make shared networks struct a linked list instead of a list.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-04-11 20:52:40 +02:00
parent b492802dfa
commit c81af2df45
5 changed files with 18 additions and 55 deletions

View file

@ -189,9 +189,7 @@ int main(int argc, char **argv)
/* Do the job */
prepare_memory();
parse_config(true, config.dhcpdconf_file, shared_net_names,
shared_net_names + strlen(shared_net_names) + 1,
shared_networks);
parse_config(true, config.dhcpdconf_file, shared_networks);
parse_leases();
prepare_data();
@ -217,13 +215,12 @@ int prepare_memory()
num_ranges = num_shared_networks = 0;
shared_networks =
safe_malloc(sizeof(struct shared_network_t) * SHARED_NETWORKS);
shared_net_names =
safe_malloc(sizeof(char) * SHARED_NETWORKS_NAMES);
ranges = safe_malloc(sizeof(struct range_t) * RANGES);
macaddr = NULL;
/* First shared network entry is all networks */
strcpy(shared_net_names, "All networks");
shared_networks->name = safe_strdup("All networks");
return 0;
}