refactoring how we handle peer addresses in peerinfo/ats/transport/hello subsystems -- use a struct instead of 3--4 arguments

2 files changed, 22 insertions, 17 deletions

diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index e453621d2..fc7cc781f 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -117,23 +117,22 @@ make_info_message (const struct HostEntry *he)
  * Address iterator that causes expired entries to be discarded.
  *
  * @param cls pointer to the current time
- * @param tname name of the transport
+ * @param address the address
  * @param expiration expiration time for the address
- * @param addr the address
- * @param addrlen length of addr in bytes
  * @return GNUNET_NO if expiration smaller than the current time
  */
 static int
-discard_expired (void *cls, const char *tname,
-                 struct GNUNET_TIME_Absolute expiration, const void *addr,
-                 uint16_t addrlen)
+discard_expired (void *cls, 
+                 const struct GNUNET_HELLO_Address *address,
+                 struct GNUNET_TIME_Absolute expiration)
 {
   const struct GNUNET_TIME_Absolute *now = cls;
 
   if (now->abs_value > expiration.abs_value)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                _("Removing expired address of transport `%s'\n"), tname);
+                _("Removing expired address of transport `%s'\n"), 
+                address->transport_name);
     return GNUNET_NO;
   }
   return GNUNET_OK;
diff --git a/src/peerinfo/test_peerinfo_api.c b/src/peerinfo/test_peerinfo_api.c
index bbdc591f4..607c1fa4e 100644
--- a/src/peerinfo/test_peerinfo_api.c
+++ b/src/peerinfo/test_peerinfo_api.c
@@ -45,16 +45,17 @@ static struct GNUNET_PEERINFO_Handle *h;
 static unsigned int retries;
 
 static int
-check_it (void *cls, const char *tname, struct GNUNET_TIME_Absolute expiration,
-          const void *addr, uint16_t addrlen)
+check_it (void *cls, 
+          const struct GNUNET_HELLO_Address *address,
+          struct GNUNET_TIME_Absolute expiration)
 {
   unsigned int *agc = cls;
 
-  if (addrlen > 0)
+  if (address != NULL)
   {
-    GNUNET_assert (0 == strcmp ("peerinfotest", tname));
-    GNUNET_assert (0 == strncmp ("Address", addr, addrlen));
-    (*agc) -= (1 << (addrlen - 1));
+    GNUNET_assert (0 == strcmp ("peerinfotest", address->transport_name));
+    GNUNET_assert (0 == strncmp ("Address", address->address, address->address_length));
+    (*agc) -= (1 << (address->address_length - 1));
   }
   return GNUNET_OK;
 }
@@ -65,14 +66,19 @@ address_generator (void *cls, size_t max, void *buf)
 {
   size_t *agc = cls;
   size_t ret;
+  struct GNUNET_HELLO_Address address;
 
   if (0 == *agc)
     return 0;
+  memset (&address.peer, 0, sizeof (struct GNUNET_PeerIdentity));
+  address.address = "Address";
+  address.transport_name = "peerinfotest";
+  address.address_length = *agc;
   ret =
-      GNUNET_HELLO_add_address ("peerinfotest",
-                                GNUNET_TIME_relative_to_absolute
-                                (GNUNET_TIME_UNIT_HOURS), "Address", *agc, buf,
-                                max);
+    GNUNET_HELLO_add_address (&address,
+                              GNUNET_TIME_relative_to_absolute
+                              (GNUNET_TIME_UNIT_HOURS), buf,
+                              max);
   (*agc)--;
   return ret;
 }