/*
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
#include "cipher.h"
#include "connection.h"
#include "digest.h"
+#include "event.h"
#include "subnet.h"
typedef struct node_status_t {
unsigned int indirect:1; /* 1 if this node is not directly reachable by us */
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 unused:24;
+ unsigned int send_locally:1; /* 1 if the next UDP packet should be sent on the local network */
+ unsigned int unused:23;
} node_status_t;
typedef struct node_t {
char *name; /* name of this node */
+ node_id_t id; /* unique node ID (name hash) */
uint32_t options; /* options turned on for this node */
int sock; /* Socket to use for outgoing UDP packets */
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 */
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 */
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;
extern void node_add(node_t *);
extern void node_del(node_t *);
extern node_t *lookup_node(char *);
+extern node_t *lookup_node_id(const node_id_t *);
extern node_t *lookup_node_udp(const sockaddr_t *);
extern bool dump_nodes(struct connection_t *);
extern bool dump_traffic(struct connection_t *);