[GNUnet-SVN] r151 - in GNUnet: . src/applications/fs/module

[grothoff]

Author: grothoff
Date: 2005-02-01 23:12:46 -0800 (Tue, 01 Feb 2005)
New Revision: 151

Modified:
   GNUnet/src/applications/fs/module/fs.c
   GNUnet/todo
Log:
expiration time considerations for FS

Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c      2005-02-02 06:48:53 UTC (rev 
150)
+++ GNUnet/src/applications/fs/module/fs.c      2005-02-02 07:12:46 UTC (rev 
151)
@@ -36,6 +36,7 @@
 #include "gnunet_gap_service.h"
 #include "gnunet_dht_service.h"
 #include "gnunet_datastore_service.h"
+#include "gnunet_traffic_service.h"
 #include "ecrs_core.h"
 #include "migration.h"
 #include "ondemand.h"
@@ -68,6 +69,11 @@
  */
 static Datastore_ServiceAPI * datastore;
 
+/**
+ * Traffic service.
+ */
+static Traffic_ServiceAPI * traffic;
+
 static Mutex lock;
 
 
@@ -140,8 +146,6 @@
     return SYSERR;
   }
   ri = (RequestInsert*) req;
-  /* FIXME: if anonymity level is 0, also do 
-     DHT insertion! */
   datum = MALLOC(sizeof(Datastore_Value) + 
                 ntohs(req->size) - sizeof(RequestIndex));
   datum->expirationTime = ri->expiration;
@@ -160,6 +164,10 @@
   ret = datastore->put(&query,
                       datum);
   MUTEX_UNLOCK(&lock);
+  if (ntohl(ri->anonymityLevel) == 0) {
+  /* do DHT put! */
+  }
+
   FREE(datum);
   return coreAPI->sendValueToClient(sock, 
                                    ret);
@@ -335,7 +343,6 @@
   GapWrapper * gw;
   int ret;
   unsigned int size;
-  cron_t et;
 
   ret = isDatumApplicable(ntohl(value->type),
                          ntohl(value->size) - sizeof(Datastore_Value),
@@ -351,18 +358,62 @@
   size = sizeof(GapWrapper) +
     ntohl(value->size) -
     sizeof(Datastore_Value);
+
+  if (ntohl(value->anonymityLevel) != 0) {
+    /* consider traffic volume before migrating;
+       ok, so this is not 100% clean since it kind-of
+       belongs into the gap code (since it is concerned
+       with anonymity and GAP messages).  So we should
+       probably move it below the callback by passing
+       the anonymity level along.  But that would
+       require changing the DataProcessor somewhat,
+       which would also be ugly.  So to keep things
+       simple, we do the anonymity-level check for
+       outgoing content right here. */
+    if (traffic != NULL) {
+      unsigned int level;
+      unsigned int count;
+      unsigned int peers;
+      unsigned int sizes;
+      unsigned int timevect;
+
+      level = ntohl(value->anonymityLevel);
+      if (OK != traffic->get(5 * cronSECONDS / TRAFFIC_TIME_UNIT, /* 
TTL_DECREMENT/TTU */
+                            GAP_p2p_PROTO_RESULT,
+                            TC_RECEIVED,
+                            &count,
+                            &peers,
+                            &sizes,
+                            &timevect)) {
+       LOG(LOG_WARNING,
+           _("Failed to get traffic stats.\n"));
+       return OK;
+      }
+      if (level > 1000) {
+       if (peers < level / 1000)
+         return OK;
+       if (count < level % 1000)
+         return OK;
+      } else {
+       if (count < level)
+         return OK;
+      }
+    } else {
+      /* traffic required by module not loaded;
+        refuse to hand out data that requires
+        anonymity! */
+      return OK;
+    }
+  }
+  
   gw = MALLOC(size);
   gw->dc.size = htonl(size);
   gw->type = value->type;
-  et = ntohll(value->expirationTime);
-  /* FIMXE: mingle et? */
-  gw->timeout = htonll(et);
+  gw->timeout = value->expirationTime;
   memcpy(&gw[1],
         &value[1],
         size - sizeof(GapWrapper));
-  /* FIXME: check anonymity level,
-     if 0, consider using DHT migration instead;
-     if high, consider traffic volume before migrating */
+
   if (ggc->resultCallback != NULL)
     ret = ggc->resultCallback(key,
                              &gw->dc,
@@ -451,8 +502,12 @@
   dv->type = gw->type;
   dv->prio = htonl(prio);
   dv->anonymityLevel = htonl(0);
-  if (ntohll(gw->timeout) > cronTime(NULL) + MAX_MIGRATION_EXP)     
-    dv->expirationTime = htonll(cronTime(NULL) + MAX_MIGRATION_EXP);
+  if ( (ntohll(gw->timeout) > cronTime(NULL) + MAX_MIGRATION_EXP) &&
+       (randomi(1+prio) == 0) /* allow _ocasionally_ to keep an extremely high
+                                expiration time, to make it plausible for 
+                                content we originate that it has such high 
+                                expiration times! */ )
+    dv->expirationTime = htonll(cronTime(NULL) + randomi(MAX_MIGRATION_EXP));
   else
     dv->expirationTime = gw->timeout;
   memcpy(&dv[1],
@@ -515,6 +570,7 @@
     BREAK();
     return SYSERR;
   }
+  traffic = capi->requestService("traffic");
   gap = capi->requestService("gap");
   if (gap == NULL) {
     BREAK();
@@ -596,6 +652,10 @@
     coreAPI->releaseService(dht);
     dht = NULL;
   }
+  if (traffic != NULL) {
+    coreAPI->releaseService(traffic);
+    traffic = NULL;
+  }
   coreAPI = NULL;
   MUTEX_DESTROY(&lock);
 }

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2005-02-02 06:48:53 UTC (rev 150)
+++ GNUnet/todo 2005-02-02 07:12:46 UTC (rev 151)
@@ -9,7 +9,6 @@
 
 0.7.0pre0 [4'05] (aka "pre-preview"):
 - Missing Features:
-  * fs/module/fs+migration: anonymity level and expiration time considerations 
(Christian)
   * fsui upload: ETA calculations, tracking URIs
   * ecrs-download: some stats, some details in the heuristics
   * fsui core (persistence, shutdown, multiple FSUIs)
@@ -27,6 +26,9 @@
 - gnunet-search: 
   * dump directory with search results
   * 'handle' anonymity-level setting
+- FS:
+  * implement GetAvgPriority (fs.c)
+  * DHT integration (fs.c)
 - FSUI:
   * namespace updates
   * collections