X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/72917fe7c663aced54f7e1185b7b72ba59aea73c..8cae2567b6a99f65e5fc28bd4a8475b47d69948e:/server/tripe.h diff --git a/server/tripe.h b/server/tripe.h index 5f00718d..43d2bdf9 100644 --- a/server/tripe.h +++ b/server/tripe.h @@ -1,13 +1,11 @@ /* -*-c-*- * - * $Id$ - * * Main header file for TrIPE * * (c) 2001 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of Trivial IP Encryption (TrIPE). * @@ -15,12 +13,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * TrIPE is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 TrIPE; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -73,6 +71,8 @@ #include #include #include +#include +#include #include #include #include @@ -164,6 +164,18 @@ typedef union addr { struct sockaddr_in sin; } addr; +/* --- Mapping keyed on addresses --- */ + +typedef struct addrmap { + hash_table t; + size_t load; +} addrmap; + +typedef struct addrmap_base { + hash_base b; + addr a; +} addrmap_base; + /* --- Sequence number checking --- */ typedef struct seqwin { @@ -194,9 +206,9 @@ typedef struct keyset { unsigned long sz_exp; /* Data limit for the keyset */ T( unsigned seq; ) /* Sequence number for tracing */ unsigned f; /* Various useful flags */ - gcipher *cin, *cout; /* Keyset ciphers for encryption */ + gcipher *cin, *cout; /* Keyset ciphers for encryption */ size_t tagsz; /* Length to truncate MAC tags */ - gmac *min, *mout; /* Keyset MACs for integrity */ + gmac *min, *mout; /* Keyset MACs for integrity */ uint32 oseq; /* Outbound sequence number */ seqwin iseq; /* Inbound sequence number */ } keyset; @@ -250,6 +262,7 @@ typedef struct keyexch { #define KXF_TIMER 1u /* Waiting for a timer to go off */ #define KXF_DEAD 2u /* The key-exchanger isn't up */ #define KXF_PUBKEY 4u /* Key exchanger has a public key */ +#define KXF_CORK 8u /* Don't send anything yet */ enum { KXS_DEAD, /* Uninitialized state (magical) */ @@ -311,10 +324,22 @@ typedef struct peerspec { unsigned long t_ka; /* Keep alive interval */ addr sa; /* Socket address to speak to */ size_t sasz; /* Socket address size */ + unsigned kxf; /* Key exchange flags to set */ } peerspec; +typedef struct peer_byname { + sym_base _b; + struct peer *p; +} peer_byname; + +typedef struct peer_byaddr { + addrmap_base _b; + struct peer *p; +} peer_byaddr; + typedef struct peer { - struct peer *next, *prev; /* Links to next and previous */ + peer_byname *byname; /* Lookup-by-name block */ + peer_byaddr *byaddr; /* Lookup-by-address block */ struct ping *pings; /* Pings we're waiting for */ peerspec spec; /* Specifications for this peer */ tunnel *t; /* Tunnel for local packets */ @@ -326,6 +351,8 @@ typedef struct peer { sel_timer tka; /* Timer for keepalives */ } peer; +typedef struct peer_iter { sym_iter i; } peer_iter; + typedef struct ping { struct ping *next, *prev; /* Links to next and previous */ peer *p; /* Peer so we can free it */ @@ -407,7 +434,7 @@ typedef struct admin_service { typedef struct admin_svcop { admin_bgop bg; /* Background operation header */ struct admin *prov; /* Client servicing this job */ - unsigned short index; /* This job's index */ + unsigned index; /* This job's index */ struct admin_svcop *next, *prev; /* Links for provider's jobs */ } admin_svcop; @@ -577,6 +604,7 @@ extern void kx_newkeys(keyexch */*kx*/); * Arguments: @keyexch *kx@ = pointer to key exchange context * @peer *p@ = pointer to peer context * @keyset **ks@ = pointer to keyset list + * @unsigned f@ = various useful flags * * Returns: Zero if OK, nonzero if it failed. * @@ -585,7 +613,8 @@ extern void kx_newkeys(keyexch */*kx*/); * exchange. */ -extern int kx_init(keyexch */*kx*/, peer */*p*/, keyset **/*ks*/); +extern int kx_init(keyexch */*kx*/, peer */*p*/, + keyset **/*ks*/, unsigned /*f*/); /*----- Keysets and symmetric cryptography --------------------------------*/ @@ -862,6 +891,60 @@ extern void a_daemon(void); extern void a_init(const char */*sock*/); +/*----- Mapping with addresses as keys ------------------------------------*/ + +/* --- @am_create@ --- * + * + * Arguments: @addrmap *m@ = pointer to map + * + * Returns: --- + * + * Use: Create an address map, properly set up. + */ + +extern void am_create(addrmap */*m*/); + +/* --- @am_destroy@ --- * + * + * Arguments: @addrmap *m@ = pointer to map + * + * Returns: --- + * + * Use: Destroy an address map, throwing away all the entries. + */ + +extern void am_destroy(addrmap */*m*/); + +/* --- @am_find@ --- * + * + * Arguments: @addrmap *m@ = pointer to map + * @const addr *a@ = address to look up + * @size_t sz@ = size of block to allocate + * @unsigned *f@ = where to store flags + * + * Returns: Pointer to found item, or null. + * + * Use: Finds a record with the given IP address, set @*f@ nonzero + * and returns it. If @sz@ is zero, and no match was found, + * return null; otherwise allocate a new block of @sz@ bytes, + * clear @*f@ to zero and return the block pointer. + */ + +extern void *am_find(addrmap */*m*/, const addr */*a*/, + size_t /*sz*/, unsigned */*f*/); + +/* --- @am_remove@ --- * + * + * Arguments: @addrmap *m@ = pointer to map + * @void *i@ = pointer to the item + * + * Returns: --- + * + * Use: Removes an item from the map. + */ + +extern void am_remove(addrmap */*m*/, void */*i*/); + /*----- Peer management ---------------------------------------------------*/ /* --- @p_txstart@ --- * @@ -1058,6 +1141,17 @@ extern const char *p_name(peer */*p*/); extern const peerspec *p_spec(peer */*p*/); +/* --- @p_findbyaddr@ --- * + * + * Arguments: @const addr *a@ = address to look up + * + * Returns: Pointer to the peer block, or null if not found. + * + * Use: Finds a peer by address. + */ + +extern peer *p_findbyaddr(const addr */*a*/); + /* --- @p_find@ --- * * * Arguments: @const char *name@ = name to look up @@ -1080,17 +1174,41 @@ extern peer *p_find(const char */*name*/); extern void p_destroy(peer */*p*/); -/* --- @p_first@, @p_next@ --- * +/* --- @FOREACH_PEER@ --- * + * + * Arguments: @p@ = name to bind to each peer + * @stuff@ = thing to do for each item + * + * Use: Does something for each current peer. + */ + +#define FOREACH_PEER(p, stuff) do { \ + peer_iter i_; \ + peer *p; \ + for (p_mkiter(&i_); (p = p_next(&i_)) != 0; ) do stuff while (0); \ +} while (0) + +/* --- @p_mkiter@ --- * + * + * Arguments: @peer_iter *i@ = pointer to an iterator + * + * Returns: --- + * + * Use: Initializes the iterator. + */ + +extern void p_mkiter(peer_iter */*i*/); + +/* --- @p_next@ --- * + * + * Arguments: @peer_iter *i@ = pointer to an iterator * - * Arguments: @peer *p@ = a peer block + * Returns: Next peer, or null if at the end. * - * Returns: @peer_first@ returns the first peer in some ordering; - * @peer_next@ returns the peer following a given one in the - * same ordering. Null is returned for the end of the list. + * Use: Returns the next peer. */ -extern peer *p_first(void); -extern peer *p_next(peer */*p*/); +extern peer *p_next(peer_iter */*i*/); /*----- Tunnel drivers ----------------------------------------------------*/