projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unmap v4mapped sockaddrs.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
a1b1705
..
acba5ad
100644
(file)
--- a/
src/net.c
+++ b/
src/net.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.c,v 1.35.4.16
0 2002/03/01 14:09:31
guus Exp $
+ $Id: net.c,v 1.35.4.16
3 2002/03/11 11:45:12
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-369,6
+369,12
@@
cp
tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
tv.tv_usec = 0;
tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
tv.tv_usec = 0;
+ if(do_prune)
+ {
+ prune_connections();
+ do_prune = 0;
+ }
+
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
build_fdset(&fset);
if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0)
@@
-383,13
+389,7
@@
cp
if(r > 0)
check_network_activity(&fset);
if(r > 0)
check_network_activity(&fset);
- if(do_prune)
- {
- prune_connections();
- do_prune = 0;
- }
-
- if(do_purge)
+ if(do_purge)
{
purge();
do_purge = 0;
{
purge();
do_purge = 0;
@@
-402,7
+402,7
@@
cp
check_dead_connections();
last_ping_check = now;
check_dead_connections();
last_ping_check = now;
- if(routing_mode
!= RMODE_ROUTER
)
+ if(routing_mode
== RMODE_SWITCH
)
age_mac();
/* Should we regenerate our key? */
age_mac();
/* Should we regenerate our key? */
@@
-444,14
+444,14
@@
cp
close_network_connections();
exit_configuration(&config_tree);
close_network_connections();
exit_configuration(&config_tree);
- syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds"));
+ syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds
...
"));
sleep(5);
init_configuration(&config_tree);
if(read_server_config())
{
sleep(5);
init_configuration(&config_tree);
if(read_server_config())
{
- syslog(LOG_ERR, _("Unable to reread configuration file, exit
ing
"));
+ syslog(LOG_ERR, _("Unable to reread configuration file, exit
ting.
"));
exit(1);
}
exit(1);
}