error msg

[oweals/gnunet.git] / src / transport / gnunet-service-transport_hello.c

diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
index 8b38a673e9173dee83d27af94a16a7833bc07978..c04d2e1ddadb81f5ca8ae643adbe4503c33d0efb 100644 (file)
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -38,6 +38,11 @@
  */
 #define HELLO_REFRESH_PERIOD GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 6)
 
+/**
+ * Hello address expiration
+ */
+extern struct GNUNET_TIME_Relative hello_expiration;
+
 
 /**
  * Entry in linked list of network addresses for ourselves.  Also
@@ -69,7 +74,7 @@ struct OwnAddressList
   /**
    * Signature for a 'struct TransportPongMessage' for this address.
    */
-  struct GNUNET_CRYPTO_RsaSignature pong_signature;
+  struct GNUNET_CRYPTO_EccSignature pong_signature;
 
 };
 
@@ -138,8 +143,8 @@ address_generator (void *cls, size_t max, void *buf)
   if (NULL == gc->addr_pos)
     return 0;
   ret =
-    GNUNET_HELLO_add_address (gc->addr_pos->address, gc->expiration,
-                             buf, max);
+      GNUNET_HELLO_add_address (gc->addr_pos->address, gc->expiration, buf,
+                                max);
   gc->addr_pos = gc->addr_pos->next;
   return ret;
 }
@@ -159,21 +164,19 @@ refresh_hello_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 
   hello_task = GNUNET_SCHEDULER_NO_TASK;
   gc.addr_pos = oal_head;
-  gc.expiration =
-      GNUNET_TIME_relative_to_absolute
-      (GNUNET_CONSTANTS_HELLO_ADDRESS_EXPIRATION);
+  gc.expiration = GNUNET_TIME_relative_to_absolute (hello_expiration);
+
   GNUNET_free (our_hello);
   our_hello = GNUNET_HELLO_create (&GST_my_public_key, &address_generator, &gc);
-#if DEBUG_TRANSPORT
+  GNUNET_assert (NULL != our_hello);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
               "Refreshed my `%s', new size is %d\n", "HELLO",
               GNUNET_HELLO_size (our_hello));
-#endif
   GNUNET_STATISTICS_update (GST_stats, gettext_noop ("# refreshed my HELLO"), 1,
                             GNUNET_NO);
   if (NULL != hello_cb)
     hello_cb (hello_cb_cls, GST_hello_get ());
-  GNUNET_PEERINFO_add_peer (GST_peerinfo, our_hello);
+  GNUNET_PEERINFO_add_peer (GST_peerinfo, our_hello, NULL, NULL);
   hello_task =
       GNUNET_SCHEDULER_add_delayed (HELLO_REFRESH_PERIOD, &refresh_hello_task,
                                     NULL);
@@ -206,6 +209,7 @@ GST_hello_start (GST_HelloCallback cb, void *cb_cls)
   hello_cb = cb;
   hello_cb_cls = cb_cls;
   our_hello = GNUNET_HELLO_create (&GST_my_public_key, NULL, NULL);
+  GNUNET_assert (NULL != our_hello);
   refresh_hello ();
 }
 
@@ -251,25 +255,21 @@ GST_hello_get ()
  */
 void
 GST_hello_modify_addresses (int addremove,
-                           const struct GNUNET_HELLO_Address *address)
+                            const struct GNUNET_HELLO_Address *address)
 {
   struct OwnAddressList *al;
 
-#if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              (add_remove ==
-               GNUNET_YES) ? "Adding `%s':%s to the set of our addresses\n" :
-              "Removing `%s':%s from the set of our addresses\n",
-              GST_plugins_a2s (address), p->short_name);
-#endif
+              (addremove ==
+               GNUNET_YES) ? "Adding `%s' to the set of our addresses\n" :
+              "Removing `%s' from the set of our addresses\n",
+              GST_plugins_a2s (address));
   GNUNET_assert (address != NULL);
   if (GNUNET_NO == addremove)
   {
     for (al = oal_head; al != NULL; al = al->next)
-      if (0 ==
-         GNUNET_HELLO_address_cmp (address,
-                                   al->address))
-       {
+      if (0 == GNUNET_HELLO_address_cmp (address, al->address))
+      {
         GNUNET_CONTAINER_DLL_remove (oal_head, oal_tail, al);
         GNUNET_HELLO_address_free (al->address);
         GNUNET_free (al);
@@ -299,14 +299,13 @@ GST_hello_modify_addresses (int addremove,
  */
 int
 GST_hello_test_address (const struct GNUNET_HELLO_Address *address,
-                        struct GNUNET_CRYPTO_RsaSignature **sig,
+                        struct GNUNET_CRYPTO_EccSignature **sig,
                         struct GNUNET_TIME_Absolute **sig_expiration)
 {
   struct OwnAddressList *al;
 
   for (al = oal_head; al != NULL; al = al->next)
-    if (0 == GNUNET_HELLO_address_cmp (address,
-                                      al->address))
+    if (0 == GNUNET_HELLO_address_cmp (address, al->address))
     {
       *sig = &al->pong_signature;
       *sig_expiration = &al->pong_sig_expires;