Code beautification, start of multicast support.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index a989b09..af34d05 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -17,12 +17,13 @@
     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.41 2003/09/23 20:59:01 guus Exp $
+    $Id: net_packet.c,v 1.1.2.44 2003/12/12 19:52:25 guus Exp $
 */
 
 #include "system.h"
 
 #include <openssl/rand.h>
+#include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/hmac.h>
@@ -103,7 +104,7 @@ static void receive_packet(node_t *n, vpn_packet_t *packet)
        ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Received packet of %d bytes from %s (%s)"),
                           packet->len, n->name, n->hostname);
 
-       route_incoming(n, packet);
+       route(n, packet);
 }
 
 static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
@@ -145,12 +146,14 @@ static void receive_udppacket(node_t *n, vpn_packet_t *inpkt)
        if(myself->cipher) {
                outpkt = pkt[nextpkt++];
 
-//             EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key,
-//                                             myself->key + myself->cipher->key_len);
-               EVP_DecryptInit_ex(&packet_ctx, NULL, NULL, NULL, NULL);
-               EVP_DecryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
-                                                 (char *) &inpkt->seqno, inpkt->len);
-               EVP_DecryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
+               if(!EVP_DecryptInit_ex(&packet_ctx, NULL, NULL, NULL, NULL)
+                               || !EVP_DecryptUpdate(&packet_ctx, (char *) &outpkt->seqno, &outlen,
+                                       (char *) &inpkt->seqno, inpkt->len)
+                               || !EVP_DecryptFinal_ex(&packet_ctx, (char *) &outpkt->seqno + outlen, &outpad)) {
+                       ifdebug(TRAFFIC) logger(LOG_DEBUG, _("Error decrypting packet from %s (%s): %s"),
+                                               n->name, n->hostname, ERR_error_string(ERR_get_error(), NULL));
+                       return;
+               }
                
                outpkt->len = outlen + outpad;
                inpkt = outpkt;
@@ -189,8 +192,8 @@ 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(LOG_ERR, _("Error while uncompressing packet from %s (%s)"),
-                                  n->name, n->hostname);
+                       ifdebug(TRAFFIC) logger(LOG_ERR, _("Error while uncompressing packet from %s (%s)"),
+                                                n->name, n->hostname);
                        return;
                }
 
@@ -239,8 +242,7 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
 
                /* Since packet is on the stack of handle_tap_input(), we have to make a copy of it first. */
 
-               copy = xmalloc(sizeof(vpn_packet_t));
-               memcpy(copy, inpkt, sizeof(vpn_packet_t));
+               *(copy = xmalloc(sizeof(*copy))) = *inpkt;
 
                list_insert_tail(n->queue, copy);
 
@@ -264,7 +266,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(LOG_ERR, _("Error while compressing packet to %s (%s)"),
+                       ifdebug(TRAFFIC) logger(LOG_ERR, _("Error while compressing packet to %s (%s)"),
                                   n->name, n->hostname);
                        return;
                }
@@ -282,11 +284,14 @@ static void send_udppacket(node_t *n, vpn_packet_t *inpkt)
        if(n->cipher) {
                outpkt = pkt[nextpkt++];
 
-//             EVP_EncryptInit_ex(&packet_ctx, n->cipher, NULL, n->key, n->key + n->cipher->key_len);
-               EVP_EncryptInit_ex(&n->packet_ctx, NULL, NULL, NULL, NULL);
-               EVP_EncryptUpdate(&n->packet_ctx, (char *) &outpkt->seqno, &outlen,
-                                                 (char *) &inpkt->seqno, inpkt->len);
-               EVP_EncryptFinal_ex(&n->packet_ctx, (char *) &outpkt->seqno + outlen, &outpad);
+               if(!EVP_EncryptInit_ex(&n->packet_ctx, NULL, NULL, NULL, NULL)
+                               || !EVP_EncryptUpdate(&n->packet_ctx, (char *) &outpkt->seqno, &outlen,
+                                       (char *) &inpkt->seqno, inpkt->len)
+                               || !EVP_EncryptFinal_ex(&n->packet_ctx, (char *) &outpkt->seqno + outlen, &outpad)) {
+                       ifdebug(TRAFFIC) logger(LOG_ERR, _("Error while encrypting packet to %s (%s): %s"),
+                                               n->name, n->hostname, ERR_error_string(ERR_get_error(), NULL));
+                       return;
+               }
 
                outpkt->len = outlen + outpad;
                inpkt = outpkt;
@@ -338,14 +343,14 @@ void send_packet(const node_t *n, vpn_packet_t *packet)
 
        cp();
 
-       ifdebug(TRAFFIC) logger(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
-                          packet->len, n->name, n->hostname);
-
        if(n == myself) {
-               ifdebug(TRAFFIC) logger(LOG_NOTICE, _("Packet is looping back to us!"));
+               write_packet(packet);
                return;
        }
 
+       ifdebug(TRAFFIC) logger(LOG_ERR, _("Sending packet of %d bytes to %s (%s)"),
+                          packet->len, n->name, n->hostname);
+
        if(!n->status.reachable) {
                ifdebug(TRAFFIC) logger(LOG_INFO, _("Node %s (%s) is not reachable"),
                                   n->name, n->hostname);