Use conditional compilation for cryptographic functions.

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 3327fca29c2921027f805cf665e5f6921fdabbeb..e704ba82f56e10ed5fe412ffdcbaf6baa7f13d62 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -25,6 +25,7 @@
 #include "cipher.h"
 #include "connection.h"
 #include "digest.h"
+#include "event.h"
 #include "subnet.h"
 
 typedef struct node_status_t {
@@ -51,14 +52,14 @@ typedef struct node_t {
        time_t last_state_change;
        time_t last_req_key;
 
-       ecdsa_t ecdsa;                          /* His public ECDSA key */
+       ecdsa_t *ecdsa;                         /* His public ECDSA key */
        sptps_t sptps;
 
-       cipher_t incipher;                      /* Cipher for UDP packets */
-       digest_t indigest;                      /* Digest for UDP packets */
+       cipher_t *incipher;                     /* Cipher for UDP packets */
+       digest_t *indigest;                     /* Digest for UDP packets */
 
-       cipher_t outcipher;                     /* Cipher for UDP packets */
-       digest_t outdigest;                     /* Digest for UDP packets */
+       cipher_t *outcipher;                    /* Cipher for UDP packets */
+       digest_t *outdigest;                    /* Digest for UDP packets */
 
        int incompression;                      /* Compressionlevel, 0 = no compression */
        int outcompression;                     /* Compressionlevel, 0 = no compression */
@@ -76,6 +77,9 @@ 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 */
+       uint32_t received;                      /* Total valid packets received from this node */
+       uint32_t prev_received_seqno;
+       uint32_t prev_received;
        uint32_t farfuture;                     /* Packets in a row that have arrived from the far future */
        unsigned char* late;                    /* Bitfield marking late packets */
 
@@ -83,7 +87,12 @@ typedef struct node_t {
        length_t minmtu;                        /* Probed minimum MTU */
        length_t maxmtu;                        /* Probed maximum MTU */
        int mtuprobes;                          /* Number of probes */
-       struct event mtuevent;                  /* Probe event */
+       timeout_t mtutimeout;                   /* Probe event */
+       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;
        uint64_t in_bytes;