projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 1.1
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
bebde4d
..
c033e22
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-229,7
+229,7
@@
static bool read_rsa_private_key(void) {
result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
free(n);
free(d);
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 */
}
/* Else, check for PrivateKeyFile statement and read it */
@@
-574,8
+574,11
@@
static bool setup_myself(void) {
myself = new_node();
myself->connection = new_connection();
myself = new_node();
myself->connection = new_connection();
- myself->hostname = xstrdup("MYSELF");
- myself->connection->hostname = xstrdup("MYSELF");
+ 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->options = 0;
myself->connection->protocol_major = PROT_MAJOR;
@@
-603,9
+606,6
@@
static bool setup_myself(void) {
if(!read_rsa_private_key())
return false;
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;
if(!atoi(myport)) {
struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
sockaddr_t sa;
@@
-709,6
+709,8
@@
static bool setup_myself(void) {
myself->nexthop = myself;
myself->via = myself;
myself->status.reachable = true;
myself->nexthop = myself;
myself->via = myself;
myself->status.reachable = true;
+ myself->last_state_change = time(NULL);
+ myself->status.sptps = experimental;
node_add(myself);
graph();
node_add(myself);
graph();
@@
-914,6
+916,8
@@
static bool setup_myself(void) {
return false;
}
return false;
}
+ last_config_check = time(NULL);
+
return true;
}
return true;
}