-fix NPE

[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 ef425d444d2ef57bbb2b1460d9e1342cdaf5bcb7..13a7baec8466323b085efca14e107e41cadf0a26 100644 (file)
--- a/src/transport/test_transport_api_monitor_peers.c
+++ b/src/transport/test_transport_api_monitor_peers.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file transport/test_transport_api_monitor_peers.c
@@ -91,7 +91,10 @@ end ()
               "Stopping peers\n");
 
   if (send_task != NULL)
+  {
     GNUNET_SCHEDULER_cancel (send_task);
+    send_task = NULL;
+  }
 
   if (die_task != NULL)
   {
@@ -121,8 +124,6 @@ end ()
     pmc_p2 = NULL;
   }
 
-
-
   ok = 0;
 }
 
@@ -132,12 +133,13 @@ end_badly (void *cls,
            const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   die_task = NULL;
-
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Fail! Stopping peers\n");
 
-
   if (send_task != NULL)
+  {
     GNUNET_SCHEDULER_cancel (send_task);
+    send_task = NULL;
+  }
 
   if (cc != NULL)
   {
@@ -389,15 +391,15 @@ monitor1_cb (void *cls,
              enum GNUNET_TRANSPORT_PeerState state,
              struct GNUNET_TIME_Absolute state_timeout)
 {
-  if ((NULL == peer) || (NULL == p1))
+  if ((NULL == address) || (NULL == p1))
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Monitor 1: %s %s %s\n",
-              GNUNET_i2s (peer),
+              GNUNET_i2s (&address->peer),
               GNUNET_TRANSPORT_ps2s (state),
               GNUNET_STRINGS_absolute_time_to_string(state_timeout));
-  if ((0 == memcmp (peer, &p2->id, sizeof (p2->id)) &&
+  if ((0 == memcmp (&address->peer, &p2->id, sizeof (p2->id)) &&
       (GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) &&
       GNUNET_NO == p1_c) )
   {
@@ -415,15 +417,15 @@ monitor2_cb (void *cls,
              enum GNUNET_TRANSPORT_PeerState state,
              struct GNUNET_TIME_Absolute state_timeout)
 {
-  if ((NULL == peer) || (NULL == p2))
+  if ((NULL == address) || (NULL == p2))
     return;
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Monitor 2: %s %s %s\n",
-              GNUNET_i2s (peer),
+              GNUNET_i2s (&address->peer),
               GNUNET_TRANSPORT_ps2s (state),
               GNUNET_STRINGS_absolute_time_to_string(state_timeout));
-  if ((0 == memcmp (peer, &p1->id, sizeof (p1->id)) &&
+  if ((0 == memcmp (&address->peer, &p1->id, sizeof (p1->id)) &&
       (GNUNET_YES == GNUNET_TRANSPORT_is_connected(state)) &&
       GNUNET_NO == p2_c) )
   {