X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/e04c2d50fd96f3f31bc96851c55c6efecc10469c..85b1ebd6e0a50314cd28a602a69c6cde0efcecb1:/server/tripe.h?ds=inline

diff --git a/server/tripe.h b/server/tripe.h
index 3db1cb96..9c9653e0 100644
--- a/server/tripe.h
+++ b/server/tripe.h
@@ -1,7 +1,5 @@
 /* -*-c-*-
  *
- * $Id$
- *
  * Main header file for TrIPE
  *
  * (c) 2001 Straylight/Edgeware
@@ -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>
@@ -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) */
@@ -311,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 {
@@ -577,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.
  *
@@ -585,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 --------------------------------*/