gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] r31217 - gnunet/src/transport


From: gnunet
Subject: [GNUnet-SVN] r31217 - gnunet/src/transport
Date: Mon, 9 Dec 2013 15:29:40 +0100

Author: grothoff
Date: 2013-12-09 15:29:39 +0100 (Mon, 09 Dec 2013)
New Revision: 31217

Modified:
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/gnunet-service-transport_clients.c
   gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
-doxygen, indentation fixes

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2013-12-09 14:00:29 UTC 
(rev 31216)
+++ gnunet/src/transport/gnunet-service-transport.c     2013-12-09 14:29:39 UTC 
(rev 31217)
@@ -151,23 +151,24 @@
   do_forward = GNUNET_SYSERR;
   ret = GST_neighbours_calculate_receive_delay (peer, msg_size, &do_forward);
 
-  if (!GST_neighbours_test_connected (peer))
+  if (! GST_neighbours_test_connected (peer))
   {
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Discarded %u bytes type %u payload from peer `%s'\n", 
msg_size,
+                "Discarded %u bytes type %u payload from peer `%s'\n",
+                msg_size,
                 ntohs (message->type), GNUNET_i2s (peer));
 
     GNUNET_STATISTICS_update (GST_stats,
                               gettext_noop
-                              ("# bytes payload discarded due to not connected 
peer "),
+                              ("# bytes payload discarded due to not connected 
peer"),
                               msg_size, GNUNET_NO);
     return ret;
   }
 
   GST_ats_add_address ((struct GNUNET_HELLO_Address *) address, session);
 
-  if (do_forward != GNUNET_YES)
+  if (GNUNET_YES != do_forward)
     return ret;
   im = (struct InboundMessage *) buf;
   im->header.size = htons (size);
@@ -203,11 +204,12 @@
  *         (plugins that do not support this, can ignore the return value)
  */
 struct GNUNET_TIME_Relative
-GST_receive_callback (void *cls, const struct GNUNET_PeerIdentity *peer,
-                             const struct GNUNET_MessageHeader *message,
-                             struct Session *session,
-                             const char *sender_address,
-                             uint16_t sender_address_len)
+GST_receive_callback (void *cls,
+                      const struct GNUNET_PeerIdentity *peer,
+                      const struct GNUNET_MessageHeader *message,
+                      struct Session *session,
+                      const char *sender_address,
+                      uint16_t sender_address_len)
 {
   const char *plugin_name = cls;
   struct GNUNET_TIME_Relative ret;
@@ -222,11 +224,14 @@
   if (NULL == message)
     goto end;
   type = ntohs (message->type);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received Message with type %u from 
peer `%s'\n", type, GNUNET_i2s (peer));
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Received Message with type %u from peer `%s'\n",
+              type,
+              GNUNET_i2s (peer));
 
   GNUNET_STATISTICS_update (GST_stats,
-                        gettext_noop
-                        ("# bytes total received"),
+                            gettext_noop
+                            ("# bytes total received"),
                             ntohs (message->size), GNUNET_NO);
   GST_neighbours_notify_data_recv (peer, &address, session, message);
 
@@ -298,7 +303,7 @@
  *                   set of valid addresses?
  * @param addr one of the addresses of the host
  *        the specific address format depends on the transport
- * @param addrlen length of the address
+ * @param addrlen length of the @a addr
  * @param dest_plugin destination plugin to use this address with
  */
 static void
@@ -400,46 +405,46 @@
  */
 void
 GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
-                                                                               
 struct Session *session)
+                     struct Session *session)
 {
   struct GNUNET_TRANSPORT_PluginFunctions *papi;
-       struct GNUNET_ATS_Information ats;
-       uint32_t net;
+  struct GNUNET_ATS_Information ats;
+  uint32_t net;
 
   /* valid new address, let ATS know! */
   if (NULL == address->transport_name)
   {
-       GNUNET_break (0);
-       return;
+    GNUNET_break (0);
+    return;
   }
   if (NULL == (papi = GST_plugins_find (address->transport_name)))
   {
     /* we don't have the plugin for this address */
-       GNUNET_break (0);
-       return;
+    GNUNET_break (0);
+    return;
   }
 
   if (GNUNET_YES == GNUNET_ATS_session_known (GST_ats, address, session))
-       return;
+    return;
 
-       net = papi->get_network (NULL, (void *) session);
+  net = papi->get_network (NULL, (void *) session);
   if (GNUNET_ATS_NET_UNSPECIFIED == net)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                                               _("Could not obtain a valid 
network for `%s' %s\n"),
+                _("Could not obtain a valid network for `%s' %s\n"),
                 GNUNET_i2s (&address->peer), GST_plugins_a2s (address));
-       GNUNET_break (0);
+    GNUNET_break (0);
   }
