hacks from trip

5 files changed, 33 insertions, 232 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 692f71e9b..ee8749955 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -23,7 +23,7 @@
  * @brief maintains list of known peers
  *
  * Code to maintain the list of currently known hosts (in memory
- * structure of data/hosts/ and data/credit/).
+ * structure of data/hosts/).
  *
  * @author Christian Grothoff
  *
@@ -46,11 +46,6 @@
 #define DATA_HOST_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 15)
 
 /**
- * How often do we flush trust values to disk?
- */
-#define TRUST_FLUSH_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 5)
-
-/**
  * How often do we discard old entries in data/hosts/?
  */
 #define DATA_HOST_CLEAN_FREQ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 60)
@@ -76,16 +71,6 @@ struct HostEntry
    */
   struct GNUNET_HELLO_Message *hello;
 
-  /**
-   * Trust rating for this peer
-   */
-  uint32_t trust;
-
-  /**
-   * Trust rating for this peer on disk.
-   */
-  uint32_t disk_trust;
-
 };
 
 
@@ -105,11 +90,6 @@ static struct GNUNET_SERVER_NotificationContext *notify_list;
 static char *networkIdDirectory;
 
 /**
- * Where do we store trust information?
- */
-static char *trustDirectory;
-
-/**
  * Handle for reporting statistics.
  */
 static struct GNUNET_STATISTICS_Handle *stats;
@@ -129,7 +109,6 @@ make_info_message (const struct HostEntry *he)
   im = GNUNET_malloc (sizeof (struct InfoMessage) + hs);
   im->header.size = htons (hs + sizeof (struct InfoMessage));
   im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
-  im->trust = htonl (he->trust);
   im->peer = he->identity;
   if (he->hello != NULL)
     memcpy (&im[1], he->hello, hs);
@@ -184,25 +163,7 @@ get_host_filename (const struct GNUNET_PeerIdentity *id)
 
 
 /**
- * Get the filename under which we would store the GNUNET_HELLO_Message
- * for the given host and protocol.
- * @return filename of the form DIRECTORY/HOSTID
- */
-static char *
-get_trust_filename (const struct GNUNET_PeerIdentity *id)
-{
-  struct GNUNET_CRYPTO_HashAsciiEncoded fil;
-  char *fn;
-
-  GNUNET_CRYPTO_hash_to_enc (&id->hashPubKey, &fil);
-  GNUNET_asprintf (&fn, "%s%s%s", trustDirectory, DIR_SEPARATOR_STR, &fil);
-  return fn;
-}
-
-
-/**
- * Find the host entry for the given peer.  Call
- * only when synchronized!
+ * Find the host entry for the given peer.  FIXME: replace by hash map!
  * @return NULL if not found
  */
 static struct HostEntry *
@@ -247,13 +208,12 @@ static void
 add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
 {
   struct HostEntry *entry;
-  char *fn;
-  uint32_t trust;
   char buffer[GNUNET_SERVER_MAX_MESSAGE_SIZE - 1];
   const struct GNUNET_HELLO_Message *hello;
   struct GNUNET_HELLO_Message *hello_clean;
   int size;
   struct GNUNET_TIME_Absolute now;
+  char *fn;
 
   entry = lookup_host_entry (identity);
   if (entry != NULL)
@@ -264,11 +224,6 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
                             GNUNET_NO);
   entry = GNUNET_malloc (sizeof (struct HostEntry));
   entry->identity = *identity;
-  fn = get_trust_filename (identity);
-  if ((GNUNET_DISK_file_test (fn) == GNUNET_YES) &&
-      (sizeof (trust) == GNUNET_DISK_fn_read (fn, &trust, sizeof (trust))))
-    entry->disk_trust = entry->trust = ntohl (trust);
-  GNUNET_free (fn);
 
   fn = get_host_filename (identity);
   if (GNUNET_DISK_file_test (fn) == GNUNET_YES)
