projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Global time_t now, so that we don't have to call time() too often.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
3699292
..
f8a8b99
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-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 2002/02/20 19:25:09
guus Exp $
+ $Id: net_setup.c,v 1.1.2.
8 2002/03/01 14:09:31
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-219,9
+219,9
@@
int setup_myself(void)
{
config_t *cfg;
subnet_t *subnet;
{
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;
+ struct addrinfo hint, *ai
, *aip
;
+ int choice
, err
;
cp
myself = new_node();
myself->connection = new_connection();
cp
myself = new_node();
myself->connection = new_connection();
@@
-326,6
+326,11
@@
cp
else
routing_mode = RMODE_ROUTER;
else
routing_mode = RMODE_ROUTER;
+ get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+
+ 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)
if(get_config_int(lookup_config(myself->connection->config_tree, "MaxTimeout"), &maxtimeout))
{
if(maxtimeout <= 0)
@@
-390,7
+395,7
@@
cp
if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
keylifetime = 3600;
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... */
/* Check if we want to use message authentication codes... */
@@
-462,45
+467,46
@@
cp
cp
/* Open sockets */
cp
/* Open sockets */
+ memset(&hint, 0, sizeof(hint));
+
hint.ai_family = addressfamily;
hint.ai_socktype = SOCK_STREAM;
hint.ai_protocol = IPPROTO_TCP;
hint.ai_flags = AI_PASSIVE;
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(NULL, 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;
}
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((tcp_socket[listen_sockets] = setup_listen_socket((sockaddr_t *)aip->ai_addr)) < 0)
+ continue;
- freeaddrinfo(ai);
+ if((udp_socket[listen_sockets] = setup_vpn_in_socket((sockaddr_t *)aip->ai_addr)) < 0)
+ continue;
- hint.ai_family = addressfamily;
- hint.ai_socktype = SOCK_DGRAM;
- hint.ai_protocol = IPPROTO_UDP;
- hint.ai_flags = AI_PASSIVE;
+ if(debug_lvl >= DEBUG_CONNECTIONS)
+ {
+ hostname = sockaddr2hostname((sockaddr_t *)aip->ai_addr);
+ syslog(LOG_NOTICE, _("Listening on %s"), hostname);
+ free(hostname);
+ }
- if(getaddrinfo(NULL, myport, &hint, &ai) || !ai)
- {
- syslog(LOG_ERR, _("System call `%s' failed: %s"), "getaddrinfo", strerror(errno));
- return -1;
+ listen_sockets++;
}
}
- if((udp_socket = setup_vpn_in_socket((sockaddr_t *)ai->ai_addr)) < 0)
+ freeaddrinfo(ai);
+
+ if(listen_sockets)
+ syslog(LOG_NOTICE, _("Ready"));
+ else
{
{
- syslog(LOG_ERR, _("Unable to
set up a listening UDP
socket!"));
+ syslog(LOG_ERR, _("Unable to
create any listening
socket!"));
return -1;
}
return -1;
}
-
- freeaddrinfo(ai);
-
- syslog(LOG_NOTICE, _("Ready: listening on port %s"), myport);
cp
return 0;
}
cp
return 0;
}
@@
-511,6
+517,8
@@
cp
int setup_network_connections(void)
{
cp
int setup_network_connections(void)
{
cp
+ now = time(NULL);
+
init_connections();
init_subnets();
init_nodes();
init_connections();
init_subnets();
init_nodes();
@@
-548,6
+556,7
@@
void close_network_connections(void)
{
avl_node_t *node, *next;
connection_t *c;
{
avl_node_t *node, *next;
connection_t *c;
+ int i;
cp
for(node = connection_tree->head; node; node = next)
{
cp
for(node = connection_tree->head; node; node = next)
{
@@
-561,8
+570,11
@@
cp
if(myself && myself->connection)
terminate_connection(myself->connection, 0);
if(myself && myself->connection)
terminate_connection(myself->connection, 0);
- close(udp_socket);
- close(tcp_socket);
+ for(i = 0; i < listen_sockets; i++)
+ {
+ close(udp_socket[i]);
+ close(tcp_socket[i]);
+ }
exit_events();
exit_edges();
exit_events();
exit_edges();