-allow caller ID to differ from zone used for resolution

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

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index c701970d16b48e65ca9c25dde6f0f971c5c195ad..85f97e04c7edc46e719e56c827a78c9d534416d0 100644 (file)
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -545,10 +545,10 @@ display_test_result (struct TestContext *tc, enum TestResult result)
  * @param emsg error message, NULL on success
  */
 static void
-result_callback (void *cls, int success, const char *emsg)
+result_callback (void *cls, enum GNUNET_NAT_FailureCode result)
 {
   struct TestContext *tc = cls;
-  display_test_result (tc, success);
+  display_test_result (tc, result);
 }
 
 /**
@@ -579,7 +579,7 @@ resolve_validation_address (const struct GNUNET_PeerIdentity *id,
 
 
 static void
-process_validation_string (void *cls, const char *address)
+process_validation_string (void *cls, const char *address, int res)
 {
   struct ValidationResolutionContext *vc = cls;
   char *s_valid;
@@ -588,6 +588,13 @@ process_validation_string (void *cls, const char *address)
 
   if (address != NULL )
   {
+    if (GNUNET_SYSERR == res)
+    {
+      FPRINTF (stderr, "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n",
+          GNUNET_i2s (&vc->id),
+          vc->addrcp->transport_name,
+          vc->addrcp->address_length);
+    }
     if (GNUNET_TIME_UNIT_ZERO_ABS.abs_value_us == vc->valid_until.abs_value_us)
       s_valid = GNUNET_strdup("never");
     else
@@ -605,7 +612,8 @@ process_validation_string (void *cls, const char *address)
 
     FPRINTF (stdout,
         _("Peer `%s' %s %s\n\t%s%s\n\t%s%s\n\t%s%s\n"),
-        GNUNET_i2s (&vc->id), address,
+        GNUNET_i2s (&vc->id),
+        (GNUNET_OK == res) ? address : "<invalid address>",
         (monitor_validation) ? GNUNET_TRANSPORT_vs2s (vc->state) : "",
         "Valid until    : ", s_valid,
         "Last validation: ",s_last,
@@ -618,9 +626,10 @@ process_validation_string (void *cls, const char *address)
   else
   {
     /* done */
+
     GNUNET_assert(address_resolutions > 0);
     address_resolutions--;
