X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.h;h=d9e04f8c9942724e768e106281328ceea96ebd4a;hb=fa05f996c5500c056a36c1d43e33a407f876643c;hp=0cc5ae6fa5d59d526c90bcf2c70d8590c123ff77;hpb=21f0bddfa4dca5fb21c9dc4970ac64fa8fe706e4;p=meshlink diff --git a/src/connection.h b/src/connection.h index 0cc5ae6f..d9e04f8c 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,6 +1,9 @@ +#ifndef MESHLINK_CONNECTION_H +#define MESHLINK_CONNECTION_H + /* connection.h -- header for connection.c - Copyright (C) 2000-2013 Guus Sliepen + 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 @@ -17,12 +20,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef __TINC_CONNECTION_H__ -#define __TINC_CONNECTION_H__ - #include "buffer.h" -#include "cipher.h" -#include "digest.h" #include "list.h" #include "sptps.h" @@ -33,48 +31,48 @@ #define OPTION_VERSION(x) ((x) >> 24) /* Top 8 bits are for protocol minor version */ typedef struct connection_status_t { - 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; + 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 "net.h" #include "node.h" +#include "submesh.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_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 */ - 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 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; + struct submesh_t *submesh; /* his submesh handle if available in invitation file */ int incompression; int outcompression; @@ -86,17 +84,13 @@ typedef struct connection_t { 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 */ - - splay_tree_t *config_tree; /* Pointer to configuration tree belonging to him */ } connection_t; -extern connection_t *everyone; - -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 void connection_add(struct meshlink_handle *mesh, connection_t *); +extern void connection_del(struct meshlink_handle *mesh, connection_t *); -#endif /* __TINC_CONNECTION_H__ */ +#endif