projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Comment out old public/private keys when generating new ones.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
168fd1f
..
ecffed9
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-62,7
+62,7
@@
bool node_read_ecdsa_public_key(node_t *n) {
char *p;
bool result = false;
char *p;
bool result = false;
- xasprintf(&fname, "%s
/hosts/
%s", confbase, n->name);
+ xasprintf(&fname, "%s
" SLASH "hosts" SLASH "
%s", confbase, n->name);
init_configuration(&config_tree);
if(!read_config_file(config_tree, fname))
init_configuration(&config_tree);
if(!read_config_file(config_tree, fname))
@@
-81,7
+81,7
@@
bool node_read_ecdsa_public_key(node_t *n) {
free(fname);
if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &fname))
free(fname);
if(!get_config_string(lookup_config(config_tree, "ECDSAPublicKeyFile"), &fname))
- xasprintf(&fname, "%s
/hosts/
%s", confbase, n->name);
+ xasprintf(&fname, "%s
" SLASH "hosts" SLASH "
%s", confbase, n->name);
fp = fopen(fname, "r");
fp = fopen(fname, "r");
@@
-116,7
+116,7
@@
bool read_ecdsa_public_key(connection_t *c) {
/* Else, check for ECDSAPublicKeyFile statement and read it */
if(!get_config_string(lookup_config(c->config_tree, "ECDSAPublicKeyFile"), &fname))
/* 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");
fp = fopen(fname, "r");
@@
-153,7
+153,7
@@
bool read_rsa_public_key(connection_t *c) {
/* Else, check for PublicKeyFile statement and read it */
if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
/* 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");
fp = fopen(fname, "r");
@@
-180,7
+180,7
@@
static bool read_ecdsa_private_key(void) {
/* Check for PrivateKeyFile statement and read it */
if(!get_config_string(lookup_config(config_tree, "ECDSAPrivateKeyFile"), &fname))
/* 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");
fp = fopen(fname, "r");
@@
-235,7
+235,7
@@
static bool read_rsa_private_key(void) {
/* Else, check for PrivateKeyFile statement and read it */
if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
/* 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");
fp = fopen(fname, "r");
@@
-299,7
+299,7
@@
void load_all_subnets(void) {
subnet_t *s, *s2;
node_t *n;
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));
dir = opendir(dname);
if(!dir) {
logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
@@
-317,7
+317,7
@@
void load_all_subnets(void) {
// continue;
#endif
// 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);
init_configuration(&config_tree);
read_config_options(config_tree, ent->d_name);
read_config_file(config_tree, fname);
@@
-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;
@@
-590,7
+593,7
@@
static bool setup_myself(void) {
myself->name = name;
myself->connection->name = xstrdup(name);
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);
read_config_options(config_tree, name);
read_config_file(config_tree, fname);
free(fname);
@@
-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();