X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprotocol_key.c;h=b85de5ede486dbf5a76f4d785266a6af49f3122e;hp=3c72c294cd034e7b86dcfff3715333712f3baa3d;hb=17bc5220c332fdd083fd47fc600010f85171adc7;hpb=5bf4b88666ecafe190e8ed71d6c14c9de8d16e1f

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 3c72c294..b85de5ed 100644
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol_key.c,v 1.1.4.1 2002/02/11 10:05:58 guus Exp $
+    $Id: protocol_key.c,v 1.1.4.4 2002/02/27 22:37:55 guus Exp $
 */
 
 #include "config.h"
@@ -41,7 +41,7 @@
 #include "connection.h"
 #include "node.h"
 #include "edge.h"
-\
+
 #include "system.h"
 
 int mykeyused = 0;
@@ -167,8 +167,8 @@ cp
   bin2hex(from->key, key, from->keylength);
   key[from->keylength * 2] = '\0';
 cp
-  return send_request(c, "%d %s %s %s %d %d %d", ANS_KEY,
-                      from->name, to->name, key, from->cipher?from->cipher->nid:0, from->digest?from->digest->type:0, from->maclength);
+  return send_request(c, "%d %s %s %s %d %d %d %d", ANS_KEY,
+                      from->name, to->name, key, from->cipher?from->cipher->nid:0, from->digest?from->digest->type:0, from->maclength, from->compression);
 }
 
 int ans_key_h(connection_t *c)
@@ -176,10 +176,10 @@ int ans_key_h(connection_t *c)
   char from_name[MAX_STRING_SIZE];
   char to_name[MAX_STRING_SIZE];
   char key[MAX_STRING_SIZE];
-  int cipher, digest, maclength;
+  int cipher, digest, maclength, compression;
   node_t *from, *to;
 cp
-  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d", from_name, to_name, key, &cipher, &digest, &maclength) != 6)
+  if(sscanf(c->buffer, "%*d "MAX_STRING" "MAX_STRING" "MAX_STRING" %d %d %d %d", from_name, to_name, key, &cipher, &digest, &maclength, &compression) != 7)
     {
        syslog(LOG_ERR, _("Got bad %s from %s (%s)"), "ANS_KEY",
               c->name, c->hostname);
@@ -208,7 +208,7 @@ cp
 
   if(to != myself)
     {
-      return send_request(to->nexthop->connection, c->buffer);
+      return send_request(to->nexthop->connection, "%s", c->buffer);
     }
 
   /* Update our copy of the origin's packet key */
@@ -245,6 +245,8 @@ cp
       from->cipher = NULL;
     }
 
+  from->maclength = maclength;
+
   if(digest)
     {
       from->digest = EVP_get_digestbynid(digest);
@@ -253,7 +255,6 @@ cp
 	  syslog(LOG_ERR, _("Node %s (%s) uses unknown digest!"), from->name, from->hostname);
 	  return -1;
 	}
-      from->maclength = maclength;
       if(from->maclength > from->digest->md_size || from->maclength < 0)
 	{
 	  syslog(LOG_ERR, _("Node %s (%s) uses bogus MAC length!"), from->name, from->hostname);
@@ -263,8 +264,9 @@ cp
   else
     {
       from->digest = NULL;
-      from->maclength = maclength;
     }
+
+  from->compression = compression;
   
   flush_queue(from);
 cp