projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass index into listen_socket[] to handle_incoming_vpn_data().
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
279feae
..
299e372
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-1,7
+1,7
@@
/*
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
/*
net_setup.c -- Setup.
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-201
1
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2010 Brandon Black <blblack@gmail.com>
2006 Scott Lamb <slamb@slamb.org>
2010 Brandon Black <blblack@gmail.com>
@@
-397,6
+397,8
@@
static bool setup_myself(void) {
myself->options |= OPTION_CLAMP_MSS;
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
myself->options |= OPTION_CLAMP_MSS;
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
+ get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
+ get_config_bool(lookup_config(config_tree, "Broadcast"), &broadcast);
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
#if !defined(SOL_IP) || !defined(IP_TOS)
if(priorityinheritance)
@@
-540,6
+542,8
@@
static bool setup_myself(void) {
/* Open device */
/* Open device */
+ devops = os_devops;
+
if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
if(!strcasecmp(type, "dummy"))
devops = dummy_devops;
if(get_config_string(lookup_config(config_tree, "DeviceType"), &type)) {
if(!strcasecmp(type, "dummy"))
devops = dummy_devops;
@@
-553,12
+557,6
@@
static bool setup_myself(void) {
else if(!strcasecmp(type, "vde"))
devops = vde_devops;
#endif
else if(!strcasecmp(type, "vde"))
devops = vde_devops;
#endif
- else {
- logger(LOG_ERR, "Unknown device type %s!", type);
- return false;
- }
- } else {
- devops = os_devops;
}
if(!devops.setup())
}
if(!devops.setup())
@@
-582,6
+580,7
@@
static bool setup_myself(void) {
/* Open sockets */
/* Open sockets */
+ listen_sockets = 0;
cfg = lookup_config(config_tree, "BindToAddress");
do {
cfg = lookup_config(config_tree, "BindToAddress");
do {
@@
-603,9
+602,12
@@
static bool setup_myself(void) {
return false;
}
return false;
}
- listen_sockets = 0;
-
for(aip = ai; aip; aip = aip->ai_next) {
for(aip = ai; aip; aip = aip->ai_next) {
+ if(listen_sockets >= MAXSOCKETS) {
+ logger(LOG_ERR, "Too many listening sockets");
+ return false;
+ }
+
listen_socket[listen_sockets].tcp =
setup_listen_socket((sockaddr_t *) aip->ai_addr);
listen_socket[listen_sockets].tcp =
setup_listen_socket((sockaddr_t *) aip->ai_addr);