X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.h;h=3ed0e31744e90f4bab4355573380bb99b3582939;hb=86116bb022f0b885638ff9ba21b359fc9f55286a;hp=2b6870e41c60d90260c0f2e561f237268c9fdd89;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef;p=meshlink diff --git a/src/connection.h b/src/connection.h index 2b6870e4..3ed0e317 100644 --- a/src/connection.h +++ b/src/connection.h @@ -32,12 +32,13 @@ #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 { 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 termreq:1; /* the termination of this connection was requested */ + 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 encryptout:1; /* 1 if we can encrypt outgoing traffic */ @@ -49,7 +50,6 @@ typedef struct connection_status_t { unsigned int unused:20; } connection_status_t; -#include "ecdh.h" #include "ecdsa.h" #include "edge.h" #include "net.h"