X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.h;h=93191df9fd739196e18d432b28417123067f4423;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=08778bf3fda5bdf8f9069ffa6521964e0e47afa3;hpb=551cd19406a560d0d206bff5b4e9da064ec222b6;p=tinc diff --git a/src/connection.h b/src/connection.h index 08778bf3..93191df9 100644 --- a/src/connection.h +++ b/src/connection.h @@ -1,6 +1,6 @@ /* connection.h -- header for connection.c - Copyright (C) 2000-2006 Guus Sliepen , + Copyright (C) 2000-2009 Guus Sliepen , 2000-2005 Ivo Timmermans This program is free software; you can redistribute it and/or modify @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef __TINC_CONNECTION_H__ @@ -32,8 +30,7 @@ #define OPTION_TCPONLY 0x0002 #define OPTION_PMTU_DISCOVERY 0x0004 -typedef union connection_status_t { - struct { +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 */ @@ -44,8 +41,6 @@ typedef union connection_status_t { 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 unused:23; - }; - uint32_t value; } connection_status_t; #include "edge.h"