Simplify logging, update copyrights and some minor cleanups.

[oweals/tinc.git] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index 79d3b18ab095e519c4e89d1be4431165b523c5b6..c0bd24767ad5fefae59adedeafa15fa0d6aeb5f2 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -1,7 +1,7 @@
 /*
     net_packet.c -- Handles in- and outgoing VPN packets
-    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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net_packet.c,v 1.1.2.32 2003/07/06 23:16:28 guus Exp $
+    $Id: net_packet.c,v 1.1.2.33 2003/07/12 17:41:46 guus Exp $
 */
 
 #include "config.h"
@@ -133,7 +133,7 @@ static void receive_packet(node_t *n, vpn_packet_t *packet)
 {
        cp();
 
-       logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"),
+       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"),
                           packet->len, n->name, n->hostname);
 
        route_incoming(n, packet);
@@ -159,7 +159,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
                         (char *) &inpkt->seqno, inpkt->len, hmac, NULL);
 
                if(memcmp(hmac, (char *) &inpkt->seqno + inpkt->len, myself->maclength)) {
-                       logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"),
+                       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Got unauthenticated packet from %s (%s)"),
                                           n->name, n->hostname);
                        return;
                }
@@ -188,13 +188,13 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
 
        if(inpkt->seqno != n->received_seqno + 1) {
                if(inpkt->seqno >= n->received_seqno + sizeof(n->late) * 8) {
-                       logger(DEBUG_ALWAYS, LOG_WARNING, _("Lost %d packets from %s (%s)"),
+                       logger(LOG_WARNING, _("Lost %d packets from %s (%s)"),
                                           inpkt->seqno - n->received_seqno - 1, n->name, n->hostname);
                        
                        memset(n->late, 0, sizeof(n->late));
                } else if (inpkt->seqno <= n->received_seqno) {
                        if(inpkt->seqno <= n->received_seqno - sizeof(n->late) * 8 || !(n->late[(inpkt->seqno / 8) % sizeof(n->late)] & (1 << inpkt->seqno % 8))) {
-                               logger(DEBUG_ALWAYS, LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
+                               logger(LOG_WARNING, _("Got late or replayed packet from %s (%s), seqno %d, last received %d"),
                                           n->name, n->hostname, inpkt->seqno, n->received_seqno);
                        } else
                                for(i = n->received_seqno + 1; i < inpkt->seqno; i++)
@@ -214,7 +214,7 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
                outpkt = pkt[nextpkt++];
 
                if((outpkt->len = uncompress_packet(outpkt->data, inpkt->data, inpkt->len, myself->compression)) < 0) {
-                       logger(DEBUG_ALWAYS, LOG_ERR, _("Error while uncompressing packet from %s (%s)"),
+                       logger(LOG_ERR, _("Error while uncompressing packet from %s (%s)"),
                                   n->name, n->hostname);
                        return;
                }
@@ -255,7 +255,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
        /* Make sure we have a valid key */
 
        if(!n->status.validkey) {
-               logger(DEBUG_TRAFFIC, LOG_INFO,
+               ifdebug(TRAFFIC) logger(LOG_INFO,
                                   _("No valid key known yet for %s (%s), queueing packet"),
                                   n->name, n->hostname);
 
@@ -286,7 +286,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
                outpkt = pkt[nextpkt++];
 
                if((outpkt->len = compress_packet(outpkt->data, inpkt->data, inpkt->len, n->compression)) < 0) {
-                       logger(DEBUG_ALWAYS, LOG_ERR, _("Error while compressing packet to %s (%s)"),
+                       logger(LOG_ERR, _("Error while compressing packet to %s (%s)"),
                                   n->name, n->hostname);
                        return;
                }
@@ -337,15 +337,15 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
        if(priorityinheritance && origpriority != priority
           && listen_socket[sock].sa.sa.sa_family == AF_INET) {
                priority = origpriority;
-               logger(DEBUG_TRAFFIC, LOG_DEBUG, _("Setting outgoing packet priority to %d"), priority);
+               ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Setting outgoing packet priority to %d"), priority);
                if(setsockopt(listen_socket[sock].udp, SOL_IP, IP_TOS, &priority, sizeof(priority)))    /* SO_PRIORITY doesn't seem to work */
-                       logger(DEBUG_ALWAYS, LOG_ERR, _("System call `%s' failed: %s"), "setsockopt",
+                       logger(LOG_ERR, _("System call `%s' failed: %s"), "setsockopt",
                                   strerror(errno));
        }
 #endif
 
        if((sendto(listen_socket[sock].udp, (char *) &inpkt->seqno, inpkt->len, 0, &(n->address.sa), SALEN(n->address.sa))) < 0) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name,
+               logger(LOG_ERR, _("Error sending packet to %s (%s): %s"), n->name,
                           n->hostname, strerror(errno));
                return;
        }
@@ -362,16 +362,16 @@ void send_packet(node_t *n, vpn_packet_t *packet)
 
        cp();
 
-       logger(DEBUG_TRAFFIC, LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+       ifdebug(TRAFFIC) logger(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
                           packet->len, n->name, n->hostname);
 
        if(n == myself) {
-               logger(DEBUG_TRAFFIC, LOG_NOTICE, _("Packet is looping back to us!"));
+               ifdebug(TRAFFIC) logger(LOG_NOTICE, _("Packet is looping back to us!"));
                return;
        }
 
        if(!n->status.reachable) {
-               logger(DEBUG_TRAFFIC, LOG_INFO, _("Node %s (%s) is not reachable"),
+               ifdebug(TRAFFIC) logger(LOG_INFO, _("Node %s (%s) is not reachable"),
                                   n->name, n->hostname);
                return;
        }
@@ -379,7 +379,7 @@ void send_packet(node_t *n, vpn_packet_t *packet)
        via = (n->via == myself) ? n->nexthop : n->via;
 
        if(via != n)
-               logger(DEBUG_TRAFFIC, LOG_ERR, _("Sending packet to %s via %s (%s)"),
+               ifdebug(TRAFFIC) logger(LOG_ERR, _("Sending packet to %s via %s (%s)"),
                           n->name, via->name, n->via->hostname);
 
        if((myself->options | via->options) & OPTION_TCPONLY) {
@@ -398,7 +398,7 @@ void broadcast_packet(node_t *from, vpn_packet_t *packet)
 
        cp();
 
-       logger(DEBUG_TRAFFIC, LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
+       ifdebug(TRAFFIC) logger(LOG_INFO, _("Broadcasting packet of %d bytes from %s (%s)"),
                           packet->len, from->name, from->hostname);
 
        for(node = connection_tree->head; node; node = node->next) {
@@ -415,7 +415,7 @@ void flush_queue(node_t *n)
 
        cp();
 
-       logger(DEBUG_TRAFFIC, LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname);
+       ifdebug(TRAFFIC) logger(LOG_INFO, _("Flushing queue for %s (%s)"), n->name, n->hostname);
 
        for(node = n->queue->head; node; node = next) {
                next = node->next;
@@ -436,21 +436,21 @@ void handle_incoming_vpn_data(int sock)
        cp();
 
        if(getsockopt(sock, SOL_SOCKET, SO_ERROR, &x, &l) < 0) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
+               logger(LOG_ERR, _("This is a bug: %s:%d: %d:%s"),
                           __FILE__, __LINE__, sock, strerror(errno));
                cp_trace();
                exit(1);
        }
 
        if(x) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
+               logger(LOG_ERR, _("Incoming data socket error: %s"), strerror(x));
                return;
        }
 
        pkt.len = recvfrom(sock, (char *) &pkt.seqno, MAXSIZE, 0, &from.sa, &fromlen);
 
        if(pkt.len <= 0) {
-               logger(DEBUG_ALWAYS, LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
+               logger(LOG_ERR, _("Receiving packet failed: %s"), strerror(errno));
                return;
        }
 
@@ -460,7 +460,7 @@ void handle_incoming_vpn_data(int sock)
 
        if(!n) {
                hostname = sockaddr2hostname(&from);
-               logger(DEBUG_ALWAYS, LOG_WARNING, _("Received UDP packet from unknown source %s"),
+               logger(LOG_WARNING, _("Received UDP packet from unknown source %s"),
                           hostname);
                free(hostname);
                return;