[GNUnet-SVN] r10098 - in gnunet/src: core transport

[gnunet]

Author: grothoff
Date: 2010-01-21 15:31:14 +0100 (Thu, 21 Jan 2010)
New Revision: 10098

Modified:
   gnunet/src/core/core_api_peer_get_info.c
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/transport/gnunet-service-transport_blacklist.c
   gnunet/src/transport/gnunet-service-transport_blacklist.h
   gnunet/src/transport/transport.h
Log:
stuff

Modified: gnunet/src/core/core_api_peer_get_info.c
===================================================================
--- gnunet/src/core/core_api_peer_get_info.c    2010-01-21 14:26:23 UTC (rev 
10097)
+++ gnunet/src/core/core_api_peer_get_info.c    2010-01-21 14:31:14 UTC (rev 
10098)
@@ -77,7 +77,7 @@
       GNUNET_break (0);
       if (irc->info != NULL)
        irc->info (irc->info_cls, 
-                  NULL, 0, 0, GNUNET_TIME_UNIT_FOREVER_REL, 0, 0);     
+                  NULL, 0, 0, 0, 0);     
       GNUNET_CLIENT_disconnect (irc->client);
       GNUNET_free (irc);
       return;

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-01-21 14:26:23 UTC (rev 
10097)
+++ gnunet/src/core/gnunet-service-core.c       2010-01-21 14:31:14 UTC (rev 
10098)
@@ -525,6 +525,12 @@
   uint32_t ping_challenge;
 
   /**
+   * What was the last distance to this peer as reported by the transports?
+   * (FIXME: actually set this!)
+   */
+  uint32_t last_distance;
+
+  /**
    * What is our connection status?
    */
   enum PeerStateMachine status;
@@ -1005,7 +1011,8 @@
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Sending `%s' message to client.\n", "NOTIFY_CONNECT");
 #endif
-      cnm.reserved = htonl (0);
+      cnm.distance = htonl (n->last_distance);
+      cnm.latency = GNUNET_TIME_relative_hton (n->last_latency);
       cnm.peer = n->peer;
       send_to_client (c, &cnm.header, GNUNET_NO);
       n = n->next;
@@ -1114,7 +1121,6 @@
       cim.reserved_amount = htonl (reserv);
       cim.bpm_in = htonl (n->bpm_in);
       cim.bpm_out = htonl (n->bpm_out);
-      cim.latency = GNUNET_TIME_relative_hton (n->last_latency);
       cim.preference = n->current_preference;
     }
   cim.header.size = htons (sizeof (struct ConfigurationInfoMessage));
@@ -2613,6 +2619,8 @@
         }      
       cnm.header.size = htons (sizeof (struct ConnectNotifyMessage));
       cnm.header.type = htons (GNUNET_MESSAGE_TYPE_CORE_NOTIFY_CONNECT);
+      cnm.distance = htonl (0); /* FIXME */
+      cnm.latency = GNUNET_TIME_relative_hton (GNUNET_TIME_UNIT_ZERO); /* 
FIXME */
       cnm.reserved = htonl (0);
       cnm.peer = n->peer;
       send_to_all_clients (&cnm.header, GNUNET_YES, 
GNUNET_CORE_OPTION_SEND_CONNECT);

Modified: gnunet/src/transport/gnunet-service-transport_blacklist.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_blacklist.c   2010-01-21 
14:26:23 UTC (rev 10097)
+++ gnunet/src/transport/gnunet-service-transport_blacklist.c   2010-01-21 
14:31:14 UTC (rev 10098)
@@ -25,6 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_protocols.h"
+#include "gnunet_util_lib.h"
 #include "gnunet_service_lib.h"
 #include "transport.h"
 #include "gnunet-service-transport_blacklist.h"
@@ -183,6 +184,11 @@
                                          struct GNUNET_SERVER_Client *client,
                                          const struct GNUNET_MessageHeader 
*message)
 {
+  struct BlacklistNotificationList *bnl;
+
+  bnl = GNUNET_malloc (sizeof (struct BlacklistNotificationList));
+  bnl->next = blacklist_notifiers;
+  blacklist_notifiers = bnl;
   /* FIXME */
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }

Modified: gnunet/src/transport/gnunet-service-transport_blacklist.h
===================================================================
--- gnunet/src/transport/gnunet-service-transport_blacklist.h   2010-01-21 
14:26:23 UTC (rev 10097)
+++ gnunet/src/transport/gnunet-service-transport_blacklist.h   2010-01-21 
14:31:14 UTC (rev 10098)
@@ -23,14 +23,13 @@
  * @brief internal API for blacklisting functionality
  * @author Christian Grothoff
  */
-#include "platform.h"
+#ifndef GNUNET_SERVICE_TRANSPORT_BLACKLIST_H
+#define GNUNET_SERVICE_TRANSPORT_BLACKLIST_H
+
 #include "gnunet_protocols.h"
 #include "gnunet_service_lib.h"
 #include "transport.h"
 
-#ifndef GNUNET_SERVICE_TRANSPORT_BLACKLIST_H
-#define GNUNET_SERVICE_TRANSPORT_BLACKLIST_H
-
 /**
  * Handle a request to blacklist a peer.
  *

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2010-01-21 14:26:23 UTC (rev 10097)
+++ gnunet/src/transport/transport.h    2010-01-21 14:31:14 UTC (rev 10098)
@@ -23,6 +23,9 @@
  * @brief common internal definitions for transport service
  * @author Christian Grothoff
  */
+#ifndef TRANSPORT_H
+#define TRANSPORT_H
+
 #include "gnunet_crypto_lib.h"
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
@@ -309,3 +312,4 @@
 
 
 /* end of transport.h */
+#endif