-       ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-       ats.value = htonl(net);
-       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                       "Notifying ATS about peer `%s''s new address `%s' 
session %p in network %s\n",
-                       GNUNET_i2s (&address->peer),
-                       (0 == address->address_length) ? "<inbound>" : 
GST_plugins_a2s (address),
-                       session,
-                       GNUNET_ATS_print_network_type(net));
-       GNUNET_ATS_address_add (GST_ats,
-                       address, session, &ats, 1);
+  ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
+  ats.value = htonl(net);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Notifying ATS about peer `%s''s new address `%s' session %p in 
network %s\n",
+              GNUNET_i2s (&address->peer),
+              (0 == address->address_length) ? "<inbound>" : GST_plugins_a2s 
(address),
+              session,
+              GNUNET_ATS_print_network_type(net));
+  GNUNET_ATS_address_add (GST_ats,
+                          address, session, &ats, 1);
 }
 
 
@@ -450,7 +455,7 @@
  * @param address the address
  * @param session the session
  * @param ats performance information
- * @param ats_count number of elements in ats
+ * @param ats_count number of elements in @a ats
  */
 void
 GST_ats_update_metrics (const struct GNUNET_PeerIdentity *peer,
@@ -459,14 +464,14 @@
                        const struct GNUNET_ATS_Information *ats,
                        uint32_t ats_count)
 {
-       struct GNUNET_ATS_Information *ats_new;
+  struct GNUNET_ATS_Information *ats_new;
 
   if (GNUNET_NO == GNUNET_ATS_session_known (GST_ats, address, session))
     return;
 
   /* Call to manipulation to manipulate ATS information */
   ats_new = GST_manipulation_manipulate_metrics (peer, address, session, ats,
-      ats_count);
+                                                 ats_count);
   if (NULL == ats_new)
   {
     GNUNET_break(0);
@@ -475,12 +480,14 @@
   if (GNUNET_NO == GNUNET_ATS_address_update (GST_ats,
       address, session, ats_new, ats_count))
   {
-    GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
-        _("Address or session unknown: failed to update properties for peer 
`%s' plugin `%s' address `%s' session %p\n"),
-        GNUNET_i2s (peer), address->transport_name, GST_plugins_a2s (address),
-        session);
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                _("Address or session unknown: failed to update properties for 
peer `%s' plugin `%s' address `%s' session %p\n"),
+                GNUNET_i2s (peer),
+                address->transport_name,
+                GST_plugins_a2s (address),
+                session);
   }
-  GNUNET_free(ats_new);
+  GNUNET_free (ats_new);
 }
 
 
@@ -491,10 +498,10 @@
  * @param cls closure
  * @param peer the peer
  * @param address binary address
- * @param address_len length of the address
+ * @param address_len length of the @a address
  * @param session the session
  * @param ats the ats information to update
- * @param ats_count the number of ats elements
+ * @param ats_count the number of @a ats elements
  */
 static void
 plugin_env_update_metrics (void *cls,
@@ -505,24 +512,27 @@
                           const struct GNUNET_ATS_Information *ats,
                           uint32_t ats_count)
 {
+  const char *plugin_name = cls;
   struct GNUNET_HELLO_Address haddress;
-  const char *plugin_name = cls;
 
-       if ((NULL == ats) || (0 == ats_count))
-               return;
-       GNUNET_assert (NULL != GST_ats);
+  if ((NULL == ats) || (0 == ats_count))
+    return;
+  GNUNET_assert (NULL != GST_ats);
 
-
-       haddress.peer = *peer;
-       haddress.address = address;
+  haddress.peer = *peer;
+  haddress.address = address;
   haddress.address_length = address_len;
   haddress.transport_name = plugin_name;
 
-       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating metrics for peer `%s' 
address %s session %p\n",
-                       GNUNET_i2s (peer), GST_plugins_a2s(&haddress), session);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Updating metrics for peer `%s' address %s session %p\n",
+              GNUNET_i2s (peer),
+              GST_plugins_a2s (&haddress),
+              session);
   GST_ats_update_metrics (peer, &haddress, session, ats, ats_count);
 }
 
