Remember whether we sent our key to another node.

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index bd10add..cd9e2d9 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -38,7 +38,8 @@ typedef struct node_status_t {
        unsigned int sptps:1;                   /* 1 if this node supports SPTPS */
        unsigned int udp_confirmed:1;           /* 1 if the address is one that we received UDP traffic on */
        unsigned int send_locally:1;            /* 1 if the next UDP packet should be sent on the local network */
-       unsigned int unused:23;
+       unsigned int validkey_in;               /* 1 if we have sent a valid key to him */
+       unsigned int unused:22;
 } node_status_t;
 
 typedef struct node_t {
@@ -87,15 +88,17 @@ typedef struct node_t {
        uint32_t farfuture;                     /* Packets in a row that have arrived from the far future */
        unsigned char* late;                    /* Bitfield marking late packets */
 
+       struct timeval udp_ping_sent;           /* Last time a ping probe was sent */
+       timeout_t udp_ping_timeout;             /* Ping timeout event */
+
        length_t mtu;                           /* Maximum size of packets to send to this node */
        length_t minmtu;                        /* Probed minimum MTU */
        length_t maxmtu;                        /* Probed maximum MTU */
        int mtuprobes;                          /* Number of probes */
-       timeout_t mtutimeout;                   /* Probe event */
+       struct timeval probe_sent_time;         /* Time the last probe was sent */
        struct timeval probe_time;              /* Time the last probe was sent or received */
        int probe_counter;                      /* Number of probes received since last burst was sent */
        float rtt;                              /* Last measured round trip time */
-       float bandwidth;                        /* Last measured bandwidth */
        float packetloss;                       /* Last measured packet loss rate */
 
        uint64_t in_packets;