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.192 2003/07/22 20:55:19 guus Exp $
+ $Id: net.c,v 1.35.4.196 2003/08/02 20:50:38 guus Exp $
*/
#include "system.h"
#include "protocol.h"
#include "route.h"
#include "subnet.h"
+#include "xalloc.h"
bool do_purge = false;
+volatile bool running;
time_t now = 0;
c->node->connection = NULL;
if(c->socket)
- close(c->socket);
+ closesocket(c->socket);
if(c->edge) {
if(report)
} else {
if(c->status.remove) {
logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
- c->name, c->hostname, c->status);
+ c->name, c->hostname, *(uint32_t *)&c->status);
connection_del(c);
continue;
}
ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
- close(c->socket);
+ closesocket(c->socket);
do_outgoing_connection(c);
continue;
}
/*
this is where it all happens...
*/
-void main_loop(void)
+int main_loop(void)
{
fd_set fset;
struct timeval tv;
last_config_check = now;
srand(now);
- for(;;) {
+ running = true;
+
+ while(running) {
now = time(NULL);
tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */
strerror(errno));
cp_trace();
dump_connections();
- return;
+ return 1;
}
continue;
ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
RAND_pseudo_bytes(myself->key, myself->keylength);
- EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+ if(myself->cipher)
+ EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
send_key_changed(broadcast, myself);
keyexpires = now + keylifetime;
}
if(!read_server_config()) {
logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
- exit(1);
+ return 1;
}
/* Close connections to hosts that have a changed or deleted host config file */
/* Try to make outgoing connections */
try_outgoing_connections();
-
- continue;
}
}
+
+ return 0;
}