diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2020-11-13 23:46:16 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2020-11-13 23:46:16 +0900 |
commit | e19e93df13a84b26db9f129f509ecb74a1b93145 (patch) | |
tree | 264e99934d1661e1d83508c3434c5d00e33a6ee1 /src/testbed | |
parent | c185348b6784a80bb8b394e34e3bf447d8dd1f57 (diff) | |
download | gnunet-e19e93df13a84b26db9f129f509ecb74a1b93145.tar.gz gnunet-e19e93df13a84b26db9f129f509ecb74a1b93145.zip |
-warnings mostly format
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/gnunet-service-testbed_oc.c | 71 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 3 |
2 files changed, 38 insertions, 36 deletions
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 3d13ac8cc..8a61f72f7 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -535,7 +535,7 @@ cleanup_occ (struct OverlayConnectContext *occ) | |||
535 | struct Peer *peer2; | 535 | struct Peer *peer2; |
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 | (unsigned long long) occ->op_id); |
539 | GNUNET_free (occ->emsg); | 539 | GNUNET_free (occ->emsg); |
540 | GNUNET_free (occ->hello); | 540 | GNUNET_free (occ->hello); |
541 | if (NULL != occ->send_hello_task) | 541 | if (NULL != occ->send_hello_task) |
@@ -656,7 +656,7 @@ send_overlay_connect_success_msg (struct OverlayConnectContext *occ) | |||
656 | struct GNUNET_TESTBED_ConnectionEventMessage *msg; | 656 | struct GNUNET_TESTBED_ConnectionEventMessage *msg; |
657 | 657 | ||
658 | LOG_DEBUG ("0x%llx: Peers connected - Sending overlay connect success\n", | 658 | LOG_DEBUG ("0x%llx: Peers connected - Sending overlay connect success\n", |
659 | occ->op_id); | 659 | (unsigned long long) occ->op_id); |
660 | env = GNUNET_MQ_msg (msg, | 660 | env = GNUNET_MQ_msg (msg, |
661 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT); | 661 | GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONNECT_EVENT); |
662 | msg->event_type = htonl (GNUNET_TESTBED_ET_CONNECT); | 662 | msg->event_type = htonl (GNUNET_TESTBED_ET_CONNECT); |
@@ -704,7 +704,7 @@ overlay_connect_notify (void *cls, | |||
704 | } | 704 | } |
705 | GNUNET_free (new_peer_str); | 705 | GNUNET_free (new_peer_str); |
706 | LOG_DEBUG ("0x%llx: Peer %s connected to peer %s\n", | 706 | LOG_DEBUG ("0x%llx: Peer %s connected to peer %s\n", |
707 | occ->op_id, | 707 | (unsigned long long) occ->op_id, |
708 | other_peer_str, | 708 | other_peer_str, |
709 | GNUNET_i2s (&occ->peer_identity)); | 709 | GNUNET_i2s (&occ->peer_identity)); |
710 | GNUNET_free (other_peer_str); | 710 | GNUNET_free (other_peer_str); |
@@ -763,7 +763,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls, | |||
763 | { | 763 | { |
764 | GNUNET_asprintf (&occ->emsg, | 764 | GNUNET_asprintf (&occ->emsg, |
765 | "0x%llx: Failed to connect to ATS of peer with id: %u", | 765 | "0x%llx: Failed to connect to ATS of peer with id: %u", |
766 | occ->op_id, | 766 | (unsigned long long) occ->op_id, |
767 | occ->peer->id); | 767 | occ->peer->id); |
768 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 768 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
769 | occ->timeout_task = | 769 | occ->timeout_task = |
@@ -775,7 +775,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls, | |||
775 | 775 | ||
776 | GNUNET_asprintf (&occ->emsg, | 776 | GNUNET_asprintf (&occ->emsg, |
777 | "0x%llx: Timeout during GNUNET_ATS_connectivity_suggest() at peer %s", | 777 | "0x%llx: Timeout during GNUNET_ATS_connectivity_suggest() at peer %s", |
778 | occ->op_id, | 778 | (unsigned long long) occ->op_id, |
779 | GNUNET_i2s (&occ->other_peer_identity)); | 779 | GNUNET_i2s (&occ->other_peer_identity)); |
780 | 780 | ||
781 | lp2c = &occ->p2ctx.local; | 781 | lp2c = &occ->p2ctx.local; |
@@ -846,7 +846,7 @@ occ_hello_sent_cb (void *cls) | |||
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", |
849 | occ->op_id, | 849 | (unsigned long long) occ->op_id, |
850 | GNUNET_i2s (&occ->other_peer_identity)); | 850 | GNUNET_i2s (&occ->other_peer_identity)); |
851 | GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id])); | 851 | GNUNET_assert (NULL != (peer2 = GST_peer_list[occ->other_peer_id])); |
852 | lp2c->tcc.cgh_p2_ats = | 852 | lp2c->tcc.cgh_p2_ats = |
@@ -878,7 +878,7 @@ send_hello_thru_rocc (struct OverlayConnectContext *occ) | |||
878 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); | 878 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); |
879 | LOG_DEBUG ( | 879 | LOG_DEBUG ( |
880 | "0x%llx: Offering HELLO of %s (size: %u) to %s via Remote Overlay Request\n", | 880 | "0x%llx: Offering HELLO of %s (size: %u) to %s via Remote Overlay Request\n", |
881 | occ->op_id, | 881 | (unsigned long long) occ->op_id, |
882 | GNUNET_i2s (&occ->peer_identity), | 882 | GNUNET_i2s (&occ->peer_identity), |
883 | ntohs (occ->hello->size), | 883 | ntohs (occ->hello->size), |
884 | other_peer_str); | 884 | other_peer_str); |
@@ -926,7 +926,7 @@ send_hello (void *cls) | |||
926 | lp2c = &occ->p2ctx.local; | 926 | lp2c = &occ->p2ctx.local; |
927 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); | 927 | other_peer_str = GNUNET_strdup (GNUNET_i2s (&occ->other_peer_identity)); |
928 | LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n", | 928 | LOG_DEBUG ("0x%llx: Offering HELLO of %s to %s\n", |
929 | occ->op_id, | 929 | (unsigned long long) occ->op_id, |
930 | GNUNET_i2s (&occ->peer_identity), | 930 | GNUNET_i2s (&occ->peer_identity), |
931 | other_peer_str); | 931 | other_peer_str); |
932 | GNUNET_free (other_peer_str); | 932 | GNUNET_free (other_peer_str); |
@@ -975,7 +975,7 @@ p2_transport_connect_cache_callback (void *cls, | |||
975 | { | 975 | { |
976 | GNUNET_asprintf (&occ->emsg, | 976 | GNUNET_asprintf (&occ->emsg, |
977 | "0x%llx: Cannot connect to TRANSPORT of %s", | 977 | "0x%llx: Cannot connect to TRANSPORT of %s", |
978 | occ->op_id, | 978 | (unsigned long long) occ->op_id, |
979 | GNUNET_i2s (&occ->other_peer_identity)); | 979 | GNUNET_i2s (&occ->other_peer_identity)); |
980 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 980 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
981 | occ->timeout_task = | 981 | occ->timeout_task = |
@@ -986,7 +986,7 @@ p2_transport_connect_cache_callback (void *cls, | |||
986 | occ->p2ctx.local.tcc.cfg = cfg; | 986 | occ->p2ctx.local.tcc.cfg = cfg; |
987 | GNUNET_asprintf (&occ->emsg, | 987 | GNUNET_asprintf (&occ->emsg, |
988 | "0x%llx: Timeout while offering HELLO to %s", | 988 | "0x%llx: Timeout while offering HELLO to %s", |
989 | occ->op_id, | 989 | (unsigned long long) occ->op_id, |
990 | GNUNET_i2s (&occ->other_peer_identity)); | 990 | GNUNET_i2s (&occ->other_peer_identity)); |
991 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); | 991 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); |
992 | } | 992 | } |
@@ -1026,7 +1026,7 @@ p2_transport_connect (struct OverlayConnectContext *occ) | |||
1026 | } | 1026 | } |
1027 | GNUNET_asprintf (&occ->emsg, | 1027 | GNUNET_asprintf (&occ->emsg, |
1028 | "0x%llx: Timeout while offering HELLO to %s", | 1028 | "0x%llx: Timeout while offering HELLO to %s", |
1029 | occ->op_id, | 1029 | (unsigned long long) occ->op_id, |
1030 | GNUNET_i2s (&occ->other_peer_identity)); | 1030 | GNUNET_i2s (&occ->other_peer_identity)); |
1031 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); | 1031 | occ->send_hello_task = GNUNET_SCHEDULER_add_now (&send_hello, occ); |
1032 | } | 1032 | } |
@@ -1077,12 +1077,12 @@ hello_update_cb (void *cls, | |||
1077 | if (GNUNET_YES == empty) | 1077 | if (GNUNET_YES == empty) |
1078 | { | 1078 | { |
1079 | LOG_DEBUG ("0x%llx: HELLO of %s is empty\n", | 1079 | LOG_DEBUG ("0x%llx: HELLO of %s is empty\n", |
1080 | occ->op_id, | 1080 | (unsigned long long) occ->op_id, |
1081 | GNUNET_i2s (&occ->peer_identity)); | 1081 | GNUNET_i2s (&occ->peer_identity)); |
1082 | return; | 1082 | return; |
1083 | } | 1083 | } |
1084 | LOG_DEBUG ("0x%llx: Received HELLO of %s\n", | 1084 | LOG_DEBUG ("0x%llx: Received HELLO of %s\n", |
1085 | occ->op_id, | 1085 | (unsigned long long) occ->op_id, |
1086 | GNUNET_i2s (&occ->peer_identity)); | 1086 | GNUNET_i2s (&occ->peer_identity)); |
1087 | occ->hello = GNUNET_malloc (msize); | 1087 | occ->hello = GNUNET_malloc (msize); |
1088 | GST_cache_add_hello (occ->peer->id, hello); | 1088 | GST_cache_add_hello (occ->peer->id, hello); |
@@ -1124,7 +1124,7 @@ p1_transport_connect_cache_callback (void *cls, | |||
1124 | { | 1124 | { |
1125 | GNUNET_asprintf (&occ->emsg, | 1125 | GNUNET_asprintf (&occ->emsg, |
1126 | "0x%llx: Cannot connect to TRANSPORT of %s", | 1126 | "0x%llx: Cannot connect to TRANSPORT of %s", |
1127 | occ->op_id, | 1127 | (unsigned long long) occ->op_id, |
1128 | GNUNET_i2s (&occ->peer_identity)); | 1128 | GNUNET_i2s (&occ->peer_identity)); |
1129 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1129 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1130 | occ->timeout_task = | 1130 | occ->timeout_task = |
@@ -1136,7 +1136,7 @@ p1_transport_connect_cache_callback (void *cls, | |||
1136 | occ->p1th_ = th; | 1136 | occ->p1th_ = th; |
1137 | GNUNET_asprintf (&occ->emsg, | 1137 | GNUNET_asprintf (&occ->emsg, |
1138 | "0x%llx: Timeout while acquiring HELLO of peer %s", | 1138 | "0x%llx: Timeout while acquiring HELLO of peer %s", |
1139 | occ->op_id, | 1139 | (unsigned long long) occ->op_id, |
1140 | GNUNET_i2s (&occ->peer_identity)); | 1140 | GNUNET_i2s (&occ->peer_identity)); |
1141 | occ->ghh = GNUNET_TRANSPORT_hello_get (cfg, | 1141 | occ->ghh = GNUNET_TRANSPORT_hello_get (cfg, |
1142 | GNUNET_TRANSPORT_AC_ANY, | 1142 | GNUNET_TRANSPORT_AC_ANY, |
@@ -1172,7 +1172,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1172 | GNUNET_asprintf (&occ->emsg, | 1172 | GNUNET_asprintf (&occ->emsg, |
1173 | "0x%llx: Failed to connect to CORE of peer with " | 1173 | "0x%llx: Failed to connect to CORE of peer with " |
1174 | "id: %u", | 1174 | "id: %u", |
1175 | occ->op_id, | 1175 | (unsigned long long) occ->op_id, |
1176 | occ->peer->id); | 1176 | occ->peer->id); |
1177 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1177 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1178 | occ->timeout_task = | 1178 | occ->timeout_task = |
@@ -1185,7 +1185,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1185 | &occ->other_peer_identity)) | 1185 | &occ->other_peer_identity)) |
1186 | { | 1186 | { |
1187 | LOG_DEBUG ("0x%llx: Target peer already connected\n", | 1187 | LOG_DEBUG ("0x%llx: Target peer already connected\n", |
1188 | occ->op_id); | 1188 | (unsigned long long) occ->op_id); |
1189 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1189 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1190 | occ->timeout_task = NULL; | 1190 | occ->timeout_task = NULL; |
1191 | send_overlay_connect_success_msg (occ); | 1191 | send_overlay_connect_success_msg (occ); |
@@ -1194,13 +1194,13 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1194 | } | 1194 | } |
1195 | occ->peer_identity = *my_identity; | 1195 | occ->peer_identity = *my_identity; |
1196 | LOG_DEBUG ("0x%llx: Acquiring HELLO of peer %s\n", | 1196 | LOG_DEBUG ("0x%llx: Acquiring HELLO of peer %s\n", |
1197 | occ->op_id, | 1197 | (unsigned long long) occ->op_id, |
1198 | GNUNET_i2s (&occ->peer_identity)); | 1198 | GNUNET_i2s (&occ->peer_identity)); |
1199 | /* Lookup for HELLO in hello cache */ | 1199 | /* Lookup for HELLO in hello cache */ |
1200 | if (NULL != (hello = GST_cache_lookup_hello (occ->peer->id))) | 1200 | if (NULL != (hello = GST_cache_lookup_hello (occ->peer->id))) |
1201 | { | 1201 | { |
1202 | LOG_DEBUG ("0x%llx: HELLO of peer %s found in cache\n", | 1202 | LOG_DEBUG ("0x%llx: HELLO of peer %s found in cache\n", |
1203 | occ->op_id, | 1203 | (unsigned long long) occ->op_id, |
1204 | GNUNET_i2s (&occ->peer_identity)); | 1204 | GNUNET_i2s (&occ->peer_identity)); |
1205 | occ->hello = GNUNET_copy_message (hello); | 1205 | occ->hello = GNUNET_copy_message (hello); |
1206 | p2_transport_connect (occ); | 1206 | p2_transport_connect (occ); |
@@ -1208,7 +1208,7 @@ occ_cache_get_handle_core_cb (void *cls, | |||
1208 | } | 1208 | } |
1209 | GNUNET_asprintf (&occ->emsg, | 1209 | GNUNET_asprintf (&occ->emsg, |
1210 | "0x%llx: Timeout while acquiring TRANSPORT of %s from cache", | 1210 | "0x%llx: Timeout while acquiring TRANSPORT of %s from cache", |
1211 | occ->op_id, | 1211 | (unsigned long long) occ->op_id, |
1212 | GNUNET_i2s (&occ->peer_identity)); | 1212 | GNUNET_i2s (&occ->peer_identity)); |
1213 | occ->cgh_p1th = | 1213 | occ->cgh_p1th = |
1214 | GST_connection_pool_get_handle (occ->peer->id, | 1214 | GST_connection_pool_get_handle (occ->peer->id, |
@@ -1253,7 +1253,7 @@ overlay_connect_get_config (void *cls, | |||
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", |
1256 | occ->op_id, | 1256 | (unsigned long long) occ->op_id, |
1257 | occ->peer->id); | 1257 | occ->peer->id); |
1258 | occ->cgh_ch = | 1258 | occ->cgh_ch = |
1259 | GST_connection_pool_get_handle (occ->peer->id, | 1259 | GST_connection_pool_get_handle (occ->peer->id, |
@@ -1425,7 +1425,8 @@ forward_overlay_connect (const struct GNUNET_TESTBED_OverlayConnectMessage *msg, | |||
1425 | GNUNET_assert (VALID_HOST_ID (peer2_host_id)); | 1425 | GNUNET_assert (VALID_HOST_ID (peer2_host_id)); |
1426 | peer = GST_peer_list[p1]; | 1426 | peer = GST_peer_list[p1]; |
1427 | GNUNET_assert (GNUNET_YES == peer->is_remote); | 1427 | GNUNET_assert (GNUNET_YES == peer->is_remote); |
1428 | LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", op_id); | 1428 | LOG_DEBUG ("0x%llx: Forwarding overlay connect\n", |
1429 | (unsigned long long) op_id); | ||
1429 | route_to_peer2_host = GST_find_dest_route (peer2_host_id); | 1430 | route_to_peer2_host = GST_find_dest_route (peer2_host_id); |
1430 | route_to_peer1_host = GST_find_dest_route | 1431 | route_to_peer1_host = GST_find_dest_route |
1431 | (peer->details.remote.remote_host_id); | 1432 | (peer->details.remote.remote_host_id); |
@@ -1512,7 +1513,7 @@ p2_controller_connect_cb (void *cls, | |||
1512 | GNUNET_asprintf (&occ->emsg, | 1513 | GNUNET_asprintf (&occ->emsg, |
1513 | "0x%llx: Timeout while getting peer identity of peer " | 1514 | "0x%llx: Timeout while getting peer identity of peer " |
1514 | "with id: %u", | 1515 | "with id: %u", |
1515 | occ->op_id, | 1516 | (unsigned long long) occ->op_id, |
1516 | occ->other_peer_id); | 1517 | occ->other_peer_id); |
1517 | } | 1518 | } |
1518 | 1519 | ||
@@ -1551,7 +1552,7 @@ handle_overlay_connect (void *cls, | |||
1551 | ("Received overlay connect for peers %u and %u with op id: 0x%llx\n", | 1552 | ("Received overlay connect for peers %u and %u with op id: 0x%llx\n", |
1552 | p1, | 1553 | p1, |
1553 | p2, | 1554 | p2, |
1554 | operation_id); | 1555 | (unsigned long long) operation_id); |
1555 | peer2_host_id = ntohl (msg->peer2_host_id); | 1556 | peer2_host_id = ntohl (msg->peer2_host_id); |
1556 | if (GNUNET_YES == peer->is_remote) | 1557 | if (GNUNET_YES == peer->is_remote) |
1557 | { | 1558 | { |
@@ -1577,7 +1578,7 @@ handle_overlay_connect (void *cls, | |||
1577 | GNUNET_break (0); | 1578 | GNUNET_break (0); |
1578 | LOG (GNUNET_ERROR_TYPE_WARNING, | 1579 | LOG (GNUNET_ERROR_TYPE_WARNING, |
1579 | "0x%llx: Peer %u's host not in our neighbours list\n", | 1580 | "0x%llx: Peer %u's host not in our neighbours list\n", |
1580 | operation_id, p2); | 1581 | (unsigned long long) operation_id, p2); |
1581 | GNUNET_SERVICE_client_drop (client); | 1582 | GNUNET_SERVICE_client_drop (client); |
1582 | GNUNET_free (occ); | 1583 | GNUNET_free (occ); |
1583 | return; | 1584 | return; |
@@ -1611,7 +1612,7 @@ handle_overlay_connect (void *cls, | |||
1611 | GNUNET_asprintf (&occ->emsg, | 1612 | GNUNET_asprintf (&occ->emsg, |
1612 | "0x%llx: Timeout while acquiring connection to peer %u's " | 1613 | "0x%llx: Timeout while acquiring connection to peer %u's " |
1613 | "host: %u\n", | 1614 | "host: %u\n", |
1614 | occ->op_id, | 1615 | (unsigned long long) occ->op_id, |
1615 | occ->other_peer_id, | 1616 | occ->other_peer_id, |
1616 | peer2_host_id); | 1617 | peer2_host_id); |
1617 | occ->p2ctx.remote.ncn | 1618 | occ->p2ctx.remote.ncn |
@@ -1633,7 +1634,7 @@ handle_overlay_connect (void *cls, | |||
1633 | GNUNET_asprintf (&occ->emsg, | 1634 | GNUNET_asprintf (&occ->emsg, |
1634 | "0x%llx: Timeout while connecting to CORE of peer with " | 1635 | "0x%llx: Timeout while connecting to CORE of peer with " |
1635 | "id: %u", | 1636 | "id: %u", |
1636 | occ->op_id, | 1637 | (unsigned long long) occ->op_id, |
1637 | occ->peer->id); | 1638 | occ->peer->id); |
1638 | occ->cgh_ch = | 1639 | occ->cgh_ch = |
1639 | GST_connection_pool_get_handle (occ->peer->id, | 1640 | GST_connection_pool_get_handle (occ->peer->id, |
@@ -1658,7 +1659,7 @@ static void | |||
1658 | cleanup_rocc (struct RemoteOverlayConnectCtx *rocc) | 1659 | cleanup_rocc (struct RemoteOverlayConnectCtx *rocc) |
1659 | { | 1660 | { |
1660 | LOG_DEBUG ("0x%llx: Cleaning up rocc\n", | 1661 | LOG_DEBUG ("0x%llx: Cleaning up rocc\n", |
1661 | rocc->op_id); | 1662 | (unsigned long long) rocc->op_id); |
1662 | if (NULL != rocc->attempt_connect_task_id) | 1663 | if (NULL != rocc->attempt_connect_task_id) |
1663 | GNUNET_SCHEDULER_cancel (rocc->attempt_connect_task_id); | 1664 | GNUNET_SCHEDULER_cancel (rocc->attempt_connect_task_id); |
1664 | if (NULL != rocc->timeout_rocc_task_id) | 1665 | if (NULL != rocc->timeout_rocc_task_id) |
@@ -1695,7 +1696,7 @@ timeout_rocc_task (void *cls) | |||
1695 | GNUNET_assert (rocc->timeout_rocc_task_id != NULL); | 1696 | GNUNET_assert (rocc->timeout_rocc_task_id != NULL); |
1696 | rocc->timeout_rocc_task_id = NULL; | 1697 | rocc->timeout_rocc_task_id = NULL; |
1697 | LOG_DEBUG ("0x%llx: rocc timed out\n", | 1698 | LOG_DEBUG ("0x%llx: rocc timed out\n", |
1698 | rocc->op_id); | 1699 | (unsigned long long) rocc->op_id); |
1699 | cleanup_rocc (rocc); | 1700 | cleanup_rocc (rocc); |
1700 | } | 1701 | } |
1701 | 1702 | ||
@@ -1714,12 +1715,12 @@ cache_transport_peer_connect_notify (void *cls, | |||
1714 | struct RemoteOverlayConnectCtx *rocc = cls; | 1715 | struct RemoteOverlayConnectCtx *rocc = cls; |
1715 | 1716 | ||
1716 | LOG_DEBUG ("0x%llx: Request Overlay connect notify\n", | 1717 | LOG_DEBUG ("0x%llx: Request Overlay connect notify\n", |
1717 | rocc->op_id); | 1718 | (unsigned long long) rocc->op_id); |
1718 | GNUNET_assert (0 == | 1719 | GNUNET_assert (0 == |
1719 | memcmp (new_peer, &rocc->a_id, | 1720 | memcmp (new_peer, &rocc->a_id, |
1720 | sizeof(struct GNUNET_PeerIdentity))); | 1721 | sizeof(struct GNUNET_PeerIdentity))); |
1721 | LOG_DEBUG ("0x%llx: Peer %s connected\n", | 1722 | LOG_DEBUG ("0x%llx: Peer %s connected\n", |
1722 | rocc->op_id, | 1723 | (unsigned long long) rocc->op_id, |
1723 | GNUNET_i2s (&rocc->a_id)); | 1724 | GNUNET_i2s (&rocc->a_id)); |
1724 | cleanup_rocc (rocc); | 1725 | cleanup_rocc (rocc); |
1725 | } | 1726 | } |
@@ -1750,7 +1751,7 @@ rocc_hello_sent_cb (void *cls) | |||
1750 | rocc->ohh = NULL; | 1751 | rocc->ohh = NULL; |
1751 | GNUNET_assert (NULL == rocc->attempt_connect_task_id); | 1752 | GNUNET_assert (NULL == rocc->attempt_connect_task_id); |
1752 | LOG_DEBUG ("0x%llx: HELLO of peer %s delivered to local peer with id: %u\n", | 1753 | LOG_DEBUG ("0x%llx: HELLO of peer %s delivered to local peer with id: %u\n", |
1753 | rocc->op_id, | 1754 | (unsigned long long) rocc->op_id, |
1754 | GNUNET_i2s (&rocc->a_id), | 1755 | GNUNET_i2s (&rocc->a_id), |
1755 | rocc->peer->id); | 1756 | rocc->peer->id); |
1756 | rocc->tcc.cgh_p2_ats = | 1757 | rocc->tcc.cgh_p2_ats = |
@@ -1776,7 +1777,7 @@ attempt_connect_task (void *cls) | |||
1776 | GNUNET_assert (NULL != rocc->attempt_connect_task_id); | 1777 | GNUNET_assert (NULL != rocc->attempt_connect_task_id); |
1777 | rocc->attempt_connect_task_id = NULL; | 1778 | rocc->attempt_connect_task_id = NULL; |
1778 | LOG_DEBUG ("0x%llx: Offering HELLO of peer %s to remote peer with id: %u\n", | 1779 | LOG_DEBUG ("0x%llx: Offering HELLO of peer %s to remote peer with id: %u\n", |
1779 | rocc->op_id, | 1780 | (unsigned long long) rocc->op_id, |
1780 | GNUNET_i2s (&rocc->a_id), | 1781 | GNUNET_i2s (&rocc->a_id), |
1781 | rocc->peer->id); | 1782 | rocc->peer->id); |
1782 | rocc->ohh = | 1783 | rocc->ohh = |
@@ -1828,7 +1829,7 @@ rocc_cache_get_handle_transport_cb (void *cls, | |||
1828 | &rocc->a_id)) | 1829 | &rocc->a_id)) |
1829 | { | 1830 | { |
1830 | LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n", | 1831 | LOG_DEBUG ("0x%llx: Target peer %s already connected to local peer: %u\n", |
1831 | rocc->op_id, | 1832 | (unsigned long long) rocc->op_id, |
1832 | GNUNET_i2s (&rocc->a_id), | 1833 | GNUNET_i2s (&rocc->a_id), |
1833 | rocc->peer->id); | 1834 | rocc->peer->id); |
1834 | cleanup_rocc (rocc); | 1835 | cleanup_rocc (rocc); |
@@ -1924,7 +1925,7 @@ handle_remote_overlay_connect (void *cls, | |||
1924 | sizeof(pid_str)); | 1925 | sizeof(pid_str)); |
1925 | LOG_DEBUG ( | 1926 | LOG_DEBUG ( |
1926 | "0x%llx: Remote overlay connect %s to peer %s with hello size: %u\n", | 1927 | "0x%llx: Remote overlay connect %s to peer %s with hello size: %u\n", |
1927 | rocc->op_id, | 1928 | (unsigned long long) rocc->op_id, |
1928 | pid_str, | 1929 | pid_str, |
1929 | GNUNET_i2s (&rocc->a_id), | 1930 | GNUNET_i2s (&rocc->a_id), |
1930 | hsize); | 1931 | hsize); |
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index 09752ba28..f291892c6 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -448,7 +448,8 @@ handle_opsuccess ( | |||
448 | uint64_t op_id; | 448 | uint64_t op_id; |
449 | 449 | ||
450 | op_id = GNUNET_ntohll (msg->operation_id); | 450 | op_id = GNUNET_ntohll (msg->operation_id); |
451 | LOG_DEBUG ("Operation %llu successful\n", op_id); | 451 | LOG_DEBUG ("Operation %llu successful\n", |
452 | (unsigned long long) op_id); | ||
452 | if (NULL == (opc = find_opc (c, op_id))) | 453 | if (NULL == (opc = find_opc (c, op_id))) |
453 | { | 454 | { |
454 | LOG_DEBUG ("Operation not found\n"); | 455 | LOG_DEBUG ("Operation not found\n"); |