X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=55a1b5305f5f7848db958b8a983ef1a194383df7;hp=67494700d0c31ba823bb4e76af8c8b24488594dd;hb=78fc59e994c764d072bf0045177f690a378d1308;hpb=7926a156e5b118d06295228e57de0cc9de0433b4 diff --git a/src/node.h b/src/node.h index 67494700..55a1b530 100644 --- a/src/node.h +++ b/src/node.h @@ -1,7 +1,7 @@ /* node.h -- header for node.c - Copyright (C) 2001-2004 Guus Sliepen , - 2001-2004 Ivo Timmermans + Copyright (C) 2001-2009 Guus Sliepen , + 2001-2005 Ivo Timmermans 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 @@ -29,14 +29,17 @@ #include "list.h" #include "subnet.h" -typedef struct node_status_t { - int active:1; /* 1 if active.. */ - int validkey:1; /* 1 if we currently have a valid key for him */ - int waitingforkey:1; /* 1 if we already sent out a request */ - int visited:1; /* 1 if this node has been visited by one of the graph algorithms */ - int reachable:1; /* 1 if this node is reachable in the graph */ - int indirect:1; /* 1 if this node is not directly reachable by us */ - int unused:26; +typedef union node_status_t { + struct { + int unused_active:1; /* 1 if active (not used for nodes) */ + int validkey:1; /* 1 if we currently have a valid key for him */ + int waitingforkey:1; /* 1 if we already sent out a request */ + int visited:1; /* 1 if this node has been visited by one of the graph algorithms */ + int reachable:1; /* 1 if this node is reachable in the graph */ + int indirect:1; /* 1 if this node is not directly reachable by us */ + int unused:26; + }; + uint32_t value; } node_status_t; typedef struct node_t { @@ -58,8 +61,6 @@ typedef struct node_t { int compression; /* Compressionlevel, 0 = no compression */ - list_t *queue; /* Queue for packets awaiting to be encrypted */ - struct node_t *nexthop; /* nearest node from us to him */ struct node_t *via; /* next hop for UDP packets */