-signal monitor disconnect via callback

2 files changed, 35 insertions, 26 deletions

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index c701970d1..28c4c84fb 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -701,6 +701,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 +859,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 +980,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 +1001,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 +1010,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)
   {
@@ -1140,7 +1152,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 +1162,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 +1171,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 +1203,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 +1494,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") );
diff --git a/src/transport/transport_api_monitoring.c b/src/transport/transport_api_monitoring.c
index 624ed4f74..371a5f568 100644
--- a/src/transport/transport_api_monitoring.c
+++ b/src/transport/transport_api_monitoring.c
@@ -339,6 +339,9 @@ reconnect_peer_ctx (struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx)
   GNUNET_assert (GNUNET_NO == pal_ctx->one_shot);
   GNUNET_CLIENT_disconnect (pal_ctx->client);
   pal_ctx->client = NULL;
+  pal_ctx->cb (pal_ctx->cb_cls, NULL, NULL,
+               GNUNET_TRANSPORT_PS_NOT_CONNECTED,
+               GNUNET_TIME_UNIT_ZERO_ABS);
   pal_ctx->backoff = GNUNET_TIME_STD_BACKOFF (pal_ctx->backoff);
   pal_ctx->reconnect_task = GNUNET_SCHEDULER_add_delayed (pal_ctx->backoff,
                                                           &do_peer_connect,
@@ -549,7 +552,8 @@ val_response_processor (void *cls, const struct GNUNET_MessageHeader *msg)
  *        message with the human-readable address
  */
 static void
-peer_response_processor (void *cls, const struct GNUNET_MessageHeader *msg)
+peer_response_processor (void *cls,
+                         const struct GNUNET_MessageHeader *msg)
 {
   struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx = cls;
   struct PeerIterateResponseMessage *pir_msg;
@@ -560,7 +564,7 @@ peer_response_processor (void *cls, const struct GNUNET_MessageHeader *msg)
   size_t alen;
   size_t tlen;
 
-  if (msg == NULL)
+  if (NULL == msg)
   {
     if (pal_ctx->one_shot)
     {