[GNUnet-SVN] r7537 - GNUnet/src/applications/fs/gap

[gnunet]

Author: durner
Date: 2008-08-10 05:03:29 -0600 (Sun, 10 Aug 2008)
New Revision: 7537

Modified:
   GNUnet/src/applications/fs/gap/fs.c
   GNUnet/src/applications/fs/gap/gap.c
Log:
fix expiration time

Modified: GNUnet/src/applications/fs/gap/fs.c
===================================================================
--- GNUnet/src/applications/fs/gap/fs.c 2008-08-10 05:53:40 UTC (rev 7536)
+++ GNUnet/src/applications/fs/gap/fs.c 2008-08-10 11:03:29 UTC (rev 7537)
@@ -735,7 +735,7 @@
   dblock = (const GNUNET_EC_DBlock *) &msg[1];
 
   expiration = GNUNET_ntohll (msg->expiration);
-  if ((expiration > GNUNET_GAP_MAX_MIGRATION_EXP) &&
+  if ((expiration > GNUNET_GAP_MAX_MIGRATION_EXP_KSK) &&
       (ntohl (dblock->type) == GNUNET_ECRS_BLOCKTYPE_KEYWORD))
     return GNUNET_OK;           /* expired KSK block -- ignore! */
   if (GNUNET_OK !=

Modified: GNUnet/src/applications/fs/gap/gap.c
===================================================================
--- GNUnet/src/applications/fs/gap/gap.c        2008-08-10 05:53:40 UTC (rev 
7536)
+++ GNUnet/src/applications/fs/gap/gap.c        2008-08-10 11:03:29 UTC (rev 
7537)
@@ -203,7 +203,7 @@
   msg->header.type = htons (GNUNET_P2P_PROTO_GAP_RESULT);
   msg->header.size = htons (size);
   msg->reserved = htonl (0);
-  msg->expiration = et;
+  msg->expiration = GNUNET_htonll(et);
   memcpy (&msg[1], &value[1], size - sizeof (P2P_gap_reply_MESSAGE));
   cls->result_count++;
   if (cls->result_count > 2 * (1 + req->value))