X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.h;h=acab448490830755920c83a27d95403e873f94c4;hb=0bdce44687a22c8825695cba185b845f5ea5e060;hp=0fc49ef38d4fe19228d191d0db37b5707474d302;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332;p=meshlink diff --git a/src/connection.h b/src/connection.h index 0fc49ef3..acab4484 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,7 +1,9 @@ +#ifndef MESHLINK_CONNECTION_H +#define MESHLINK_CONNECTION_H + /* connection.h -- header for connection.c - Copyright (C) 2000-2010 Guus Sliepen , - 2000-2005 Ivo Timmermans + Copyright (C) 2000-2013, 2017 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,87 +20,78 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_CONNECTION_H__ -#define __TINC_CONNECTION_H__ - -#include "cipher.h" -#include "digest.h" -#include "rsa.h" -#include "splay_tree.h" +#include "buffer.h" +#include "list.h" +#include "sptps.h" -#define OPTION_INDIRECT 0x0001 -#define OPTION_TCPONLY 0x0002 -#define OPTION_PMTU_DISCOVERY 0x0004 -#define OPTION_CLAMP_MSS 0x0008 +#define OPTION_INDIRECT 0x0001 +#define OPTION_TCPONLY 0x0002 +#define OPTION_PMTU_DISCOVERY 0x0004 +#define OPTION_CLAMP_MSS 0x0008 +#define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */ typedef struct connection_status_t { - int pinged:1; /* sent ping */ - int active:1; /* 1 if active.. */ - int connecting:1; /* 1 if we are waiting for a non-blocking connect() to finish */ - int termreq:1; /* the termination of this connection was requested */ - int remove_unused:1; /* Set to 1 if you want this connection removed */ - int timeout_unused:1; /* 1 if gotten timeout */ - int encryptout:1; /* 1 if we can encrypt outgoing traffic */ - int decryptin:1; /* 1 if we have to decrypt incoming traffic */ - int mst:1; /* 1 if this connection is part of a minimum spanning tree */ - int control:1; - int unused:22; + unsigned int pinged: 1; /* sent ping */ + unsigned int active: 1; /* 1 if active.. */ + unsigned int connecting: 1; /* 1 if we are waiting for a non-blocking connect() to finish */ + unsigned int unused_termreq: 1; /* the termination of this connection was requested */ + unsigned int remove_unused: 1; /* Set to 1 if you want this connection removed */ + unsigned int timeout_unused: 1; /* 1 if gotten timeout */ + unsigned int unused_encryptout: 1; /* 1 if we can encrypt outgoing traffic */ + unsigned int unused_decryptin: 1; /* 1 if we have to decrypt incoming traffic */ + unsigned int mst: 1; /* 1 if this connection is part of a minimum spanning tree */ + unsigned int control: 1; /* 1 if this is a control connection */ + unsigned int pcap: 1; /* 1 if this is a control connection requesting packet capture */ + unsigned int log: 1; /* 1 if this is a control connection requesting log dump */ + unsigned int invitation: 1; /* 1 if this is an invitation */ + unsigned int invitation_used: 1; /* 1 if the invitation has been consumed */ + unsigned int unused: 19; } connection_status_t; +#include "ecdsa.h" #include "edge.h" -#include "list.h" #include "net.h" #include "node.h" typedef struct connection_t { - char *name; /* name he claims to have */ - - union sockaddr_t address; /* his real (internet) ip */ - char *hostname; /* the hostname of its real ip */ - int protocol_version; /* used protocol */ - - int socket; /* socket used for this connection */ - uint32_t options; /* options for this connection */ - connection_status_t status; /* status info */ - int estimated_weight; /* estimation for the weight of the edge for this connection */ - struct timeval start; /* time this connection was started, used for above estimation */ - struct outgoing_t *outgoing; /* used to keep track of outgoing connections */ - - struct node_t *node; /* node associated with the other end */ - struct edge_t *edge; /* edge associated with this connection */ - - rsa_t rsa; /* his public/private key */ - cipher_t incipher; /* Cipher he will use to send data to us */ - cipher_t outcipher; /* Cipher we will use to send data to him */ - digest_t indigest; - digest_t outdigest; - - int inmaclength; - int outmaclength; + char *name; /* name he claims to have */ + + union sockaddr_t address; /* his real (internet) ip */ + char *hostname; /* the hostname of its real ip */ + int protocol_major; /* used protocol */ + int protocol_minor; /* used protocol */ + + int socket; /* socket used for this connection */ + uint32_t options; /* options for this connection */ + connection_status_t status; /* status info */ + struct outgoing_t *outgoing; /* used to keep track of outgoing connections */ + + struct meshlink_handle *mesh; /* the mesh this connection belongs to */ + struct node_t *node; /* node associated with the other end */ + struct edge_t *edge; /* edge associated with this connection */ + + ecdsa_t *ecdsa; /* his public ECDSA key */ + sptps_t sptps; + int incompression; int outcompression; - char *hischallenge; /* The challenge we sent to him */ + struct buffer_t inbuf; + struct buffer_t outbuf; + io_t io; /* input/output event on this metadata connection */ + int tcplen; /* length of incoming TCPpacket */ + int allow_request; /* defined if there's only one request possible */ - struct bufferevent *buffer; /* buffer events on this metadata connection */ - struct event inevent; /* input event on this metadata connection */ - int tcplen; /* length of incoming TCPpacket */ - int allow_request; /* defined if there's only one request possible */ + time_t last_ping_time; /* last time we saw some activity from the other end or pinged them */ - time_t last_ping_time; /* last time we saw some activity from the other end or pinged them */ - - splay_tree_t *config_tree; /* Pointer to configuration tree belonging to him */ + splay_tree_t *config_tree; /* Pointer to configuration tree belonging to him */ } connection_t; -extern splay_tree_t *connection_tree; -extern connection_t *broadcast; - -extern void init_connections(void); -extern void exit_connections(void); -extern connection_t *new_connection(void) __attribute__ ((__malloc__)); +extern void init_connections(struct meshlink_handle *mesh); +extern void exit_connections(struct meshlink_handle *mesh); +extern connection_t *new_connection(void) __attribute__((__malloc__)); extern void free_connection(connection_t *); -extern void connection_add(connection_t *); -extern void connection_del(connection_t *); -extern bool dump_connections(struct connection_t *); +extern void connection_add(struct meshlink_handle *mesh, connection_t *); +extern void connection_del(struct meshlink_handle *mesh, connection_t *); -#endif /* __TINC_CONNECTION_H__ */ +#endif