/*
net.c -- most of the network code
- Copyright (C) 1998-2002 Ivo Timmermans <ivo@o2w.nl>,
- 2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-2003 Ivo Timmermans <ivo@o2w.nl>,
+ 2000-2003 Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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.188 2003/07/06 22:11:32 guus Exp $
+ $Id: net.c,v 1.35.4.194 2003/07/29 10:50:15 guus Exp $
*/
-#include "config.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
- and FreeBSD wants these lines below the rest. */
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <net/if.h>
-#ifdef HAVE_NETINET_IN_SYSTM_H
-#include <netinet/in_systm.h>
-#endif
-#include <netinet/in.h>
-#ifdef HAVE_NETINET_IP_H
-#include <netinet/ip.h>
-#endif
-#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h>
-#endif
+#include "system.h"
#include <openssl/rand.h>
-#include <utils.h>
-#include <xalloc.h>
-#include <avl_tree.h>
-#include <list.h>
-
+#include "utils.h"
+#include "avl_tree.h"
#include "conf.h"
#include "connection.h"
+#include "device.h"
+#include "event.h"
+#include "graph.h"
+#include "logger.h"
#include "meta.h"
#include "net.h"
#include "netutl.h"
#include "process.h"
#include "protocol.h"
-#include "subnet.h"
-#include "graph.h"
-#include "process.h"
#include "route.h"
-#include "device.h"
-#include "event.h"
-#include "logger.h"
-
-#include "system.h"
+#include "subnet.h"
-int do_purge = 0;
-int sighup = 0;
-int sigalrm = 0;
+bool do_purge = false;
time_t now = 0;
/* Purge edges and subnets of unreachable nodes. Use carefully. */
-void purge(void)
+static void purge(void)
{
avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
cp();
- logger(DEBUG_PROTOCOL, LOG_DEBUG, _("Purging unreachable nodes"));
+ ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes"));
for(nnode = node_tree->head; nnode; nnode = nnext) {
nnext = nnode->next;
n = (node_t *) nnode->data;
if(!n->status.reachable) {
- logger(DEBUG_SCARY_THINGS, LOG_DEBUG, _("Purging node %s (%s)"), n->name,
+ ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name,
n->hostname);
for(snode = n->subnet_tree->head; snode; snode = snext) {
put all file descriptors in an fd_set array
While we're at it, purge stuff that needs to be removed.
*/
-int build_fdset(fd_set * fs)
+static int build_fdset(fd_set * fs)
{
avl_node_t *node, *next;
connection_t *c;
/*
Terminate a connection:
- Close the socket
- - Remove associated edge and tell other connections about it if report = 1
+ - Remove associated edge and tell other connections about it if report = true
- Check if we need to retry making an outgoing connection
- Deactivate the host
*/
-void terminate_connection(connection_t *c, int report)
+void terminate_connection(connection_t *c, bool report)
{
cp();
if(c->status.remove)
return;
- logger(DEBUG_CONNECTIONS, LOG_NOTICE, _("Closing connection with %s (%s)"),
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
c->name, c->hostname);
- c->status.remove = 1;
- c->status.active = 0;
+ c->status.remove = true;
+ c->status.active = false;
if(c->node)
c->node->connection = NULL;
end does not reply in time, we consider them dead
and close the connection.
*/
-void check_dead_connections(void)
+static void check_dead_connections(void)
{
avl_node_t *node, *next;
connection_t *c;
if(c->last_ping_time + pingtimeout < now) {
if(c->status.active) {
if(c->status.pinged) {
- logger(DEBUG_CONNECTIONS, LOG_INFO, _("%s (%s) didn't respond to PING"),
+ ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"),
c->name, c->hostname);
- c->status.timeout = 1;
- terminate_connection(c, 1);
+ c->status.timeout = true;
+ terminate_connection(c, true);
} else {
send_ping(c);
}
} else {
if(c->status.remove) {
- logger(DEBUG_ALWAYS, LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
- c->name, c->hostname, c->status);
+ logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
+ c->name, c->hostname, *(uint32_t *)&c->status);
connection_del(c);
continue;
}
- logger(DEBUG_CONNECTIONS, LOG_WARNING, _("Timeout from %s (%s) during authentication"),
+ ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
c->name, c->hostname);
- terminate_connection(c, 0);
+ terminate_connection(c, false);
}
}
}
check all connections to see if anything
happened on their sockets
*/
-void check_network_activity(fd_set * f)
+static void check_network_activity(fd_set * f)
{
connection_t *c;
avl_node_t *node;
cp();
if(FD_ISSET(device_fd, f)) {
- if(!read_packet(&packet))
+ if(read_packet(&packet))
route_outgoing(&packet);
}
if(FD_ISSET(c->socket, f)) {
if(c->status.connecting) {
- c->status.connecting = 0;
+ c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
if(!result)
finish_connecting(c);
else {
- logger(DEBUG_CONNECTIONS, LOG_DEBUG,
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG,
_("Error while connecting to %s (%s): %s"),
c->name, c->hostname, strerror(result));
close(c->socket);
}
}
- if(receive_meta(c) < 0) {
+ if(!receive_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
if(r < 0) {
if(errno != EINTR && errno != EAGAIN) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Error while waiting for input: %s"),
+ logger(LOG_ERR, _("Error while waiting for input: %s"),
strerror(errno));
cp_trace();
dump_connections();
if(do_purge) {
purge();
- do_purge = 0;
+ do_purge = false;
}
/* Let's check if everybody is still alive */
/* Should we regenerate our key? */
if(keyexpires < now) {
- logger(DEBUG_STATUS, LOG_INFO, _("Regenerating symmetric key"));
+ 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(sigalrm) {
- logger(DEBUG_ALWAYS, LOG_INFO, _("Flushing event queue"));
+ logger(LOG_INFO, _("Flushing event queue"));
while(event_tree->head) {
event = (event_t *) event_tree->head->data;
event->handler(event->data);
event_del(event);
}
- sigalrm = 0;
+ sigalrm = false;
}
if(sighup) {
char *fname;
struct stat s;
- sighup = 0;
+ sighup = false;
/* Reread our own configuration file */
exit_configuration(&config_tree);
init_configuration(&config_tree);
- if(read_server_config()) {
- logger(DEBUG_ALWAYS, LOG_ERR, _("Unable to reread configuration file, exitting."));
+ if(!read_server_config()) {
+ logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
exit(1);
}
projects / tinc / blobdiff