-fix NPE

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

diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c
index e04819711d927fc93798a16889c7b0d911a4456d..f1154a95f33d0abb68f835f93b71ab10202dace7 100644 (file)
--- a/src/transport/transport_api_monitor_peers.c
+++ b/src/transport/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-2014 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.
 */
 
 /**
@@ -74,7 +74,7 @@ struct GNUNET_TRANSPORT_PeerMonitoringContext
   /**
    * Task ID for reconnect.
    */
-  GNUNET_SCHEDULER_TaskIdentifier reconnect_task;
+  struct GNUNET_SCHEDULER_Task *reconnect_task;
 
   /**
    * Identity of the peer to monitor.
@@ -101,21 +101,21 @@ GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state)
   {
   case GNUNET_TRANSPORT_PS_NOT_CONNECTED:
   case GNUNET_TRANSPORT_PS_INIT_ATS:
-  case GNUNET_TRANSPORT_PS_CONNECT_SENT:
-  case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:
-  case GNUNET_TRANSPORT_PS_CONNECT_RECV_ACK:
+  case GNUNET_TRANSPORT_PS_SYN_SENT:
+  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
+  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
     return GNUNET_NO;
   case GNUNET_TRANSPORT_PS_CONNECTED:
   case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
   case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
-  case GNUNET_TRANSPORT_PS_CONNECTED_SWITCHING_CONNECT_SENT:
+  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
     return GNUNET_YES;
   case GNUNET_TRANSPORT_PS_DISCONNECT:
   case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
     return GNUNET_NO;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unhandled state `%s' \n",
+                "Unhandled state `%s'\n",
                 GNUNET_TRANSPORT_ps2s (state));
     GNUNET_break (0);
     break;
@@ -139,20 +139,20 @@ GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state)
     return "S_NOT_CONNECTED";
   case GNUNET_TRANSPORT_PS_INIT_ATS:
     return "S_INIT_ATS";
-  case GNUNET_TRANSPORT_PS_CONNECT_SENT:
-    return "S_CONNECT_SENT";
-  case GNUNET_TRANSPORT_PS_CONNECT_RECV_ATS:
-    return "S_CONNECT_RECV_ATS";
-  case GNUNET_TRANSPORT_PS_CONNECT_RECV_ACK:
-    return "S_CONNECT_RECV_ACK";
+  case GNUNET_TRANSPORT_PS_SYN_SENT:
+    return "S_SYN_SENT";
+  case GNUNET_TRANSPORT_PS_SYN_RECV_ATS:
+    return "S_SYN_RECV_ATS";
+  case GNUNET_TRANSPORT_PS_SYN_RECV_ACK:
+    return "S_SYN_RECV_ACK";
   case GNUNET_TRANSPORT_PS_CONNECTED:
     return "S_CONNECTED";
   case GNUNET_TRANSPORT_PS_RECONNECT_ATS:
     return "S_RECONNECT_ATS";
   case GNUNET_TRANSPORT_PS_RECONNECT_SENT:
     return "S_RECONNECT_SENT";
-  case GNUNET_TRANSPORT_PS_CONNECTED_SWITCHING_CONNECT_SENT:
-    return "S_CONNECTED_SWITCHING_CONNECT_SENT";
+  case GNUNET_TRANSPORT_PS_SWITCH_SYN_SENT:
+    return "S_SWITCH_SYN_SENT";
   case GNUNET_TRANSPORT_PS_DISCONNECT:
     return "S_DISCONNECT";
   case GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED:
@@ -167,7 +167,7 @@ GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state)
 /**
  * Function called with responses from the service.
  *
- * @param cls our `struct GNUNET_TRANSPORT_PeerAddressLookupContext *`
+ * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
  * @param msg NULL on timeout or error, otherwise presumably a
  *        message with the human-readable address
  */
@@ -203,7 +203,7 @@ send_peer_mon_request (struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx)
 /**
  * Task run to re-establish the connection.
  *
- * @param cls our `struct GNUNET_TRANSPORT_PeerAddressLookupContext *`
+ * @param cls our `struct GNUNET_TRANSPORT_PeerMonitoringContext *`
  * @param tc scheduler context, unused
  */
 static void
@@ -212,7 +212,7 @@ do_peer_connect (void *cls,
 {
   struct GNUNET_TRANSPORT_PeerMonitoringContext *pal_ctx = cls;
 
-  pal_ctx->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+  pal_ctx->reconnect_task = NULL;
   pal_ctx->client = GNUNET_CLIENT_connect ("transport", pal_ctx->cfg);
   GNUNET_assert (NULL != pal_ctx->client);
   send_peer_mon_request (pal_ctx);
@@ -423,7 +423,7 @@ GNUNET_TRANSPORT_monitor_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
   struct GNUNET_CLIENT_Connection *client;
 
   client = GNUNET_CLIENT_connect ("transport", cfg);
-  if (client == NULL)
+  if (NULL == client)
     return NULL;
   if (GNUNET_YES != one_shot)
     timeout = GNUNET_TIME_UNIT_FOREVER_REL;
@@ -455,10 +455,10 @@ GNUNET_TRANSPORT_monitor_peers_cancel (struct GNUNET_TRANSPORT_PeerMonitoringCon
     GNUNET_CLIENT_disconnect (pic->client);
     pic->client = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != pic->reconnect_task)
+  if (NULL != pic->reconnect_task)
   {
     GNUNET_SCHEDULER_cancel (pic->reconnect_task);
-    pic->reconnect_task = GNUNET_SCHEDULER_NO_TASK;
+    pic->reconnect_task = NULL;
   }
   GNUNET_free (pic);
 }