Small corrections.

diff --git a/src/node.h b/src/node.h
index 815b793..f96c56e 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: node.h,v 1.1.2.1 2001/10/09 19:30:30 guus Exp $
+    $Id: node.h,v 1.1.2.2 2001/10/09 19:37:10 guus Exp $

 */
 
 typedef struct node_t {
 */
 
 typedef struct node_t {


@@ -31,9 +31,9 @@ typedef struct node_t {
 
   status_bits_t status;            /* status info */
 
 
   status_bits_t status;            /* status info */
 

-  EVP_CIPHER *cipher_pkttype;      /* Cipher type for UDP packets */ 
-  char *cipher_pktkey;             /* Cipher key and iv */
-  int cipher_pktkeylength;         /* Cipher key and iv length*/
+  EVP_CIPHER *cipher;              /* Cipher type for UDP packets */ 
+  char *key;                       /* Cipher key and iv */
+  int keylength;                   /* Cipher key and iv length*/

 
   list_t *queue;                   /* Queue for packets awaiting to be encrypted */
 
 
   list_t *queue;                   /* Queue for packets awaiting to be encrypted */
 

diff --git a/src/vertex.h b/src/vertex.h
index b5504d5..7425756 100644 (file)
--- a/src/vertex.h
+++ b/src/vertex.h
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 

-    $Id: vertex.h,v 1.1.2.1 2001/10/09 19:30:30 guus Exp $
+    $Id: vertex.h,v 1.1.2.2 2001/10/09 19:37:10 guus Exp $

 */
 
 typedef struct vertex_t {
 */
 
 typedef struct vertex_t {


@@ -29,13 +29,16 @@ typedef struct vertex_t {
 typedef struct halfconnection_t {
   struct node_t *node;
 
 typedef struct halfconnection_t {
   struct node_t *node;
 

-  ipv4_t address;                  /* his real (internet) ip to send UDP packets to */
-  short unsigned int port;         /* port number of UDP connection */
-  char *hostname;                  /* the hostname of its real ip */
+  ipv4_t address;                  /* real (internet) ip on this end of the meta connection */
+  short unsigned int port;         /* port number of this end of the meta connection */
+  char *hostname;                  /* the hostname of real ip */

   
   

-  RSA *rsa_key;
-  EVP_CIPHER_CTX *ctx;
-  char *metakey;
-  char *pktkey;
-  char *challenge;
+  /* Following bits only used when this is a connection with ourself. */
+  
+  RSA *rsa_key;                    /* RSA key used for authentication */
+  EVP_CIPHER *cipher;              /* Cipher type for meta protocol */ 
+  EVP_CIPHER_CTX *ctx;             /* Cipher state for meta protocol */
+  char *key;                       /* Cipher key + iv */
+  int keylength;                   /* Cipher keylength */
+  char *challenge;                 /* Challenge sent to this end */

 } halfconnection_t;
 } halfconnection_t;