projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use read_host_config() where appropriate.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
488cb7c
..
cb14c51
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-52,30
+52,28
@@
char *proxyuser;
char *proxypass;
proxytype_t proxytype;
int autoconnect;
char *proxypass;
proxytype_t proxytype;
int autoconnect;
+bool disablebuggypeers;
char *scriptinterpreter;
char *scriptextension;
bool node_read_ecdsa_public_key(node_t *n) {
char *scriptinterpreter;
char *scriptextension;
bool node_read_ecdsa_public_key(node_t *n) {
- if(ecdsa_active(
&
n->ecdsa))
+ if(ecdsa_active(n->ecdsa))
return true;
splay_tree_t *config_tree;
FILE *fp;
return true;
splay_tree_t *config_tree;
FILE *fp;
- char *pubname = NULL
, *hcfname = NULL
;
+ char *pubname = NULL;
char *p;
char *p;
- bool result = false;
-
- xasprintf(&hcfname, "%s" SLASH "hosts" SLASH "%s", confbase, n->name);
init_configuration(&config_tree);
init_configuration(&config_tree);
- if(!read_
config_file(config_tree, hcf
name))
+ if(!read_
host_config(config_tree, n->
name))
goto exit;
/* First, check for simple ECDSAPublicKey statement */
if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
goto exit;
/* First, check for simple ECDSAPublicKey statement */
if(get_config_string(lookup_config(config_tree, "ECDSAPublicKey"), &p)) {
-
result = ecdsa_set_base64_public_key(&n->ecdsa,
p);
+
n->ecdsa = ecdsa_set_base64_public_key(
p);
free(p);
goto exit;
}
free(p);
goto exit;
}
@@
-92,28
+90,35
@@
bool node_read_ecdsa_public_key(node_t *n) {
goto exit;
}
goto exit;
}
-
result = ecdsa_read_pem_public_key(&n->ecdsa,
fp);
+
n->ecdsa = ecdsa_read_pem_public_key(
fp);
fclose(fp);
exit:
exit_configuration(&config_tree);
fclose(fp);
exit:
exit_configuration(&config_tree);
- free(hcfname);
free(pubname);
free(pubname);
- return
result
;
+ return
n->ecdsa
;
}
bool read_ecdsa_public_key(connection_t *c) {
}
bool read_ecdsa_public_key(connection_t *c) {
+ if(ecdsa_active(c->ecdsa))
+ return true;
+
FILE *fp;
char *fname;
char *p;
FILE *fp;
char *fname;
char *p;
- bool result;
+
+ if(!c->config_tree) {
+ init_configuration(&c->config_tree);
+ if(!read_host_config(c->config_tree, c->name))
+ return false;
+ }
/* First, check for simple ECDSAPublicKey statement */
if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
/* First, check for simple ECDSAPublicKey statement */
if(get_config_string(lookup_config(c->config_tree, "ECDSAPublicKey"), &p)) {
-
result = ecdsa_set_base64_public_key(&c->ecdsa,
p);
+
c->ecdsa = ecdsa_set_base64_public_key(
p);
free(p);
free(p);
- return
result
;
+ return
c->ecdsa
;
}
/* Else, check for ECDSAPublicKeyFile statement and read it */
}
/* Else, check for ECDSAPublicKeyFile statement and read it */
@@
-130,27
+135,29
@@
bool read_ecdsa_public_key(connection_t *c) {
return false;
}
return false;
}
-
result = ecdsa_read_pem_public_key(&c->ecdsa,
fp);
+
c->ecdsa = ecdsa_read_pem_public_key(
fp);
fclose(fp);
fclose(fp);
- if(!
result
)
+ if(!
c->ecdsa
)
logger(DEBUG_ALWAYS, LOG_ERR, "Parsing ECDSA public key file `%s' failed.", fname);
free(fname);
logger(DEBUG_ALWAYS, LOG_ERR, "Parsing ECDSA public key file `%s' failed.", fname);
free(fname);
- return
result
;
+ return
c->ecdsa
;
}
bool read_rsa_public_key(connection_t *c) {
}
bool read_rsa_public_key(connection_t *c) {
+ if(ecdsa_active(c->ecdsa))
+ return true;
+
FILE *fp;
char *fname;
char *n;
FILE *fp;
char *fname;
char *n;
- bool result;
/* First, check for simple PublicKey statement */
if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
/* First, check for simple PublicKey statement */
if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
-
result = rsa_set_hex_public_key(&c->rsa,
n, "FFFF");
+
c->rsa = rsa_set_hex_public_key(
n, "FFFF");
free(n);
free(n);
- return
result
;
+ return
c->rsa
;
}
/* Else, check for PublicKeyFile statement and read it */
}
/* Else, check for PublicKeyFile statement and read it */
@@
-166,19
+173,18
@@
bool read_rsa_public_key(connection_t *c) {
return false;
}
return false;
}
-
result = rsa_read_pem_public_key(&c->rsa,
fp);
+
c->rsa = rsa_read_pem_public_key(
fp);
fclose(fp);
fclose(fp);
- if(!
result
)
+ if(!
c->rsa
)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
free(fname);
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
free(fname);
- return
result
;
+ return
c->rsa
;
}
static bool read_ecdsa_private_key(void) {
FILE *fp;
char *fname;
}
static bool read_ecdsa_private_key(void) {
FILE *fp;
char *fname;
- bool result;
/* Check for PrivateKeyFile statement and read it */
/* Check for PrivateKeyFile statement and read it */
@@
-189,6
+195,8
@@
static bool read_ecdsa_private_key(void) {
if(!fp) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
if(!fp) {
logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file `%s': %s", fname, strerror(errno));
+ if(errno == ENOENT)
+ logger(DEBUG_ALWAYS, LOG_INFO, "Create an ECDSA keypair with `tinc -n %s generate-ecdsa-keys'.", netname ?: ".");
free(fname);
return false;
}
free(fname);
return false;
}
@@
-206,20
+214,19
@@
static bool read_ecdsa_private_key(void) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
#endif
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for ECDSA private key file `%s'!", fname);
#endif
-
result = ecdsa_read_pem_private_key(&myself->connection->ecdsa,
fp);
+
myself->connection->ecdsa = ecdsa_read_pem_private_key(
fp);
fclose(fp);
fclose(fp);
- if(!
result
)
+ if(!
myself->connection->ecdsa
)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
- return
result
;
+ return
myself->connection->ecdsa
;
}
static bool read_rsa_private_key(void) {
FILE *fp;
char *fname;
char *n, *d;
}
static bool read_rsa_private_key(void) {
FILE *fp;
char *fname;
char *n, *d;
- bool result;
/* First, check for simple PrivateKey statement */
/* First, check for simple PrivateKey statement */
@@
-229,10
+236,10
@@
static bool read_rsa_private_key(void) {
free(d);
return false;
}
free(d);
return false;
}
-
result = rsa_set_hex_private_key(&myself->connection->rsa,
n, "FFFF", d);
+
myself->connection->rsa = rsa_set_hex_private_key(
n, "FFFF", d);
free(n);
free(d);
free(n);
free(d);
- return
result
;
+ return
myself->connection->rsa
;
}
/* Else, check for PrivateKeyFile statement and read it */
}
/* Else, check for PrivateKeyFile statement and read it */
@@
-262,13
+269,13
@@
static bool read_rsa_private_key(void) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
#endif
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
#endif
-
result = rsa_read_pem_private_key(&myself->connection->rsa,
fp);
+
myself->connection->rsa = rsa_read_pem_private_key(
fp);
fclose(fp);
fclose(fp);
- if(!
result
)
+ if(!
myself->connection->rsa
)
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
logger(DEBUG_ALWAYS, LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
free(fname);
- return
result
;
+ return
myself->connection->rsa
;
}
static timeout_t keyexpire_timeout;
}
static timeout_t keyexpire_timeout;
@@
-309,14
+316,10
@@
void load_all_subnets(void) {
// continue;
#endif
// continue;
#endif
- char *fname;
- xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, ent->d_name);
-
splay_tree_t *config_tree;
init_configuration(&config_tree);
read_config_options(config_tree, ent->d_name);
splay_tree_t *config_tree;
init_configuration(&config_tree);
read_config_options(config_tree, ent->d_name);
- read_config_file(config_tree, fname);
- free(fname);
+ read_host_config(config_tree, ent->d_name);
if(!n) {
n = new_node();
if(!n) {
n = new_node();
@@
-598,6
+601,8
@@
bool setup_myself_reloadable(void) {
get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
get_config_int(lookup_config(config_tree, "AutoConnect"), &autoconnect);
+ get_config_bool(lookup_config(config_tree, "DisableBuggyPeers"), &disablebuggypeers);
+
return true;
}
return true;
}
@@
-606,7
+611,6
@@
bool setup_myself_reloadable(void) {
*/
static bool setup_myself(void) {
char *name, *hostname, *cipher, *digest, *type;
*/
static bool setup_myself(void) {
char *name, *hostname, *cipher, *digest, *type;
- char *fname = NULL;
char *address = NULL;
if(!(name = get_name())) {
char *address = NULL;
if(!(name = get_name())) {
@@
-618,10
+622,7
@@
static bool setup_myself(void) {
myself->connection = new_connection();
myself->name = name;
myself->connection->name = xstrdup(name);
myself->connection = new_connection();
myself->name = name;
myself->connection->name = xstrdup(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_host_config(config_tree, name);
if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
myport = xstrdup("655");
if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
myport = xstrdup("655");
@@
-704,7
+705,7
@@
static bool setup_myself(void) {
if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
cipher = xstrdup("blowfish");
if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
cipher = xstrdup("blowfish");
- if(!
cipher_open_by_name(&myself->incipher, cipher
)) {
+ if(!
(myself->incipher = cipher_open_by_name(cipher)
)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized cipher type!");
return false;
}
@@
-727,7
+728,7
@@
static bool setup_myself(void) {
if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
digest = xstrdup("sha1");
if(!get_config_string(lookup_config(config_tree, "Digest"), &digest))
digest = xstrdup("sha1");
- if(!
digest_open_by_name(&myself->indigest, digest, maclength
)) {
+ if(!
(myself->indigest = digest_open_by_name(digest, maclength)
)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "Unrecognized digest type!");
return false;
}