Handle packets encrypted via SPTPS that need to be forwarded via TCP.

[tinc] / src / net_packet.c

diff --git a/src/net_packet.c b/src/net_packet.c
index ac63f62..8439269 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -389,39 +389,49 @@ void receive_tcppacket(connection_t *c, const char *buffer, int len) {
 }
 
 static void send_sptps_packet(node_t *n, vpn_packet_t *origpkt) {
-       if(n->status.sptps) {
-               uint8_t type = 0;
-               int offset = 0;
-
-               if(!(origpkt->data[12] | origpkt->data[13])) {
-                       sptps_send_record(&n->sptps, PKT_PROBE, (char *)origpkt->data, origpkt->len);
-                       return;
+       if(!n->status.validkey) {
+               logger(DEBUG_TRAFFIC, LOG_INFO, "No valid key known yet for %s (%s)", n->name, n->hostname);
+               if(!n->status.waitingforkey)
+                       send_req_key(n);
+               else if(n->last_req_key + 10 < time(NULL)) {
+                       sptps_stop(&n->sptps);
+                       n->status.waitingforkey = false;
+                       send_req_key(n);
                }
+               return;
+       }
 
-               if(routing_mode == RMODE_ROUTER)
-                       offset = 14;
-               else
-                       type = PKT_MAC;
-
-               if(origpkt->len < offset)
-                       return;
+       uint8_t type = 0;
+       int offset = 0;
 
-               vpn_packet_t outpkt;
+       if(!(origpkt->data[12] | origpkt->data[13])) {
+               sptps_send_record(&n->sptps, PKT_PROBE, (char *)origpkt->data, origpkt->len);
+               return;
+       }
 
-               if(n->outcompression) {
-                       int len = compress_packet(outpkt.data + offset, origpkt->data + offset, origpkt->len - offset, n->outcompression);
-                       if(len < 0) {
-                               logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
-                       } else if(len < origpkt->len - offset) {
-                               outpkt.len = len + offset;
-                               origpkt = &outpkt;
-                               type |= PKT_COMPRESSED;
-                       }
-               }
+       if(routing_mode == RMODE_ROUTER)
+               offset = 14;
+       else
+               type = PKT_MAC;
 
-               sptps_send_record(&n->sptps, type, (char *)origpkt->data + offset, origpkt->len - offset);
+       if(origpkt->len < offset)
                return;
+
+       vpn_packet_t outpkt;
+
+       if(n->outcompression) {
+               int len = compress_packet(outpkt.data + offset, origpkt->data + offset, origpkt->len - offset, n->outcompression);
+               if(len < 0) {
+                       logger(DEBUG_TRAFFIC, LOG_ERR, "Error while compressing packet to %s (%s)", n->name, n->hostname);
+               } else if(len < origpkt->len - offset) {
+                       outpkt.len = len + offset;
+                       origpkt = &outpkt;
+                       type |= PKT_COMPRESSED;
+               }
        }
+
+       sptps_send_record(&n->sptps, type, (char *)origpkt->data + offset, origpkt->len - offset);
+       return;
 }
 
 static void send_udppacket(node_t *n, vpn_packet_t *origpkt) {
@@ -581,13 +591,15 @@ end:
 bool send_sptps_data(void *handle, uint8_t type, const char *data, size_t len) {
        node_t *to = handle;
 
-       if(type >= SPTPS_HANDSHAKE || ((myself->options | to->options) & OPTION_TCPONLY)) {
+       if(type >= SPTPS_HANDSHAKE
+                       || ((myself->options | to->options) & OPTION_TCPONLY)
+                       || (type != PKT_PROBE && len > to->minmtu)) {
                char buf[len * 4 / 3 + 5];
                b64encode(data, buf, len);
                if(!to->status.validkey)
                        return send_request(to->nexthop->connection, "%d %s %s %s -1 -1 -1 %d", ANS_KEY, myself->name, to->name, buf, myself->incompression);
                else
-                       return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, REQ_SPTPS, buf);
+                       return send_request(to->nexthop->connection, "%d %s %s %d %s", REQ_KEY, myself->name, to->name, type >= SPTPS_HANDSHAKE ? REQ_SPTPS : REQ_PACKET, buf);
        }
 
        /* Send the packet */
@@ -620,6 +632,7 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t
 
        if(type == SPTPS_HANDSHAKE) {
                from->status.validkey = true;
+               from->status.waitingforkey = false;
                logger(DEBUG_META, LOG_INFO, "SPTPS key exchange with %s (%s) succesful", from->name, from->hostname);
                return true;
        }
@@ -773,7 +786,7 @@ void broadcast_packet(const node_t *from, vpn_packet_t *packet) {
                        if(from != myself)
                                break;
 
-                       for(node = node_udp_tree->head; node; node = node->next) {
+                       for(node = node_tree->head; node; node = node->next) {
                                n = node->data;
 
                                if(n->status.reachable && ((n->via == myself && n->nexthop == n) || n->via == n))
@@ -797,7 +810,7 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
        for(node = edge_weight_tree->head; node; node = node->next) {
                e = node->data;
 
-               if(e->to == myself)
+               if(!e->to->status.reachable || e->to == myself)
                        continue;
 
                if(sockaddrcmp_noport(from, &e->address)) {
@@ -823,7 +836,7 @@ static node_t *try_harder(const sockaddr_t *from, const vpn_packet_t *pkt) {
 void handle_incoming_vpn_data(int sock, short events, void *data) {
        vpn_packet_t pkt;
        char *hostname;
-       sockaddr_t from;
+       sockaddr_t from = {{0}};
        socklen_t fromlen = sizeof from;
        node_t *n;
        int len;