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.160 2002/03/01 14:09:31 guus Exp $
+ $Id: net.c,v 1.35.4.163 2002/03/11 11:45:12 guus Exp $
*/
#include "config.h"
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)
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;
check_dead_connections();
last_ping_check = now;
- if(routing_mode != RMODE_ROUTER)
+ if(routing_mode== RMODE_SWITCH)
age_mac();
/* Should we regenerate our key? */
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())
{
- syslog(LOG_ERR, _("Unable to reread configuration file, exiting"));
+ syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
exit(1);
}