Send packets back using the same socket as they were received on.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 83e89c7..66cb6c6 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -24,23 +24,23 @@
 #include "avl_tree.h"
 #include "connection.h"
 #include "event.h"
-#include "list.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
-       int unused_active:1;                    /* 1 if active (not used for nodes) */
-       int validkey:1;                         /* 1 if we currently have a valid key for him */
-       int unused_waitingforkey:1;             /* 1 if we already sent out a request */
-       int visited:1;                          /* 1 if this node has been visited by one of the graph algorithms */
-       int reachable:1;                        /* 1 if this node is reachable in the graph */
-       int indirect:1;                         /* 1 if this node is not directly reachable by us */
-       int unused:26;
+       unsigned int unused_active:1;                   /* 1 if active (not used for nodes) */
+       unsigned int validkey:1;                                /* 1 if we currently have a valid key for him */
+       unsigned int unused_waitingforkey:1;            /* 1 if we already sent out a request */
+       unsigned int visited:1;                         /* 1 if this node has been visited by one of the graph algorithms */
+       unsigned int reachable:1;                       /* 1 if this node is reachable in the graph */
+       unsigned int indirect:1;                                /* 1 if this node is not directly reachable by us */
+       unsigned int unused:26;
 } node_status_t;
 
 typedef struct node_t {
        char *name;                             /* name of this node */
        uint32_t options;                       /* options turned on for this node */
 
+       int sock;                               /* Socket to use for outgoing UDP packets */
        sockaddr_t address;                     /* his real (internet) ip to send UDP packets to */
        char *hostname;                         /* the hostname of its real ip */
 
@@ -77,7 +77,8 @@ typedef struct node_t {
 
        uint32_t sent_seqno;                    /* Sequence number last sent to this node */
        uint32_t received_seqno;                /* Sequence number last received from this node */
-       unsigned char late[16];                 /* Bitfield marking late packets */
+       uint32_t farfuture;                     /* Packets in a row that have arrived from the far future */
+       unsigned char* late;                    /* Bitfield marking late packets */
 
        length_t mtu;                           /* Maximum size of packets to send to this node */
        length_t minmtu;                        /* Probed minimum MTU */