diff options
Diffstat (limited to 'src/testbed/gnunet-service-testbed_oc.c')
-rw-r--r-- | src/testbed/gnunet-service-testbed_oc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 262fcfc00..3d13ac8cc 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -360,7 +360,7 @@ GST_cleanup_focc (struct ForwardedOverlayConnectContext *focc) | |||
360 | GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head, | 360 | GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head, |
361 | rhc->focc_dll_tail, | 361 | rhc->focc_dll_tail, |
362 | focc); | 362 | focc); |
363 | GNUNET_free_non_null (focc->orig_msg); | 363 | GNUNET_free (focc->orig_msg); |
364 | GNUNET_free (focc); | 364 | GNUNET_free (focc); |
365 | } | 365 | } |
366 | 366 | ||
@@ -536,8 +536,8 @@ cleanup_occ (struct OverlayConnectContext *occ) | |||
536 | 536 | ||
537 | LOG_DEBUG ("0x%llx: Cleaning up occ\n", | 537 | LOG_DEBUG ("0x%llx: Cleaning up occ\n", |
538 | occ->op_id); | 538 | occ->op_id); |
539 | GNUNET_free_non_null (occ->emsg); | 539 | GNUNET_free (occ->emsg); |
540 | GNUNET_free_non_null (occ->hello); | 540 | GNUNET_free (occ->hello); |
541 | if (NULL != occ->send_hello_task) | 541 | if (NULL != occ->send_hello_task) |
542 | GNUNET_SCHEDULER_cancel (occ->send_hello_task); | 542 | GNUNET_SCHEDULER_cancel (occ->send_hello_task); |
543 | if (NULL != occ->cleanup_task) | 543 | if (NULL != occ->cleanup_task) |
@@ -727,7 +727,7 @@ overlay_connect_notify (void *cls, | |||
727 | cleanup_occ_rp2c (&occ->p2ctx.remote); | 727 | cleanup_occ_rp2c (&occ->p2ctx.remote); |
728 | break; | 728 | break; |
729 | } | 729 | } |
730 | GNUNET_free_non_null (occ->emsg); | 730 | GNUNET_free (occ->emsg); |
731 | occ->emsg = NULL; | 731 | occ->emsg = NULL; |
732 | send_overlay_connect_success_msg (occ); | 732 | send_overlay_connect_success_msg (occ); |
733 | occ->cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup_occ, | 733 | occ->cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup_occ, |
@@ -758,7 +758,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls, | |||
758 | 758 | ||
759 | GNUNET_assert (OCC_TYPE_LOCAL == occ->type); | 759 | GNUNET_assert (OCC_TYPE_LOCAL == occ->type); |
760 | GNUNET_assert (NULL != occ->timeout_task); | 760 | GNUNET_assert (NULL != occ->timeout_task); |
761 | GNUNET_free_non_null (occ->emsg); | 761 | GNUNET_free (occ->emsg); |
762 | if (NULL == ac) | 762 | if (NULL == ac) |
763 | { | 763 | { |
764 | GNUNET_asprintf (&occ->emsg, | 764 | GNUNET_asprintf (&occ->emsg, |
@@ -842,7 +842,7 @@ occ_hello_sent_cb (void *cls) | |||
842 | lp2c->ohh = NULL; | 842 | lp2c->ohh = NULL; |
843 | 843 | ||
844 | GNUNET_assert (NULL == occ->send_hello_task); | 844 | GNUNET_assert (NULL == occ->send_hello_task); |
845 | GNUNET_free_non_null (occ->emsg); | 845 | GNUNET_free (occ->emsg); |
846 | 846 | ||
847 | GNUNET_asprintf (&occ->emsg, | 847 | GNUNET_asprintf (&occ->emsg, |
848 | "0x%llx: Timeout while acquiring ATS of %s from cache", | 848 | "0x%llx: Timeout while acquiring ATS of %s from cache", |
@@ -1092,7 +1092,7 @@ hello_update_cb (void *cls, | |||
1092 | GST_connection_pool_get_handle_done (occ->cgh_p1th); | 1092 | GST_connection_pool_get_handle_done (occ->cgh_p1th); |
1093 | occ->cgh_p1th = NULL; | 1093 | occ->cgh_p1th = NULL; |
1094 | occ->p1th_ = NULL; | 1094 | occ->p1th_ = NULL; |
1095 | GNUNET_free_non_null (occ->emsg); | 1095 | GNUNET_free (occ->emsg); |
1096 | occ->emsg = NULL; | 1096 | occ->emsg = NULL; |
1097 | p2_transport_connect (occ); | 1097 | p2_transport_connect (occ); |
1098 | } | 1098 | } |
@@ -1118,7 +1118,7 @@ p1_transport_connect_cache_callback (void *cls, | |||
1118 | { | 1118 | { |
1119 | struct OverlayConnectContext *occ = cls; | 1119 | struct OverlayConnectContext *occ = cls; |
1120 | 1120 | ||
1121 | GNUNET_free_non_null (occ->emsg); | 1121 | GNUNET_free (occ->emsg); |
1122 | occ->emsg = NULL; | 1122 | occ->emsg = NULL; |
1123 | if (NULL == th) | 1123 | if (NULL == th) |
1124 | { | 1124 | { |
@@ -1166,7 +1166,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1166 | const struct GNUNET_MessageHeader *hello; | 1166 | const struct GNUNET_MessageHeader *hello; |
1167 | 1167 | ||
1168 | GNUNET_assert (NULL != occ->timeout_task); | 1168 | GNUNET_assert (NULL != occ->timeout_task); |
1169 | GNUNET_free_non_null (occ->emsg); | 1169 | GNUNET_free (occ->emsg); |
1170 | if ((NULL == ch) || (NULL == my_identity)) | 1170 | if ((NULL == ch) || (NULL == my_identity)) |
1171 | { | 1171 | { |
1172 | GNUNET_asprintf (&occ->emsg, | 1172 | GNUNET_asprintf (&occ->emsg, |
@@ -1249,7 +1249,7 @@ overlay_connect_get_config (void *cls, | |||
1249 | cmsg = | 1249 | cmsg = |
1250 | (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg; | 1250 | (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg; |
1251 | occ->other_peer_identity = cmsg->peer_identity; | 1251 | occ->other_peer_identity = cmsg->peer_identity; |
1252 | GNUNET_free_non_null (occ->emsg); | 1252 | GNUNET_free (occ->emsg); |
1253 | GNUNET_asprintf (&occ->emsg, | 1253 | GNUNET_asprintf (&occ->emsg, |
1254 | "0x%llx: Timeout while connecting to CORE of peer with " | 1254 | "0x%llx: Timeout while connecting to CORE of peer with " |
1255 | "id: %u", | 1255 | "id: %u", |
@@ -1508,7 +1508,7 @@ p2_controller_connect_cb (void *cls, | |||
1508 | &cmsg.header, | 1508 | &cmsg.header, |
1509 | &overlay_connect_get_config, | 1509 | &overlay_connect_get_config, |
1510 | occ); | 1510 | occ); |
1511 | GNUNET_free_non_null (occ->emsg); | 1511 | GNUNET_free (occ->emsg); |
1512 | GNUNET_asprintf (&occ->emsg, | 1512 | GNUNET_asprintf (&occ->emsg, |
1513 | "0x%llx: Timeout while getting peer identity of peer " | 1513 | "0x%llx: Timeout while getting peer identity of peer " |
1514 | "with id: %u", | 1514 | "with id: %u", |
@@ -1674,7 +1674,7 @@ cleanup_rocc (struct RemoteOverlayConnectCtx *rocc) | |||
1674 | if ((GNUNET_YES == rocc->peer->destroy_flag) && | 1674 | if ((GNUNET_YES == rocc->peer->destroy_flag) && |
1675 | (0 == rocc->peer->reference_cnt)) | 1675 | (0 == rocc->peer->reference_cnt)) |
1676 | GST_destroy_peer (rocc->peer); | 1676 | GST_destroy_peer (rocc->peer); |
1677 | GNUNET_free_non_null (rocc->hello); | 1677 | GNUNET_free (rocc->hello); |
1678 | GNUNET_CONTAINER_DLL_remove (roccq_head, | 1678 | GNUNET_CONTAINER_DLL_remove (roccq_head, |
1679 | roccq_tail, | 1679 | roccq_tail, |
1680 | rocc); | 1680 | rocc); |