char *proxypass;
proxytype_t proxytype;
+char *scriptinterpreter;
+char *scriptextension;
+
bool node_read_ecdsa_public_key(node_t *n) {
if(ecdsa_active(&n->ecdsa))
return true;
splay_tree_t *config_tree;
FILE *fp;
- char *fname;
+ char *pubname = NULL, *hcfname = NULL;
char *p;
bool result = false;
- xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
+ xasprintf(&hcfname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
init_configuration(&config_tree);
- if(!read_config_file(config_tree, fname))
+ if(!read_config_file(config_tree, hcfname))
goto exit;
/* First, check for simple ECDSAPublicKey statement */
/* Else, check for ECDSAPublicKeyFile statement and read it */
- free(fname);
+ if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &pubname))
+ xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
- if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &fname))
- xasprintf(&fname, "%s/hosts/%s", confbase, n->name);
-
- fp = fopen(fname, "r");
+ fp = fopen(pubname, "r");
if(!fp) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", fname, strerror(errno));
+ logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA public key file `%s': %s", pubname, strerror(errno));
goto exit;
}
exit:
exit_configuration(&config_tree);
- free(fname);
+ free(hcfname);
+ free(pubname);
return result;
}
/* Else, check for ECDSAPublicKeyFile statement and read it */
if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
- xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
fp = fopen(fname, "r");
/* Else, check for PublicKeyFile statement and read it */
if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
- xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
fp = fopen(fname, "r");
/* Check for PrivateKeyFile statement and read it */
if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
- xasprintf(&fname, "%s/ecdsa_key.priv", confbase);
+ xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", confbase);
fp = fopen(fname, "r");
result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
free(n);
free(d);
- return true;
+ return result;
}
/* Else, check for PrivateKeyFile statement and read it */
if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
- xasprintf(&fname, "%s/rsa_key.priv", confbase);
+ xasprintf(&fname, "%s" SLASH "rsa_key.priv", confbase);
fp = fopen(fname, "r");
subnet_t *s, *s2;
node_t *n;
- xasprintf(&dname, "%s/hosts", confbase);
+ xasprintf(&dname, "%s" SLASH "hosts", confbase);
dir = opendir(dname);
if(!dir) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
// continue;
#endif
- xasprintf(&fname, "%s/hosts/%s", confbase, ent->d_name);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
init_configuration(&config_tree);
read_config_options(config_tree, ent->d_name);
read_config_file(config_tree, fname);
bool setup_myself_reloadable(void) {
char *proxy = NULL;
- char *mode = NULL;
+ char *rmode = NULL;
+ char *fmode = NULL;
+ char *bmode = NULL;
char *afname = NULL;
char *space;
bool choice;
+ free(scriptinterpreter);
+ scriptinterpreter = NULL;
+ get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
+
+
+ free(scriptextension);
+ if(!get_config_string(lookup_config(config_tree, "ScriptsExtension"), &scriptextension))
+#ifdef HAVE_MINGW
+ scriptextension = xstrdup(".bat");
+#else
+ scriptextension = xstrdup("");
+#endif
+
get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
if(proxy) {
if((space = strchr(proxy, ' ')))
get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
- if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) {
- if(!strcasecmp(mode, "router"))
+ if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
+ if(!strcasecmp(rmode, "router"))
routing_mode = RMODE_ROUTER;
- else if(!strcasecmp(mode, "switch"))
+ else if(!strcasecmp(rmode, "switch"))
routing_mode = RMODE_SWITCH;
- else if(!strcasecmp(mode, "hub"))
+ else if(!strcasecmp(rmode, "hub"))
routing_mode = RMODE_HUB;
else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
return false;
}
- free(mode);
+ free(rmode);
}
- if(get_config_string(lookup_config(config_tree, "Forwarding"), &mode)) {
- if(!strcasecmp(mode, "off"))
+ if(get_config_string(lookup_config(config_tree, "Forwarding"), &fmode)) {
+ if(!strcasecmp(fmode, "off"))
forwarding_mode = FMODE_OFF;
- else if(!strcasecmp(mode, "internal"))
+ else if(!strcasecmp(fmode, "internal"))
forwarding_mode = FMODE_INTERNAL;
- else if(!strcasecmp(mode, "kernel"))
+ else if(!strcasecmp(fmode, "kernel"))
forwarding_mode = FMODE_KERNEL;
else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
return false;
}
- free(mode);
+ free(fmode);
}
choice = true;
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
- if(get_config_string(lookup_config(config_tree, "Broadcast"), &mode)) {
- if(!strcasecmp(mode, "no"))
+ if(get_config_string(lookup_config(config_tree, "Broadcast"), &bmode)) {
+ if(!strcasecmp(bmode, "no"))
broadcast_mode = BMODE_NONE;
- else if(!strcasecmp(mode, "yes") || !strcasecmp(mode, "mst"))
+ else if(!strcasecmp(bmode, "yes") || !strcasecmp(bmode, "mst"))
broadcast_mode = BMODE_MST;
- else if(!strcasecmp(mode, "direct"))
+ else if(!strcasecmp(bmode, "direct"))
broadcast_mode = BMODE_DIRECT;
else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid broadcast mode!");
return false;
}
- free(mode);
+ free(bmode);
}
#if !defined(SOL_IP) || !defined(IP_TOS)
int i, err;
int replaywin_int;
- myself = new_node();
- myself->connection = new_connection();
-
- myself->hostname = xstrdup("MYSELF");
- myself->connection->hostname = xstrdup("MYSELF");
-
- myself->connection->options = 0;
- myself->connection->protocol_major = PROT_MAJOR;
- myself->connection->protocol_minor = PROT_MINOR;
-
- myself->options |= PROT_MINOR << 24;
-
if(!(name = get_name())) {
logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
return false;
}
+ myself = new_node();
+ myself->connection = new_connection();
myself->name = name;
myself->connection->name = xstrdup(name);
- xasprintf(&fname, "%s/hosts/%s", confbase, name);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, 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))
+ myport = xstrdup("655");
+
+ xasprintf(&myself->hostname, "MYSELF port %s", myport);
+ myself->connection->hostname = xstrdup(myself->hostname);
+
+ myself->connection->options = 0;
+ myself->connection->protocol_major = PROT_MAJOR;
+ myself->connection->protocol_minor = PROT_MINOR;
+
+ myself->options |= PROT_MINOR << 24;
+
get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
if(experimental && !read_ecdsa_private_key())
if(!read_rsa_private_key())
return false;
- if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
- myport = xstrdup("655");
-
if(!atoi(myport)) {
struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
sockaddr_t sa;
myself->nexthop = myself;
myself->via = myself;
myself->status.reachable = true;
+ myself->last_state_change = time(NULL);
+ myself->status.sptps = experimental;
node_add(myself);
graph();
return false;
}
+ last_config_check = time(NULL);
+
return true;
}
for(node = connection_tree->head; node; node = next) {
next = node->next;
c = node->data;
+ /* Keep control connections open until the end, so they know when we really terminated */
+ if(c->status.control)
+ c->socket = -1;
c->outgoing = NULL;
terminate_connection(c, false);
}
projects / tinc / blobdiff