[GNUnet-SVN] r1189 - GNUnet/src/server

[grothoff]

Author: grothoff
Date: 2005-07-01 10:21:15 -0700 (Fri, 01 Jul 2005)
New Revision: 1189

Modified:
   GNUnet/src/server/connection.c
Log:
rekey -- recount

Modified: GNUnet/src/server/connection.c
===================================================================
--- GNUnet/src/server/connection.c      2005-07-01 13:11:25 UTC (rev 1188)
+++ GNUnet/src/server/connection.c      2005-07-01 17:21:15 UTC (rev 1189)
@@ -2028,7 +2028,8 @@
     }
   } else {
     be->lastPacketsBitmap =
-      be->lastPacketsBitmap << (sequenceNumber - 
be->lastSequenceNumberReceived);
+      be->lastPacketsBitmap 
+      << (sequenceNumber - be->lastSequenceNumberReceived);
     be->lastSequenceNumberReceived = sequenceNumber;
   }
   stamp = ntohl(msg->timeStamp);
@@ -2126,7 +2127,11 @@
     } else { /* for receiving */
       if ( ((be->status & STAT_SKEY_RECEIVED) == 0) ||
           (be->skey_remote_created < age) ) {
-       be->skey_remote = *key;
+       if (! equalsHashKey512(key,
+                              &be->skey_remote)) {
+         be->skey_remote = *key;
+         be->lastSequenceNumberReceived = 0;
+       }
        be->skey_remote_created = age;
        be->status |= STAT_SKEY_RECEIVED;
       }