+
 /**
  * Plugin tells transport service about a new (inbound) session
  *
@@ -530,19 +540,22 @@
  * @param peer the peer
  * @param plugin plugin name
  * @param address address
- * @param address_len address length
+ * @param address_len @a address length
  * @param session the new session
  * @param ats ats information
- * @param ats_count number of ats information
+ * @param ats_count number of @a ats information
  */
-
 static void
-plugin_env_session_start (void *cls, const struct GNUNET_PeerIdentity *peer,
-    const char *plugin, const void *address, uint16_t address_len,
-    struct Session *session, const struct GNUNET_ATS_Information *ats,
-    uint32_t ats_count)
+plugin_env_session_start (void *cls,
+                          const struct GNUNET_PeerIdentity *peer,
+                          const char *plugin,
+                          const void *address, uint16_t address_len,
+                          struct Session *session,
+                          const struct GNUNET_ATS_Information *ats,
+                          uint32_t ats_count)
 {
   struct GNUNET_HELLO_Address *addr;
+
   if (NULL == peer)
   {
     GNUNET_break(0);
@@ -561,8 +574,11 @@
 
   addr = GNUNET_HELLO_address_allocate (peer, plugin, address, address_len);
   GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
-      "Notification from plugin `%s' about new session %p from peer `%s' 
address `%s'\n",
-      plugin, session, GNUNET_i2s (peer), GST_plugins_a2s (addr));
+             "Notification from plugin `%s' about new session %p from peer 
`%s' address `%s'\n",
+             plugin,
+             session,
+             GNUNET_i2s (peer),
+             GST_plugins_a2s (addr));
   GST_ats_add_address (addr, session);
 
   if (0 < ats_count)
@@ -570,6 +586,7 @@
   GNUNET_free(addr);
 }
 
+
 /**
  * Function called by ATS to notify the callee that the
  * assigned bandwidth or address for a given peer was changed.  If the
@@ -585,7 +602,7 @@
  * @param bandwidth_in assigned inbound bandwidth for the connection in NBO,
  *     0 to disconnect from peer
  * @param ats ATS information
- * @param ats_count number of ATS elements
+ * @param ats_count number of @a ats elements
  */
 static void
 ats_request_address_change (void *cls,
@@ -756,8 +773,7 @@
                                                &keyfile))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _
