X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.h;h=5761e4d747e5544c2d5189fdaed074eaa597ac12;hb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;hp=e704ba82f56e10ed5fe412ffdcbaf6baa7f13d62;hpb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;p=meshlink diff --git a/src/node.h b/src/node.h index e704ba82..5761e4d7 100644 --- a/src/node.h +++ b/src/node.h @@ -1,7 +1,6 @@ /* node.h -- header for node.c - Copyright (C) 2001-2013 Guus Sliepen , - 2001-2005 Ivo Timmermans + Copyright (C) 2014 Guus Sliepen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -18,15 +17,13 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_NODE_H__ -#define __TINC_NODE_H__ +#ifndef __MESHLINK_NODE_H__ +#define __MESHLINK_NODE_H__ -#include "splay_tree.h" -#include "cipher.h" -#include "connection.h" -#include "digest.h" #include "event.h" -#include "subnet.h" +#include "sockaddr.h" +#include "sptps.h" +#include "utcp/utcp.h" typedef struct node_status_t { unsigned int unused_active:1; /* 1 if active (not used for nodes) */ @@ -35,14 +32,21 @@ typedef struct node_status_t { 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 sptps:1; /* 1 if this node supports SPTPS */ + unsigned int unused_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 broadcast:1; /* 1 if the next UDP packet should be broadcast to the local network */ + unsigned int blacklisted:1; /* 1 if the node is blacklist so we never want to speak with him anymore*/ + unsigned int unused:22; } node_status_t; typedef struct node_t { char *name; /* name of this node */ + void *priv; + uint32_t options; /* options turned on for this node */ + dev_class_t devclass; + + struct meshlink_handle *mesh; /* The mesh this node belongs to */ int sock; /* Socket to use for outgoing UDP packets */ sockaddr_t address; /* his real (internet) ip to send UDP packets to */ @@ -52,15 +56,9 @@ typedef struct node_t { time_t last_state_change; time_t last_req_key; - ecdsa_t *ecdsa; /* His public ECDSA key */ + struct ecdsa *ecdsa; /* His public ECDSA key */ sptps_t sptps; - 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 */ - int incompression; /* Compressionlevel, 0 = no compression */ int outcompression; /* Compressionlevel, 0 = no compression */ @@ -69,23 +67,22 @@ typedef struct node_t { struct edge_t *prevedge; /* nearest node from him to us */ struct node_t *via; /* next hop for UDP packets */ - splay_tree_t *subnet_tree; /* Pointer to a tree of subnets belonging to this node */ - - splay_tree_t *edge_tree; /* Edges with this node as one of the endpoints */ + struct splay_tree_t *edge_tree; /* Edges with this node as one of the endpoints */ struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */ + time_t last_connect_try; + time_t last_successfull_connection; 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 mtu; /* Maximum size of packets to send to this node */ - length_t minmtu; /* Probed minimum MTU */ - length_t maxmtu; /* Probed maximum MTU */ + uint16_t mtu; /* Maximum size of packets to send to this node */ + uint16_t minmtu; /* Probed minimum MTU */ + uint16_t maxmtu; /* Probed maximum MTU */ int mtuprobes; /* Number of probes */ timeout_t mtutimeout; /* Probe event */ struct timeval probe_time; /* Time the last probe was sent or received */ @@ -94,25 +91,22 @@ typedef struct node_t { float bandwidth; /* Last measured bandwidth */ float packetloss; /* Last measured packet loss rate */ + struct utcp *utcp; + uint64_t in_packets; uint64_t in_bytes; uint64_t out_packets; uint64_t out_bytes; } node_t; -extern struct node_t *myself; -extern splay_tree_t *node_tree; - -extern void init_nodes(void); -extern void exit_nodes(void); +extern void init_nodes(struct meshlink_handle *mesh); +extern void exit_nodes(struct meshlink_handle *mesh); extern node_t *new_node(void) __attribute__ ((__malloc__)); extern void free_node(node_t *); -extern void node_add(node_t *); -extern void node_del(node_t *); -extern node_t *lookup_node(char *); -extern node_t *lookup_node_udp(const sockaddr_t *); -extern bool dump_nodes(struct connection_t *); -extern bool dump_traffic(struct connection_t *); -extern void update_node_udp(node_t *, const sockaddr_t *); - -#endif /* __TINC_NODE_H__ */ +extern void node_add(struct meshlink_handle *mesh, node_t *); +extern void node_del(struct meshlink_handle *mesh, node_t *); +extern node_t *lookup_node(struct meshlink_handle *mesh, const char *); +extern node_t *lookup_node_udp(struct meshlink_handle *mesh, const sockaddr_t *); +extern void update_node_udp(struct meshlink_handle *mesh, node_t *, const sockaddr_t *); + +#endif /* __MESHLINK_NODE_H__ */