@@ -302,56 +257,6 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
 
 
 /**
- * Increase the host credit by a value.
- *
- * @param hostId is the identity of the host
- * @param value is the int value by which the
- *  host credit is to be increased or decreased
- * @returns the actual change in trust (positive or negative)
- */
-static int
-change_host_trust (const struct GNUNET_PeerIdentity *hostId, int value)
-{
-  struct HostEntry *host;
-  unsigned int old_trust;
-
-  if (value == 0)
-    return 0;
-  host = lookup_host_entry (hostId);
-  if (host == NULL)
-    {
-      add_host_to_known_hosts (hostId);
-      host = lookup_host_entry (hostId);
-    }
-  GNUNET_assert (host != NULL);
-  old_trust = host->trust;
-  if (value > 0)
-    {
-      if (host->trust + value < host->trust)
-        {
-          value = UINT32_MAX - host->trust;
-          host->trust = UINT32_MAX;
-        }
-      else
-        host->trust += value;
-    }
-  else
-    {
-      if (host->trust < -value)
-        {
-          value = -host->trust;
-          host->trust = 0;
-        }
-      else
-        host->trust += value;
-    }
-  if (host->trust != old_trust)
-    notify_all (host);    
-  return value;
-}
-
-
-/**
  * Remove a file that should not be there.  LOG
  * success or failure.
  */
@@ -480,16 +385,14 @@ bind_address (const struct GNUNET_PeerIdentity *peer,
 
 /**
  * Do transmit info either for only the host matching the given
- * argument or for all known hosts and change their trust values by
- * the given delta.
+ * argument or for all known hosts.
  *
  * @param only NULL to hit all hosts, otherwise specifies a particular target
- * @param trust_change how much should the trust be changed
  * @param client who is making the request (and will thus receive our confirmation)
  */
 static void
 send_to_each_host (const struct GNUNET_PeerIdentity *only,
-                   int trust_change, struct GNUNET_SERVER_Client *client)
+                   struct GNUNET_SERVER_Client *client)
 {
   struct HostEntry *pos;
   struct InfoMessage *im;
@@ -508,7 +411,6 @@ send_to_each_host (const struct GNUNET_PeerIdentity *only,
            memcmp (only, &pos->identity,
                    sizeof (struct GNUNET_PeerIdentity))))
         {
-          change_host_trust (&pos->identity, trust_change);
           hs = 0;
           im = (struct InfoMessage *) buf;
           if (pos->hello != NULL)
@@ -522,7 +424,7 @@ send_to_each_host (const struct GNUNET_PeerIdentity *only,
             }
           im->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_INFO);
           im->header.size = htons (sizeof (struct InfoMessage) + hs);
-          im->trust = htonl (pos->trust);
+          im->reserved = htonl (0);
           im->peer = pos->identity;
           GNUNET_SERVER_transmit_context_append_message (tc,
                                                          &im->header);
@@ -542,58 +444,6 @@ send_to_each_host (const struct GNUNET_PeerIdentity *only,
 
 
 /**
- * Write host-trust information to a file - flush the buffer entry!
- * Assumes synchronized access.
- */
-static void
-flush_trust (struct HostEntry *host)
-{
-  char *fn;
-  uint32_t trust;
-
-  if (host->trust == host->disk_trust)
-    return;                     /* unchanged */
-  fn = get_trust_filename (&host->identity);
-  if (host->trust == 0)
-    {
-      if ((0 != UNLINK (fn)) && (errno != ENOENT))
-        GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
-                                  GNUNET_ERROR_TYPE_BULK, "unlink", fn);
-    }
-  else
-    {
-      trust = htonl (host->trust);
-      if (sizeof(uint32_t) == GNUNET_DISK_fn_write (fn, &trust, 
-                                                    sizeof(uint32_t),
-                                                    GNUNET_DISK_PERM_USER_READ | GNUNET_DISK_PERM_USER_WRITE
-                                                    | GNUNET_DISK_PERM_GROUP_READ | GNUNET_DISK_PERM_OTHER_READ))
-        host->disk_trust = host->trust;
-    }
-  GNUNET_free (fn);
-}
-
-/**
- * Call this method periodically to scan data/hosts for new hosts.
- */
-static void
-cron_flush_trust (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
-  struct HostEntry *pos;
-
-  pos = hosts;
-  while (pos != NULL)
-    {
-      flush_trust (pos);
-      pos = pos->next;
-    }
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
-  GNUNET_SCHEDULER_add_delayed (tc->sched,
-                                TRUST_FLUSH_FREQ, &cron_flush_trust, NULL);
-}
-
-
-/**
  * @brief delete expired HELLO entries in data/hosts/
  */
 static int
