Merge remote-tracking branch 'origin/identity_abe' into identity_oidc

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

diff --git a/src/transport/test_transport_api_monitor_peers.c b/src/transport/test_transport_api_monitor_peers.c
index 37f50c4fcacb66f4412f91db872f6b2ece4b4116..4a0f1a23f62d7b03dcf15f3806647927caf935ba 100644 (file)
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.c
@@ -39,8 +39,6 @@
 
 #define TEST_MESSAGE_TYPE 12345
 
-static struct GNUNET_TRANSPORT_TransmitHandle *th;
-
 static struct GNUNET_TRANSPORT_TESTING_ConnectCheckContext *ccc;
 
 static struct GNUNET_TRANSPORT_PeerMonitoringContext *pmc_p1;
@@ -59,11 +57,6 @@ static int p2_c_notify;
 static void
 custom_shutdown (void *cls)
 {
-  if (th != NULL)
-  {
-    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
-    th = NULL;
-  }
   if (NULL != pmc_p1)
   {
     GNUNET_TRANSPORT_monitor_peers_cancel (pmc_p1);
@@ -139,22 +132,6 @@ notify_connect (void *cls,
 }
 
 
-static void
-notify_disconnect (void *cls,
-                   struct GNUNET_TRANSPORT_TESTING_PeerContext *me,
-                   const struct GNUNET_PeerIdentity *other)
-{
-  GNUNET_TRANSPORT_TESTING_log_disconnect (cls,
-                                           me,
-                                           other);
-  if (NULL != th)
-  {
-    GNUNET_TRANSPORT_notify_transmit_ready_cancel (th);
-    th = NULL;
-  }
-}
-
-
 static void
 monitor1_cb (void *cls,
              const struct GNUNET_PeerIdentity *peer,
@@ -230,7 +207,7 @@ main (int argc, char *argv[])
     .config_file = "test_transport_api_data.conf",
     .rec = &notify_receive,
     .nc = &notify_connect,
-    .nd = &notify_disconnect,
+    .nd = &GNUNET_TRANSPORT_TESTING_log_disconnect,
     .shutdown_task = &custom_shutdown,
     .timeout = TIMEOUT
   };