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.1 2002/02/18 16:25:16 guus Exp $
+ $Id: net_setup.c,v 1.1.2.16 2002/06/02 16:06:33 guus Exp $
*/
#include "config.h"
free(fname);
c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
fclose(fp);
- if(!c->rsa_key)
+ if(c->rsa_key)
+ return 0; /* Woohoo. */
+
+ /* If it fails, try PEM_read_RSA_PUBKEY. */
+ if((fp = fopen(fname, "r")) == NULL)
{
- syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
+ syslog(LOG_ERR, _("Error reading RSA public key file `%s': %s"),
fname, strerror(errno));
+ free(fname);
return -1;
}
- return 0;
+ free(fname);
+ c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
+ fclose(fp);
+ if(c->rsa_key)
+ return 0;
+
+ syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %s"),
+ fname, strerror(errno));
+ return -1;
}
else
{
if(c->rsa_key)
return 0;
- else
+
+ /* Try again with PEM_read_RSA_PUBKEY. */
+
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ if((fp = fopen(fname, "r")))
{
- syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
- return -1;
+ c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
+ fclose(fp);
}
+
+ free(fname);
+
+ if(c->rsa_key)
+ return 0;
+
+ syslog(LOG_ERR, _("No public key for %s specified!"), c->name);
+ return -1;
}
int read_rsa_private_key(void)
return -1;
}
-int check_rsa_key(RSA *rsa_key)
-{
- char *test1, *test2, *test3;
-cp
- if(rsa_key->p && rsa_key->q)
- {
- if(RSA_check_key(rsa_key) != 1)
- return -1;
- }
- else
- {
- test1 = xmalloc(RSA_size(rsa_key));
- test2 = xmalloc(RSA_size(rsa_key));
- test3 = xmalloc(RSA_size(rsa_key));
-
- if(RSA_public_encrypt(RSA_size(rsa_key), test1, test2, rsa_key, RSA_NO_PADDING) != RSA_size(rsa_key))
- return -1;
-
- if(RSA_private_decrypt(RSA_size(rsa_key), test2, test3, rsa_key, RSA_NO_PADDING) != RSA_size(rsa_key))
- return -1;
-
- if(memcmp(test1, test3, RSA_size(rsa_key)))
- return -1;
- }
-cp
- return 0;
-}
-
/*
Configure node_t myself and set up the local sockets (listen only)
*/
{
config_t *cfg;
subnet_t *subnet;
- char *name, *mode, *afname, *cipher, *digest;
- struct addrinfo hint, *ai;
- int choice;
+ char *name, *hostname, *mode, *afname, *cipher, *digest;
+ char *address = NULL;
+ struct addrinfo hint, *ai, *aip;
+ int choice, err;
cp
myself = new_node();
myself->connection = new_connection();
return -1;
cp
- if(check_rsa_key(myself->connection->rsa_key))
- {
- syslog(LOG_ERR, _("Invalid public/private keypair!"));
- return -1;
- }
-
if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
asprintf(&myport, "655");
else
routing_mode = RMODE_ROUTER;
+ get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+#if !defined(SOL_IP) || !defined(IP_TOS)
+ if(priorityinheritance)
+ syslog(LOG_WARNING, _("PriorityInheritance not supported on this platform"));
+#endif
+
+ if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
+ macexpire= 600;
+
if(get_config_int(lookup_config(myself->connection->config_tree, "MaxTimeout"), &maxtimeout))
{
if(maxtimeout <= 0)
else
myself->keylength = 1;
+ myself->connection->outcipher = EVP_bf_ofb();
+
myself->key = (char *)xmalloc(myself->keylength);
RAND_pseudo_bytes(myself->key, myself->keylength);
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
- keyexpires = time(NULL) + keylifetime;
+ keyexpires = now + keylifetime;
/* Check if we want to use message authentication codes... */
else
myself->digest = EVP_sha1();
+ myself->connection->outdigest = EVP_sha1();
+
if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->maclength))
{
if(myself->digest)
else
myself->maclength = 4;
+ myself->connection->outmaclength = 0;
+
/* Compression */
if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->compression))
}
else
myself->compression = 0;
+
+ myself->connection->outcompression = 0;
cp
/* Done */
myself->nexthop = myself;
myself->via = myself;
myself->status.active = 1;
+ myself->status.reachable = 1;
node_add(myself);
graph();
cp
/* Open sockets */
- hint.ai_family = (addressfamily == AF_UNSPEC)?AF_INET6:addressfamily;
+ memset(&hint, 0, sizeof(hint));
+
+ get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
+
+ hint.ai_family = addressfamily;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = IPPROTO_TCP;
hint.ai_flags = AI_PASSIVE;
- if(getaddrinfo(NULL, myport, &hint, &ai) || !ai)
+ if((err = getaddrinfo(address, myport, &hint, &ai)) || !ai)
{
- syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", strerror(errno));
+ syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", gai_strerror(err));
return -1;
}
- if((tcp_socket = setup_listen_socket((sockaddr_t *)ai->ai_addr)) < 0)
+ for(aip = ai; aip; aip = aip->ai_next)
{
- syslog(LOG_ERR, _("Unable to set up a listening TCP socket!"));
- return -1;
- }
+ if((listen_socket[listen_sockets].tcp = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+ continue;
- if((udp_socket = setup_vpn_in_socket((sockaddr_t *)ai->ai_addr)) < 0)
- {
- syslog(LOG_ERR, _("Unable to set up a listening UDP socket!"));
- return -1;
+ if((listen_socket[listen_sockets].udp = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
+ continue;
+
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ {
+ hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr);
+ syslog(LOG_NOTICE, _("Listening on %s"), hostname);
+ free(hostname);
+ }
+
+ listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
+ listen_sockets++;
}
freeaddrinfo(ai);
- syslog(LOG_NOTICE, _("Ready: listening on port %s"), myport);
+ if(listen_sockets)
+ syslog(LOG_NOTICE, _("Ready"));
+ else
+ {
+ syslog(LOG_ERR, _("Unable to create any listening socket!"));
+ return -1;
+ }
cp
return 0;
}
int setup_network_connections(void)
{
cp
+ now = time(NULL);
+
init_connections();
init_subnets();
init_nodes();
init_edges();
init_events();
+ init_requests();
if(get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
{
{
avl_node_t *node, *next;
connection_t *c;
+ int i;
cp
for(node = connection_tree->head; node; node = next)
{
next = node->next;
c = (connection_t *)node->data;
if(c->outgoing)
- free(c->outgoing->name), free(c->outgoing);
+ free(c->outgoing->name), free(c->outgoing), c->outgoing = NULL;
terminate_connection(c, 0);
}
if(myself && myself->connection)
terminate_connection(myself->connection, 0);
- close(udp_socket);
- close(tcp_socket);
+ for(i = 0; i < listen_sockets; i++)
+ {
+ close(listen_socket[i].tcp);
+ close(listen_socket[i].udp);
+ }
+ exit_requests();
exit_events();
exit_edges();
exit_subnets();
projects / tinc / blobdiff