@@ -711,7 +561,7 @@ handle_get (void *cls,
               "GET",
               GNUNET_i2s (&lpm->peer));
 #endif
-  send_to_each_host (&lpm->peer, ntohl (lpm->trust_change), client);
+  send_to_each_host (&lpm->peer, client);
 }
 
 
@@ -727,15 +577,12 @@ handle_get_all (void *cls,
                 struct GNUNET_SERVER_Client *client,
                 const struct GNUNET_MessageHeader *message)
 {
-  const struct ListAllPeersMessage *lpm;
-
-  lpm = (const struct ListAllPeersMessage *) message;
 #if DEBUG_PEERINFO
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "`%s' message received\n",
               "GET_ALL");
 #endif
-  send_to_each_host (NULL, ntohl (lpm->trust_change), client);
+  send_to_each_host (NULL, client);
 }
 
 
@@ -814,7 +661,7 @@ run (void *cls,
     {&handle_get, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET,
      sizeof (struct ListPeerMessage)},
     {&handle_get_all, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL,
-     sizeof (struct ListAllPeersMessage)},
+     sizeof (struct GNUNET_MessageHeader)},
     {&handle_notify, NULL, GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY,
      sizeof (struct GNUNET_MessageHeader)},
     {NULL, NULL, 0, 0}
@@ -826,20 +673,11 @@ run (void *cls,
                                                           "peerinfo",
                                                           "HOSTS",
                                                           &networkIdDirectory));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CONFIGURATION_get_value_filename (cfg,
-                                                          "peerinfo",
-                                                          "TRUST",
-                                                          &trustDirectory));
   GNUNET_DISK_directory_create (networkIdDirectory);
-  GNUNET_DISK_directory_create (trustDirectory);
   GNUNET_SCHEDULER_add_with_priority (sched,
                                       GNUNET_SCHEDULER_PRIORITY_IDLE,
                                       &cron_scan_directory_data_hosts, NULL);
   GNUNET_SCHEDULER_add_with_priority (sched,
-                                      GNUNET_SCHEDULER_PRIORITY_HIGH,
-                                      &cron_flush_trust, NULL);
-  GNUNET_SCHEDULER_add_with_priority (sched,
                                       GNUNET_SCHEDULER_PRIORITY_IDLE,
                                       &cron_clean_data_hosts, NULL);
   GNUNET_SCHEDULER_add_delayed (sched,
@@ -868,7 +706,6 @@ main (int argc, char *const *argv)
                              GNUNET_SERVICE_OPTION_NONE,
                              &run, NULL)) ? 0 : 1;
   GNUNET_free_non_null (networkIdDirectory);
-  GNUNET_free_non_null (trustDirectory);
   return ret;
 }
 
