j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use read_host_config() where appropriate.

Browse source
This commit is contained in:
Guus Sliepen 2013-05-11 14:05:28 +02:00
parent 3c163a3796
commit fc119fb009
2 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/net.c
View file

@ -306,7 +306,7 @@ static void sigalrm_handler(void *data) {
#endif #endif
int reload_configuration(void) { int reload_configuration(void) {
char *fname; char *fname = NULL;
/* Reread our own configuration file */ /* Reread our own configuration file */

19
src/net_setup.c
View file

@ -63,13 +63,11 @@ bool node_read_ecdsa_public_key(node_t *n) {
splay_tree_t *config_tree; splay_tree_t *config_tree;
FILE *fp; FILE *fp;
char *pubname = NULL, *hcfname = NULL; char *pubname = NULL;
char *p; char *p;
xasprintf(&hcfname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
init_configuration(&config_tree); init_configuration(&config_tree);
if(!read_config_file(config_tree, hcfname)) if(!read_host_config(config_tree, n->name))
goto exit; goto exit;
/* First, check for simple ECDSAPublicKey statement */ /* First, check for simple ECDSAPublicKey statement */
@ -97,7 +95,6 @@ bool node_read_ecdsa_public_key(node_t *n) {
exit: exit:
exit_configuration(&config_tree); exit_configuration(&config_tree);
free(hcfname);
free(pubname); free(pubname);
return n->ecdsa; return n->ecdsa;
} }
@ -319,14 +316,10 @@ void load_all_subnets(void) {
// continue; // continue;
#endif #endif
char *fname;
xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
splay_tree_t *config_tree; splay_tree_t *config_tree;
init_configuration(&config_tree); init_configuration(&config_tree);
read_config_options(config_tree, ent->d_name); read_config_options(config_tree, ent->d_name);
read_config_file(config_tree, fname); read_host_config(config_tree, ent->d_name);
free(fname);
if(!n) { if(!n) {
n = new_node(); n = new_node();
@ -618,7 +611,6 @@ bool setup_myself_reloadable(void) {
*/ */
static bool setup_myself(void) { static bool setup_myself(void) {
char *name, *hostname, *cipher, *digest, *type; char *name, *hostname, *cipher, *digest, *type;
char *fname = NULL;
char *address = NULL; char *address = NULL;
if(!(name = get_name())) { if(!(name = get_name())) {
@ -630,10 +622,7 @@ static bool setup_myself(void) {
myself->connection = new_connection(); myself->connection = new_connection();
myself->name = name; myself->name = name;
myself->connection->name = xstrdup(name); myself->connection->name = xstrdup(name);
xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name); read_host_config(config_tree, name);
read_config_options(config_tree, name);
read_config_file(config_tree, fname);
free(fname);
if(!get_config_string(lookup_config(config_tree, "Port"), &myport)) if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
myport = xstrdup("655"); myport = xstrdup("655");