X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/19dd2531cafe84927c845e548ec68587007f3ab2..7858dfa0ff7fa6d3e94e4a05dbce52dd2415adc6:/server/tripe.h

diff --git a/server/tripe.h b/server/tripe.h
index 66fb091d..9c9653e0 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,7 @@
 #include <mLib/env.h>
 #include <mLib/fdflags.h>
 #include <mLib/fwatch.h>
+#include <mLib/macros.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
@@ -194,9 +193,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 +249,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) */
@@ -269,8 +269,10 @@ struct peer;
 typedef struct tunnel_ops {
   const char *name;			/* Name of this tunnel driver */
   void (*init)(void);			/* Initializes the system */
-  tunnel *(*create)(struct peer */*p*/); /* Initializes a new tunnel */
-  const char *(*ifname)(tunnel */*t*/);	/* Returns tunnel's interface name */
+  tunnel *(*create)(struct peer */*p*/, char **/*ifn*/);
+					/* Initializes a new tunnel */
+  void (*setifname)(tunnel */*t*/, const char */*ifn*/);
+					/*  Notifies ifname change */
   void (*inject)(tunnel */*t*/, buf */*b*/); /* Sends packet through if */
   void (*destroy)(tunnel */*t*/);	/* Destroys a tunnel */
 } tunnel_ops;
@@ -309,6 +311,7 @@ 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 {
@@ -575,6 +578,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.
  *
@@ -583,7 +587,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 --------------------------------*/