diff --git a/src/peerinfo/peerinfo.h b/src/peerinfo/peerinfo.h
index d8d645b13..87860097a 100644
--- a/src/peerinfo/peerinfo.h
+++ b/src/peerinfo/peerinfo.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -31,8 +31,7 @@
 
 /**
  * Message requesting a listing of all known peers,
- * possibly modified by the specified trust value
- * and restricted to the specified peer identity.
+ * possibly restricted to the specified peer identity.
  */
 struct ListPeerMessage
 {
@@ -43,10 +42,9 @@ struct ListPeerMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * How much to change the trust in each returned peer,
-   * in network byte order.
+   * Always zero.
    */
-  int32_t trust_change GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;
 
   /**
    * Restrict to peers with this identity (optional
@@ -58,28 +56,6 @@ struct ListPeerMessage
 
 
 /**
- * Message requesting a listing of all known peers,
- * possibly modified by the specified trust value
- * and restricted to the specified peer identity.
- */
-struct ListAllPeersMessage
-{
-
-  /**
-   * Type will be GNUNET_MESSAGE_TYPE_PEERINFO_GET
-   */
-  struct GNUNET_MessageHeader header;
-
-  /**
-   * How much to change the trust in each returned peer,
-   * in network byte order.
-   */
-  int32_t trust_change GNUNET_PACKED;
-
-};
-
-
-/**
  * Message used to inform the client about
  * a particular peer; this message is optionally followed
  * by a HELLO message for the respective peer (if available).
@@ -95,10 +71,9 @@ struct InfoMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Amount of trust we now have in the peer,
-   * in network byte order.
+   * Always zero.
    */
-  uint32_t trust GNUNET_PACKED;
+  uint32_t reserved GNUNET_PACKED;
 
   /**
    * About which peer are we talking here?
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c
index a1eeeb220..1f382f096 100644
--- a/src/peerinfo/peerinfo_api.c
+++ b/src/peerinfo/peerinfo_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2004, 2005, 2007, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2004, 2005, 2007, 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -397,7 +397,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
         GNUNET_SCHEDULER_cancel (ic->h->sched, 
                                  ic->timeout_task);
       if (ic->callback != NULL)
-        ic->callback (ic->callback_cls, NULL, NULL, 1);
+        ic->callback (ic->callback_cls, NULL, NULL);
       GNUNET_free (ic);
       return;
     }
@@ -413,7 +413,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
         GNUNET_SCHEDULER_cancel (ic->h->sched, 
                                  ic->timeout_task);
       if (ic->callback != NULL)
-        ic->callback (ic->callback_cls, NULL, NULL, 0);
+        ic->callback (ic->callback_cls, NULL, NULL);
       GNUNET_free (ic);
       return;
     }
@@ -428,7 +428,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
         GNUNET_SCHEDULER_cancel (ic->h->sched, 
                                  ic->timeout_task);
       if (ic->callback != NULL)
-        ic->callback (ic->callback_cls, NULL, NULL, 2);
+        ic->callback (ic->callback_cls, NULL, NULL);
       GNUNET_free (ic);
       return;
     }
@@ -446,7 +446,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
             GNUNET_SCHEDULER_cancel (ic->h->sched, 
                                      ic->timeout_task);
           if (ic->callback != NULL)
-            ic->callback (ic->callback_cls, NULL, NULL, 2);
+            ic->callback (ic->callback_cls, NULL, NULL);
           GNUNET_free (ic);
           return;
         }
@@ -461,7 +461,7 @@ peerinfo_handler (void *cls, const struct GNUNET_MessageHeader *msg)
 #endif
   ic->h->in_receive = GNUNET_YES;
   if (ic->callback != NULL)
-    ic->callback (ic->callback_cls, &im->peer, hello, ntohl (im->trust));
+    ic->callback (ic->callback_cls, &im->peer, hello);
   GNUNET_CLIENT_receive (ic->h->client,
                          &peerinfo_handler,
                          ic,
@@ -497,7 +497,7 @@ iterator_start_receive (void *cls,
       reconnect (ic->h);
       trigger_transmit (ic->h);
       if (ic->callback != NULL)
-        ic->callback (ic->callback_cls, NULL, NULL, 1);
+        ic->callback (ic->callback_cls, NULL, NULL);
       GNUNET_free (ic);
       return;
     }  
@@ -536,7 +536,7 @@ signal_timeout (void *cls,
     GNUNET_CONTAINER_DLL_remove (ic->h->tq_head,
                                  ic->h->tq_tail,
                                  ic->tqe);
-  ic->callback (ic->callback_cls, NULL, NULL, 1);
+  ic->callback (ic->callback_cls, NULL, NULL);
   ic->callback = NULL;
   if (ic->in_receive)
     return;
@@ -551,16 +551,11 @@ signal_timeout (void *cls,
  * host and then finally once with a NULL pointer.  After that final
  * invocation, the iterator context must no longer be used.
  *
- * Note that the last call can be triggered by timeout or by simply
- * being done; however, the trust argument will be set to zero if we
- * are done, 1 if we timed out and 2 for fatal error.
- *
- * Instead of calling this function with 'peer == NULL' and 'trust ==
- * 0', it is often better to use 'GNUNET_PEERINFO_notify'.
+ * Instead of calling this function with 'peer == NULL' it is often
+ * better to use 'GNUNET_PEERINFO_notify'.
  * 
  * @param h handle to the peerinfo service
  * @param peer restrict iteration to this peer only (can be NULL)
- * @param trust_delta how much to change the trust in all matching peers
  * @param timeout how long to wait until timing out
  * @param callback the method to call for each peer
  * @param callback_cls closure for callback
@@ -570,12 +565,11 @@ signal_timeout (void *cls,
 struct GNUNET_PEERINFO_IteratorContext *
 GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
                          const struct GNUNET_PeerIdentity *peer,
-                         int trust_delta,
                          struct GNUNET_TIME_Relative timeout,
                          GNUNET_PEERINFO_Processor callback,
                          void *callback_cls)
 {
-  struct ListAllPeersMessage *lapm;
+  struct GNUNET_MessageHeader *lapm;
   struct ListPeerMessage *lpm;
   struct GNUNET_PEERINFO_IteratorContext *ic;
   struct TransmissionQueueEntry *tqe;
@@ -587,12 +581,11 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
                   "Requesting list of peers from PEERINFO service\n");
 #endif
       tqe = GNUNET_malloc (sizeof (struct TransmissionQueueEntry) +
-                           sizeof (struct ListAllPeersMessage));
-      tqe->size = sizeof (struct ListAllPeersMessage);
-      lapm = (struct ListAllPeersMessage *) &tqe[1];
-      lapm->header.size = htons (sizeof (struct ListAllPeersMessage));
-      lapm->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL);
-      lapm->trust_change = htonl (trust_delta);
+                           sizeof (struct GNUNET_MessageHeader));
+      tqe->size = sizeof (struct GNUNET_MessageHeader);
+      lapm = (struct GNUNET_MessageHeader *) &tqe[1];
+      lapm->size = htons (sizeof (struct GNUNET_MessageHeader));
+      lapm->type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL);
     }
   else
     {
@@ -607,7 +600,6 @@ GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
       lpm = (struct ListPeerMessage *) &tqe[1];
       lpm->header.size = htons (sizeof (struct ListPeerMessage));
       lpm->header.type = htons (GNUNET_MESSAGE_TYPE_PEERINFO_GET);
-      lpm->trust_change = htonl (trust_delta);
       memcpy (&lpm->peer, peer, sizeof (struct GNUNET_PeerIdentity));
     }
   ic = GNUNET_malloc (sizeof (struct GNUNET_PEERINFO_IteratorContext));
diff --git a/src/peerinfo/peerinfo_api_notify.c b/src/peerinfo/peerinfo_api_notify.c
index 04e8baea0..c7a9c6145 100644
--- a/src/peerinfo/peerinfo_api_notify.c
+++ b/src/peerinfo/peerinfo_api_notify.c
@@ -142,7 +142,7 @@ process_notification (void *cls,
               "Received information about peer `%s' from peerinfo database\n",
               GNUNET_i2s (&im->peer));
 #endif
-  nc->callback (nc->callback_cls, &im->peer, hello, ntohl (im->trust));
+  nc->callback (nc->callback_cls, &im->peer, hello);
   receive_notifications (nc);
 }
 
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index dd931f4bc..47304d549 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -102,7 +102,7 @@ add_peer ()
 static void
 process (void *cls,
          const struct GNUNET_PeerIdentity *peer,
-         const struct GNUNET_HELLO_Message *hello, uint32_t trust)
+         const struct GNUNET_HELLO_Message *hello)
 {
   int *ok = cls;
   unsigned int agc;
@@ -118,7 +118,6 @@ process (void *cls,
           add_peer ();
           ic = GNUNET_PEERINFO_iterate (h,
                                         NULL,
-                                        0,
                                         GNUNET_TIME_relative_multiply
                                         (GNUNET_TIME_UNIT_SECONDS, 15), 
                                         &process, cls);
@@ -126,7 +125,6 @@ process (void *cls,
         }
       GNUNET_assert (peer == NULL);
       GNUNET_assert (2 == *ok);
-      GNUNET_assert (trust == 0);
       GNUNET_PEERINFO_disconnect (h);
       h = NULL;
       *ok = 0;
@@ -156,7 +154,6 @@ run (void *cls,
   add_peer ();
   ic = GNUNET_PEERINFO_iterate (h,
                                 NULL,
-                                0,
                                 GNUNET_TIME_relative_multiply
                                 (GNUNET_TIME_UNIT_SECONDS, 15),
                                 &process, cls);