-    if (GNUNET_NO == vc->printed)
+    if ((GNUNET_SYSERR == res) && (GNUNET_NO == vc->printed))
     {
       if (numeric == GNUNET_NO)
       {
@@ -701,6 +710,14 @@ process_validation_cb (void *cls,
 {
   if ((NULL == peer) && (NULL == address))
   {
+    if (monitor_validation)
+    {
+      FPRINTF (stdout,
+               "%s",
+               _("Monitor disconnected from transport service. Reconnecting.\n"));
+      return;
+    }
+
     /* done */
     vic = NULL;
     if (GNUNET_SCHEDULER_NO_TASK != end)
@@ -851,6 +868,7 @@ transmit_data (void *cls, size_t size, void *buf)
   return size;
 }
 
+
 /**
  * Function called to notify transport users that another
  * peer connected to us.
@@ -971,6 +989,7 @@ monitor_notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer)
       _("Connected to"), GNUNET_i2s (peer), monitor_connect_counter);
 }
 
+
 /**
  * Function called to notify transport users that another
  * peer disconnected from us.
@@ -991,6 +1010,7 @@ monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
       _("Disconnected from"), GNUNET_i2s (peer), monitor_connect_counter);
 }
 
+
 /**
  * Function called by the transport for each received message.
  *
@@ -999,8 +1019,9 @@ monitor_notify_disconnect (void *cls, const struct GNUNET_PeerIdentity *peer)
  * @param message the message
  */
 static void
-notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_MessageHeader *message)
+notify_receive (void *cls,
+                const struct GNUNET_PeerIdentity *peer,
+                const struct GNUNET_MessageHeader *message)
 {
   if (benchmark_receive)
   {
@@ -1054,16 +1075,29 @@ print_info (const struct GNUNET_PeerIdentity *id,
 
 
 static void
-process_peer_string (void *cls, const char *address)
+process_peer_string (void *cls, const char *address, int res)
 {
   struct PeerResolutionContext *rc = cls;
 
-  if (address != NULL )
+  if (GNUNET_SYSERR == res)
+  {
+    FPRINTF (stderr, "Failed to convert address for peer `%s' plugin `%s' length %lu to string \n",
+        GNUNET_i2s (&rc->id),
+        rc->addrcp->transport_name,
+        rc->addrcp->address_length);
+    print_info (&rc->id, rc->transport, NULL, rc->state, rc->state_timeout);
+    rc->printed = GNUNET_YES;
+    return;
+  }
+
+  if ((GNUNET_OK == res) && (address != NULL))
   {
     print_info (&rc->id, rc->transport, address, rc->state, rc->state_timeout);
     rc->printed = GNUNET_YES;
+    return; /* Wait for done call */
   }
-  else
+
+  if (NULL == address)
   {
     /* done */
     GNUNET_assert(address_resolutions > 0);
@@ -1078,7 +1112,7 @@ process_peer_string (void *cls, const char *address)
       }
       else
       {
-        print_info (&rc->id, rc->transport, "<unable to resolve address>",
+        print_info (&rc->id, rc->transport, NULL,
             rc->state, rc->state_timeout);
       }
     }
@@ -1140,7 +1174,6 @@ resolve_peer_address (const struct GNUNET_PeerIdentity *id,
  *  NULL on disconnect or when done
  * @param state current state this peer is in
  * @param state_timeout time out for the current state
- *
  */
 static void
 process_peer_iteration_cb (void *cls,
@@ -1151,12 +1184,6 @@ process_peer_iteration_cb (void *cls,
 {
   if (NULL == peer)
   {
-    if (monitor_connections)
-    {
-      FPRINTF (stdout,
-               _("Monitor disconnected from transport service. Reconnecting.\n"));
-      return;
-    }
     /* done */
     address_resolution_in_progress = GNUNET_NO;
     pic = NULL;
@@ -1166,13 +1193,14 @@ process_peer_iteration_cb (void *cls,
     return;
   }
 
-  if ((GNUNET_NO == iterate_all) && (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)) )
+  if ( (GNUNET_NO == iterate_all) &&
+       (GNUNET_NO == GNUNET_TRANSPORT_is_connected(state)) )
       return; /* Display only connected peers */
 
   if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
     GNUNET_SCHEDULER_cancel (op_timeout);
   op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
-      NULL );
+                                             NULL);
 
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
              "Received address for peer `%s': %s\n",
@@ -1197,28 +1225,26 @@ process_peer_iteration_cb (void *cls,
  *
  */
 static void
-process_peer_monitoring_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
-    const struct GNUNET_HELLO_Address *address,
-    enum GNUNET_TRANSPORT_PeerState state,
-    struct GNUNET_TIME_Absolute state_timeout)
+process_peer_monitoring_cb (void *cls,
+                            const struct GNUNET_PeerIdentity *peer,
+                            const struct GNUNET_HELLO_Address *address,
+                            enum GNUNET_TRANSPORT_PeerState state,
+                            struct GNUNET_TIME_Absolute state_timeout)
 {
   struct MonitoredPeer *m;
 
-  if (peer == NULL )
+  if (NULL == peer)
   {
-    /* done */
-    address_resolution_in_progress = GNUNET_NO;
-    pic = NULL;
-    if (GNUNET_SCHEDULER_NO_TASK != end)
-      GNUNET_SCHEDULER_cancel (end);
-    end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL );
+    FPRINTF (stdout,
+             "%s",
+             _("Monitor disconnected from transport service. Reconnecting.\n"));
     return;
   }
 
   if (GNUNET_SCHEDULER_NO_TASK != op_timeout)
     GNUNET_SCHEDULER_cancel (op_timeout);
   op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT, &operation_timeout,
-      NULL );
+                                             NULL);
 
   if (NULL == (m = GNUNET_CONTAINER_multipeermap_get (monitored_peers, peer)))
   {
@@ -1490,7 +1516,8 @@ testservice_task (void *cls, int result)
   {
     monitor_connect_counter = 0;
     handle = GNUNET_TRANSPORT_connect (cfg, NULL, NULL, NULL,
-        &monitor_notify_connect, &monitor_notify_disconnect);
+                                       &monitor_notify_connect,
+                                       &monitor_notify_disconnect);
     if (NULL == handle)
     {
       FPRINTF (stderr, "%s", _("Failed to connect to transport service\n") );