-                ("Transport service is lacking key configuration settings.  
Exiting.\n"));
+                _("Transport service is lacking key configuration settings. 
Exiting.\n"));
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -800,7 +816,8 @@
   {
     max_fd_rlimit = r_file.rlim_cur;
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-               "Maximum number of open files was: %u/%u\n", r_file.rlim_cur,
+               "Maximum number of open files was: %u/%u\n",
+                r_file.rlim_cur,
                r_file.rlim_max);
   }
   max_fd_rlimit = (9 * max_fd_rlimit) / 10; /* Keep 10% for rest of transport 
*/

Modified: gnunet/src/transport/gnunet-service-transport_clients.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_clients.c     2013-12-09 
14:00:29 UTC (rev 31216)
+++ gnunet/src/transport/gnunet-service-transport_clients.c     2013-12-09 
14:29:39 UTC (rev 31217)
@@ -201,7 +201,7 @@
  * Notification context, to send updates on changes to active addresses
  * of our neighbours.
  */
-struct GNUNET_SERVER_NotificationContext *nc = NULL;
+static struct GNUNET_SERVER_NotificationContext *nc;
 
 
 /**
@@ -215,13 +215,9 @@
 {
   struct TransportClient *tc;
 
-  tc = clients_head;
-  while (tc != NULL)
-  {
+  for (tc = clients_head; NULL != tc; tc = tc->next)
     if (tc->client == client)
       return tc;
-    tc = tc->next;
-  }
   return NULL;
 }
 
@@ -237,10 +233,12 @@
 {
   struct TransportClient *tc;
 
-  GNUNET_assert (lookup_client (client) == NULL);
-  tc = GNUNET_malloc (sizeof (struct TransportClient));
+  GNUNET_assert (NULL == lookup_client (client));
+  tc = GNUNET_new (struct TransportClient);
   tc->client = client;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p connected\n", tc);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client %p connected\n",
+              tc);
   return tc;
 }
 
@@ -257,13 +255,9 @@
 {
   struct MonitoringClient *mc;
 
-  mc = monitoring_clients_head;
-  while (mc != NULL)
-  {
+  for (mc = monitoring_clients_head; NULL != mc; mc = mc->next)
     if (mc->client == client)
       return mc;
-    mc = mc->next;
-  }
   return NULL;
 }
 
@@ -285,7 +279,7 @@
   static struct GNUNET_PeerIdentity all_zeros;
 
   GNUNET_assert (lookup_monitoring_client (client) == NULL);
-  mc = GNUNET_malloc (sizeof (struct MonitoringClient));
+  mc = GNUNET_new (struct MonitoringClient);
   mc->client = client;
   mc->peer = *peer;
   GNUNET_CONTAINER_DLL_insert (monitoring_clients_head,
@@ -310,9 +304,9 @@
  * was closed for writing in the meantime.
  *
  * @param cls closure
- * @param size number of bytes available in buf
+ * @param size number of bytes available in @a buf
  * @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @return number of bytes written to @a buf
  */
 static size_t
 transmit_to_client_callback (void *cls, size_t size, void *buf)
@@ -325,7 +319,7 @@
   size_t tsize;
 
   tc->th = NULL;
-  if (buf == NULL)
+  if (NULL == buf)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Transmission to client failed, closing connection.\n");
@@ -342,7 +336,8 @@
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Transmitting message of type %u to client %p.\n",
                 ntohs (msg->type), tc);
-    GNUNET_CONTAINER_DLL_remove (tc->message_queue_head, 
tc->message_queue_tail,
+    GNUNET_CONTAINER_DLL_remove (tc->message_queue_head,
+                                 tc->message_queue_tail,
                                  q);
     tc->message_count--;
     memcpy (&cbuf[tsize], msg, msize);
@@ -356,7 +351,7 @@
         GNUNET_SERVER_notify_transmit_ready (tc->client, msize,
                                              GNUNET_TIME_UNIT_FOREVER_REL,
                                              &transmit_to_client_callback, tc);
-    GNUNET_assert (tc->th != NULL);
+    GNUNET_assert (NULL != tc->th);
   }
   return tsize;
 }
@@ -367,16 +362,17 @@
  *
  * @param tc target of the message
  * @param msg message to transmit
- * @param may_drop GNUNET_YES if the message can be dropped
+ * @param may_drop #GNUNET_YES if the message can be dropped
  */
 static void
