[GNUnet-SVN] r18051 - gnunet/src/ats

[gnunet]

Author: wachs
Date: 2011-11-08 15:54:43 +0100 (Tue, 08 Nov 2011)
New Revision: 18051

Modified:
   gnunet/src/ats/gnunet-service-ats_addresses.c
   gnunet/src/ats/gnunet-service-ats_addresses.h
   gnunet/src/ats/gnunet-service-ats_scheduling.c
   gnunet/src/ats/gnunet-service-ats_scheduling.h
Log:
dummy for address in use
first I have to find the bugs in scheduling api, then I can add the logic here



Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c       2011-11-08 09:27:25 UTC 
(rev 18050)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c       2011-11-08 14:54:43 UTC 
(rev 18051)
@@ -380,6 +380,18 @@
 
 
 void
+GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
+                      const char *plugin_name, const void *plugin_addr,
+                      size_t plugin_addr_len, uint32_t session_id,
+                      int in_use)
+{
+
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message for peer `%s': 
%i\n",
+              "ADDRESS_IN_USE",
+              GNUNET_i2s (peer), in_use);
+}
+
+void
 GAS_addresses_request_address (const struct GNUNET_PeerIdentity *peer)
 {
   struct ATS_Address *aa;

Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h       2011-11-08 09:27:25 UTC 
(rev 18050)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h       2011-11-08 14:54:43 UTC 
(rev 18051)
@@ -46,7 +46,16 @@
 GAS_addresses_done (void);
 
 
+/**
+ * This address is now used or not used anymore
+ */
 void
+GAS_addresses_in_use (const struct GNUNET_PeerIdentity *peer,
+                      const char *plugin_name, const void *plugin_addr,
+                      size_t plugin_addr_len, uint32_t session_id,
+                      int in_use);
+
+void
 GAS_addresses_update (const struct GNUNET_PeerIdentity *peer,
                       const char *plugin_name, const void *plugin_addr,
                       size_t plugin_addr_len, uint32_t session_id,

Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-11-08 09:27:25 UTC 
(rev 18050)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-11-08 14:54:43 UTC 
(rev 18051)
@@ -246,9 +246,8 @@
   uint16_t plugin_name_length;
 
   uint16_t size;
+  uint16_t in_use;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
-              "ADDRESS_IN_USE");
   size = ntohs (message->size);
   if (size < sizeof (struct AddressUseMessage))
   {
@@ -276,16 +275,14 @@
     return;
   }
 
-
-/*
-  GAS_addresses_update (&m->peer,
+  in_use = ntohs (m->in_use);
+  GAS_addresses_in_use (&m->peer,
                         plugin_name,
                         address,
                         address_length,
                         ntohl (m->session_id),
-                        atsi,
-                        ats_count);
-*/
+                        in_use);
+
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 

Modified: gnunet/src/ats/gnunet-service-ats_scheduling.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.h      2011-11-08 09:27:25 UTC 
(rev 18050)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.h      2011-11-08 14:54:43 UTC 
(rev 18051)
@@ -114,6 +114,7 @@
 GAS_handle_address_in_use (void *cls, struct GNUNET_SERVER_Client *client,
                            const struct GNUNET_MessageHeader *message);
 
+
 /**
  * Handle 'address destroyed' messages from clients.
  *