projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify logging, update copyrights and some minor cleanups.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
fcbc8c5
..
4c258ab
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-1,7
+1,7
@@
/*
net_setup.c -- Setup.
/*
net_setup.c -- Setup.
- Copyright (C) 1998-200
2
Ivo Timmermans <ivo@o2w.nl>,
- 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-200
3
Ivo Timmermans <ivo@o2w.nl>,
+ 2000-200
3
Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_setup.c,v 1.1.2.3
0 2003/03/28 13:41:49
guus Exp $
+ $Id: net_setup.c,v 1.1.2.3
4 2003/07/12 17:41:46
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-32,7
+32,6
@@
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <syslog.h>
#include <unistd.h>
#include <sys/ioctl.h>
/* SunOS really wants sys/socket.h BEFORE net/if.h,
#include <unistd.h>
#include <sys/ioctl.h>
/* SunOS really wants sys/socket.h BEFORE net/if.h,
@@
-72,6
+71,7
@@
#include "route.h"
#include "device.h"
#include "event.h"
#include "route.h"
#include "device.h"
#include "event.h"
+#include "logger.h"
#include "system.h"
#include "system.h"
@@
-107,7
+107,7
@@
int read_rsa_public_key(connection_t *c)
fp = fopen(fname, "r");
if(!fp) {
fp = fopen(fname, "r");
if(!fp) {
-
syslog
(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
+
logger
(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
fname, strerror(errno));
free(fname);
return -1;
fname, strerror(errno));
free(fname);
return -1;
@@
-124,7
+124,7
@@
int read_rsa_public_key(connection_t *c)
fp = fopen(fname, "r");
if(!fp) {
fp = fopen(fname, "r");
if(!fp) {
-
syslog
(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
+
logger
(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
fname, strerror(errno));
free(fname);
return -1;
fname, strerror(errno));
free(fname);
return -1;
@@
-139,7
+139,7
@@
int read_rsa_public_key(connection_t *c)
return 0;
}
return 0;
}
-
syslog
(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
+
logger
(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
fname, strerror(errno));
return -1;
} else {
fname, strerror(errno));
return -1;
} else {
@@
-179,7
+179,7
@@
int read_rsa_public_key(connection_t *c)
if(c->rsa_key)
return 0;
if(c->rsa_key)
return 0;
-
syslog
(LOG_ERR, _("No public key for %s specified!"), c->name);
+
logger
(LOG_ERR, _("No public key for %s specified!"), c->name);
return -1;
}
return -1;
}
@@
-207,7
+207,7
@@
int read_rsa_private_key(void)
fp = fopen(fname, "r");
if(!fp) {
fp = fopen(fname, "r");
if(!fp) {
-
syslog
(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
+
logger
(LOG_ERR, _("Error reading RSA private key file `%s': %s"),
fname, strerror(errno));
free(fname);
return -1;
fname, strerror(errno));
free(fname);
return -1;
@@
-219,7
+219,7
@@
int read_rsa_private_key(void)
fclose(fp);
if(!myself->connection->rsa_key) {
fclose(fp);
if(!myself->connection->rsa_key) {
-
syslog
(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
+
logger
(LOG_ERR, _("Reading RSA private key file `%s' failed: %s"),
fname, strerror(errno));
return -1;
}
fname, strerror(errno));
return -1;
}
@@
-256,12
+256,12
@@
int setup_myself(void)
myself->connection->protocol_version = PROT_CURRENT;
if(!get_config_string(lookup_config(config_tree, "Name"), &name)) { /* Not acceptable */
myself->connection->protocol_version = PROT_CURRENT;
if(!get_config_string(lookup_config(config_tree, "Name"), &name)) { /* Not acceptable */
-
syslog
(LOG_ERR, _("Name for tinc daemon required!"));
+
logger
(LOG_ERR, _("Name for tinc daemon required!"));
return -1;
}
if(check_id(name)) {
return -1;
}
if(check_id(name)) {
-
syslog
(LOG_ERR, _("Invalid name for myself!"));
+
logger
(LOG_ERR, _("Invalid name for myself!"));
free(name);
return -1;
}
free(name);
return -1;
}
@@
-273,7
+273,7
@@
int setup_myself(void)
return -1;
if(read_connection_config(myself->connection)) {
return -1;
if(read_connection_config(myself->connection)) {
-
syslog
(LOG_ERR, _("Cannot open host configuration file for myself!"));
+
logger
(LOG_ERR, _("Cannot open host configuration file for myself!"));
return -1;
}
return -1;
}
@@
-329,7
+329,7
@@
int setup_myself(void)
else if(!strcasecmp(mode, "hub"))
routing_mode = RMODE_HUB;
else {
else if(!strcasecmp(mode, "hub"))
routing_mode = RMODE_HUB;
else {
-
syslog
(LOG_ERR, _("Invalid routing mode!"));
+
logger
(LOG_ERR, _("Invalid routing mode!"));
return -1;
}
free(mode);
return -1;
}
free(mode);
@@
-340,7
+340,7
@@
int setup_myself(void)
&priorityinheritance);
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
&priorityinheritance);
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
-
syslog
(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
+
logger
(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
#endif
if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
#endif
if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@
-350,7
+350,7
@@
int setup_myself(void)
(lookup_config(myself->connection->config_tree, "MaxTimeout"),
&maxtimeout)) {
if(maxtimeout <= 0) {
(lookup_config(myself->connection->config_tree, "MaxTimeout"),
&maxtimeout)) {
if(maxtimeout <= 0) {
-
syslog
(LOG_ERR, _("Bogus maximum timeout!"));
+
logger
(LOG_ERR, _("Bogus maximum timeout!"));
return -1;
}
} else
return -1;
}
} else
@@
-364,12
+364,11
@@
int setup_myself(void)
else if(!strcasecmp(afname, "any"))
addressfamily = AF_UNSPEC;
else {
else if(!strcasecmp(afname, "any"))
addressfamily = AF_UNSPEC;
else {
-
syslog
(LOG_ERR, _("Invalid address family!"));
+
logger
(LOG_ERR, _("Invalid address family!"));
return -1;
}
free(afname);
return -1;
}
free(afname);
- } else
- addressfamily = AF_INET;
+ }
get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
get_config_bool(lookup_config(config_tree, "Hostnames"), &hostnames);
@@
-383,7
+382,7
@@
int setup_myself(void)
myself->cipher = EVP_get_cipherbyname(cipher);
if(!myself->cipher) {
myself->cipher = EVP_get_cipherbyname(cipher);
if(!myself->cipher) {
-
syslog
(LOG_ERR, _("Unrecognized cipher type!"));
+
logger
(LOG_ERR, _("Unrecognized cipher type!"));
return -1;
}
}
return -1;
}
}
@@
-406,6
+405,7
@@
int setup_myself(void)
keyexpires = now + keylifetime;
EVP_CIPHER_CTX_init(&packet_ctx);
keyexpires = now + keylifetime;
EVP_CIPHER_CTX_init(&packet_ctx);
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
/* Check if we want to use message authentication codes... */
/* Check if we want to use message authentication codes... */
@@
-417,7
+417,7
@@
int setup_myself(void)
myself->digest = EVP_get_digestbyname(digest);
if(!myself->digest) {
myself->digest = EVP_get_digestbyname(digest);
if(!myself->digest) {
-
syslog
(LOG_ERR, _("Unrecognized digest type!"));
+
logger
(LOG_ERR, _("Unrecognized digest type!"));
return -1;
}
}
return -1;
}
}
@@
-431,10
+431,10
@@
int setup_myself(void)
&myself->maclength)) {
if(myself->digest) {
if(myself->maclength > myself->digest->md_size) {
&myself->maclength)) {
if(myself->digest) {
if(myself->maclength > myself->digest->md_size) {
-
syslog
(LOG_ERR, _("MAC length exceeds size of digest!"));
+
logger
(LOG_ERR, _("MAC length exceeds size of digest!"));
return -1;
} else if(myself->maclength < 0) {
return -1;
} else if(myself->maclength < 0) {
-
syslog
(LOG_ERR, _("Bogus MAC length!"));
+
logger
(LOG_ERR, _("Bogus MAC length!"));
return -1;
}
}
return -1;
}
}
@@
-448,8
+448,8
@@
int setup_myself(void)
if(get_config_int
(lookup_config(myself->connection->config_tree, "Compression"),
&myself->compression)) {
if(get_config_int
(lookup_config(myself->connection->config_tree, "Compression"),
&myself->compression)) {
- if(myself->compression < 0 || myself->compression >
9
) {
-
syslog
(LOG_ERR, _("Bogus compression level!"));
+ if(myself->compression < 0 || myself->compression >
11
) {
+
logger
(LOG_ERR, _("Bogus compression level!"));
return -1;
}
} else
return -1;
}
} else
@@
-481,7
+481,7
@@
int setup_myself(void)
err = getaddrinfo(address, myport, &hint, &ai);
if(err || !ai) {
err = getaddrinfo(address, myport, &hint, &ai);
if(err || !ai) {
-
syslog
(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo",
+
logger
(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo",
gai_strerror(err));
return -1;
}
gai_strerror(err));
return -1;
}
@@
-501,9
+501,9
@@
int setup_myself(void)
if(listen_socket[listen_sockets].udp < 0)
continue;
if(listen_socket[listen_sockets].udp < 0)
continue;
- if
(debug_lvl >= DEBUG_
CONNECTIONS) {
+ if
debug(
CONNECTIONS) {
hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-
syslog
(LOG_NOTICE, _("Listening on %s"), hostname);
+
logger
(LOG_NOTICE, _("Listening on %s"), hostname);
free(hostname);
}
free(hostname);
}
@@
-514,9
+514,9
@@
int setup_myself(void)
freeaddrinfo(ai);
if(listen_sockets)
freeaddrinfo(ai);
if(listen_sockets)
-
syslog
(LOG_NOTICE, _("Ready"));
+
logger
(LOG_NOTICE, _("Ready"));
else {
else {
-
syslog
(LOG_ERR, _("Unable to create any listening socket!"));
+
logger
(LOG_ERR, _("Unable to create any listening socket!"));
return -1;
}
return -1;
}