-unicast (struct TransportClient *tc, const struct GNUNET_MessageHeader *msg,
+unicast (struct TransportClient *tc,
+         const struct GNUNET_MessageHeader *msg,
          int may_drop)
 {
   struct ClientMessageQueueEntry *q;
   uint16_t msize;
 
-  if (msg == NULL)
+  if (NULL == msg)
   {
     GNUNET_break (0);
     return;
@@ -402,13 +398,13 @@
   GNUNET_CONTAINER_DLL_insert_tail (tc->message_queue_head,
                                     tc->message_queue_tail, q);
   tc->message_count++;
-  if (tc->th != NULL)
+  if (NULL != tc->th)
     return;
   tc->th =
       GNUNET_SERVER_notify_transmit_ready (tc->client, msize,
                                            GNUNET_TIME_UNIT_FOREVER_REL,
                                            &transmit_to_client_callback, tc);
-  GNUNET_assert (tc->th != NULL);
+  GNUNET_assert (NULL != tc->th);
 }
 
 
@@ -585,13 +581,14 @@
  * OK to send the next message.
  *
  * @param cls closure
- * @param success GNUNET_OK on success, GNUNET_NO on failure, GNUNET_SYSERR if 
we're not connected
+ * @param success #GNUNET_OK on success, #GNUNET_NO on failure, #GNUNET_SYSERR 
if we're not connected
  * @param bytes_payload bytes payload sent
  * @param bytes_on_wire bytes sent on wire
  */
 static void
 handle_send_transmit_continuation (void *cls, int success,
-                                   size_t bytes_payload, size_t bytes_on_wire)
+                                   size_t bytes_payload,
+                                   size_t bytes_on_wire)
 {
   struct SendTransmitContinuationContext *stcc = cls;
   struct SendOkMessage send_ok_msg;
@@ -621,7 +618,8 @@
  * @param message the send message that was sent
  */
 static void
-clients_handle_send (void *cls, struct GNUNET_SERVER_Client *client,
+clients_handle_send (void *cls,
+                     struct GNUNET_SERVER_Client *client,
                      const struct GNUNET_MessageHeader *message)
 {
   const struct OutboundMessage *obm;
@@ -660,7 +658,10 @@
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received `%s' request from client with target `%4s' and first 
message of type %u and total size %u\n",
-              "SEND", GNUNET_i2s (&obm->peer), ntohs (obmm->type), msize);
+              "SEND",
+              GNUNET_i2s (&obm->peer),
+              ntohs (obmm->type),
+              msize);
   if (GNUNET_NO == GST_neighbours_test_connected (&obm->peer))
   {
     /* not connected, not allowed to send; can happen due to asynchronous 
operations */
@@ -691,11 +692,12 @@
  *
  * @param cls closure (unused, NULL)
  * @param peer identity of peer that was tested
- * @param result GNUNET_OK if the connection is allowed,
- *               GNUNET_NO if not
+ * @param result #GNUNET_OK if the connection is allowed,
+ *               #GNUNET_NO if not
  */
 static void
-try_connect_if_allowed (void *cls, const struct GNUNET_PeerIdentity *peer,
+try_connect_if_allowed (void *cls,
+                        const struct GNUNET_PeerIdentity *peer,
                         int result)
 {
   if (GNUNET_OK != result)
@@ -832,7 +834,7 @@
     GNUNET_SERVER_transmit_context_run (tc, rtimeout);
     return;
   }
-  actx = GNUNET_malloc (sizeof (struct AddressToStringContext));
+  actx = GNUNET_new (struct AddressToStringContext);
   actx->tc = tc;
   GNUNET_CONTAINER_DLL_insert (a2s_head, a2s_tail, actx);
   GNUNET_SERVER_disable_receive_done_warning (client);
@@ -850,10 +852,8 @@
  * @return composed message
  */
 static struct AddressIterateResponseMessage *
-compose_address_iterate_response_message (const struct GNUNET_PeerIdentity
-                                          *peer,
-                                          const struct GNUNET_HELLO_Address
-                                          *address)
+compose_address_iterate_response_message (const struct GNUNET_PeerIdentity 
*peer,
+                                          const struct GNUNET_HELLO_Address 
*address)
 {
   struct AddressIterateResponseMessage *msg;
   size_t size;
@@ -1032,7 +1032,6 @@
     GNUNET_CONTAINER_DLL_remove (a2s_head, a2s_tail, cur);
     GNUNET_free (cur);
   }
-
   if (NULL != nc)
   {
     GNUNET_SERVER_notification_context_destroy (nc);
@@ -1040,18 +1039,19 @@
   }
 }
 
+
 /**
  * Broadcast the given message to all of our clients.
  *
  * @param msg message to broadcast
- * @param may_drop GNUNET_YES if the message can be dropped / is payload
+ * @param may_drop #GNUNET_YES if the message can be dropped / is payload
  */
 void
 GST_clients_broadcast (const struct GNUNET_MessageHeader *msg, int may_drop)
 {
   struct TransportClient *tc;
 
-  for (tc = clients_head; tc != NULL; tc = tc->next)
+  for (tc = clients_head; NULL != tc; tc = tc->next)
   {
     if ((GNUNET_YES == may_drop) && (GNUNET_YES != tc->send_payload))
       continue;                 /* skip, this client does not care about 
payload */
@@ -1065,7 +1065,7 @@
  *
  * @param client target of the message
  * @param msg message to transmit
- * @param may_drop GNUNET_YES if the message can be dropped
+ * @param may_drop #GNUNET_YES if the message can be dropped
  */
 void
 GST_clients_unicast (struct GNUNET_SERVER_Client *client,
@@ -1087,10 +1087,8 @@
  * @param address address, NULL on disconnect
  */
 void
-GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity
-                                            *peer,
-                                            const struct GNUNET_HELLO_Address
-                                            *address)
+GST_clients_broadcast_address_notification (const struct GNUNET_PeerIdentity 
*peer,
+                                            const struct GNUNET_HELLO_Address 
*address)
 {
   struct AddressIterateResponseMessage *msg;
   struct MonitoringClient *mc;

Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-12-09 
14:00:29 UTC (rev 31216)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c  2013-12-09 
14:29:39 UTC (rev 31217)
@@ -557,9 +557,6 @@
    */
   uint32_t util_total_bytes_recv;
 
-
-
-
   /**
    * Date of last utilization transmission
    */
@@ -614,7 +611,7 @@
 static struct BlackListCheckContext *bc_tail;
 
 /**
- * Closure for connect_notify_cb, disconnect_notify_cb and address_change_cb
+ * Closure for #connect_notify_cb, #disconnect_notify_cb and #address_change_cb
  */
 static void *callback_cls;
 
@@ -663,6 +660,7 @@
   return GNUNET_CONTAINER_multipeermap_get (neighbours, pid);
 }
 
+
 static const char *
 print_state (int state)
 {
@@ -711,7 +709,7 @@
  * Test if we're connected to the given peer.
  *
  * @param n neighbour entry of peer to test
- * @return GNUNET_YES if we are connected, GNUNET_NO if not
+ * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
  */
 static int
 test_connected (struct NeighbourMapEntry *n)
@@ -740,7 +738,9 @@
   case S_DISCONNECT_FINISHED:
     return GNUNET_NO;
   default:
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Unhandled state `%s' \n",print_state 
(n->state));
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Unhandled state `%s' \n",
+                print_state (n->state));
     GNUNET_break (0);
     break;
   }
@@ -807,7 +807,7 @@
  *        address must be setup)
  * @param bandwidth_in inbound quota to be used when connection is up
  * @param bandwidth_out outbound quota to be used when connection is up
- * @param is_active GNUNET_YES to mark this as the active address with ATS
+ * @param is_active #GNUNET_YES to mark this as the active address with ATS
  */
 static void
 set_address (struct NeighbourAddress *na,
@@ -906,7 +906,6 @@
                           GNUNET_NO);
     disconnect_notify_cb (callback_cls, &n->id);
   }
-
   n->state = S_DISCONNECT_FINISHED;
 
   if (NULL != n->primary_address.address)
@@ -948,8 +947,8 @@
   // such a handle, we should cancel the operation here!
   if (NULL != n->suggest_handle)
   {
-       GNUNET_ATS_suggest_address_cancel (GST_ats, &n->id);
-       n->suggest_handle = NULL;
+    GNUNET_ATS_suggest_address_cancel (GST_ats, &n->id);
+    n->suggest_handle = NULL;
   }
 
   if (GNUNET_SCHEDULER_NO_TASK != n->task)
@@ -1018,7 +1017,7 @@
  *
  * @param cls NULL
  * @param target identity of the neighbour that was disconnected
- * @param result GNUNET_OK if the disconnect got out successfully
+ * @param result #GNUNET_OK if the disconnect got out successfully
  * @param payload bytes payload
  * @param physical bytes physical
  */
@@ -1033,7 +1032,6 @@
     return; /* already gone */
   if (S_DISCONNECT != n->state)
     return; /* have created a fresh entry since */
-  n->state = S_DISCONNECT;
   if (GNUNET_SCHEDULER_NO_TASK != n->task)
     GNUNET_SCHEDULER_cancel (n->task);
   n->task = GNUNET_SCHEDULER_add_now (&master_task, n);
@@ -3071,7 +3069,7 @@
  * Test if we're connected to the given peer.
  *
  * @param target peer to test
- * @return GNUNET_YES if we are connected, GNUNET_NO if not
+ * @return #GNUNET_YES if we are connected, #GNUNET_NO if not
  */
 int
 GST_neighbours_test_connected (const struct GNUNET_PeerIdentity *target)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]