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.161 2002/03/01 14:25:10 guus Exp $
+ $Id: net.c,v 1.35.4.164 2002/03/18 22:47:20 guus Exp $
*/
#include "config.h"
for(i = 0; i < listen_sockets; i++)
{
- FD_SET(tcp_socket[i], fs);
- FD_SET(udp_socket[i], fs);
+ FD_SET(listen_socket[i].tcp, fs);
+ FD_SET(listen_socket[i].udp, fs);
}
FD_SET(device_fd, fs);
for(i = 0; i < listen_sockets; i++)
{
- if(FD_ISSET(udp_socket[i], f))
- handle_incoming_vpn_data(udp_socket[i]);
- if(FD_ISSET(tcp_socket[i], f))
- handle_new_meta_connection(tcp_socket[i]);
+ if(FD_ISSET(listen_socket[i].udp, f))
+ handle_incoming_vpn_data(listen_socket[i].udp);
+ if(FD_ISSET(listen_socket[i].tcp, f))
+ handle_new_meta_connection(listen_socket[i].tcp);
}
for(node = connection_tree->head; node; node = node->next)
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;
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);
}