diff options
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/gnunet-service-testbed.c | 2 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_oc.c | 14 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_peers.c | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api.conf | 1 | ||||
-rw-r--r-- | src/testbed/testbed.h | 4 | ||||
-rw-r--r-- | src/testbed/testbed_api.c | 6 | ||||
-rw-r--r-- | src/testbed/testbed_api_peers.c | 2 |
7 files changed, 17 insertions, 14 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 701485b40..3710b82e1 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
@@ -882,7 +882,7 @@ testbed_run (void *cls, struct GNUNET_SERVER_Handle *server, | |||
882 | {&GST_handle_peer_stop, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER, | 882 | {&GST_handle_peer_stop, NULL, GNUNET_MESSAGE_TYPE_TESTBED_STOP_PEER, |
883 | sizeof (struct GNUNET_TESTBED_PeerStopMessage)}, | 883 | sizeof (struct GNUNET_TESTBED_PeerStopMessage)}, |
884 | {&GST_handle_peer_get_config, NULL, | 884 | {&GST_handle_peer_get_config, NULL, |
885 | GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION, | 885 | GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION, |
886 | sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)}, | 886 | sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)}, |
887 | {&GST_handle_overlay_connect, NULL, | 887 | {&GST_handle_overlay_connect, NULL, |
888 | GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT, | 888 | GNUNET_MESSAGE_TYPE_TESTBED_OVERLAY_CONNECT, |
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 455de4178..06f35e865 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -1112,7 +1112,7 @@ overlay_connect_get_config (void *cls, const struct GNUNET_MessageHeader *msg) | |||
1112 | rp2c = &occ->p2ctx.remote; | 1112 | rp2c = &occ->p2ctx.remote; |
1113 | rp2c->opc = NULL; | 1113 | rp2c->opc = NULL; |
1114 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task); | 1114 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task); |
1115 | if (GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION != ntohs (msg->type)) | 1115 | if (GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION != ntohs (msg->type)) |
1116 | { | 1116 | { |
1117 | GNUNET_SCHEDULER_cancel (occ->timeout_task); | 1117 | GNUNET_SCHEDULER_cancel (occ->timeout_task); |
1118 | occ->timeout_task = | 1118 | occ->timeout_task = |
@@ -1353,7 +1353,7 @@ p2_controller_connect_cb (void *cls, struct GNUNET_TESTBED_Controller *c) | |||
1353 | cmsg.header.size = | 1353 | cmsg.header.size = |
1354 | htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)); | 1354 | htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)); |
1355 | cmsg.header.type = | 1355 | cmsg.header.type = |
1356 | htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION); | 1356 | htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION); |
1357 | cmsg.peer_id = htonl (occ->other_peer_id); | 1357 | cmsg.peer_id = htonl (occ->other_peer_id); |
1358 | cmsg.operation_id = GNUNET_htonll (occ->op_id); | 1358 | cmsg.operation_id = GNUNET_htonll (occ->op_id); |
1359 | rp2c->opc = | 1359 | rp2c->opc = |
@@ -1690,6 +1690,8 @@ GST_handle_remote_overlay_connect (void *cls, | |||
1690 | const struct GNUNET_TESTBED_RemoteOverlayConnectMessage *msg; | 1690 | const struct GNUNET_TESTBED_RemoteOverlayConnectMessage *msg; |
1691 | struct RemoteOverlayConnectCtx *rocc; | 1691 | struct RemoteOverlayConnectCtx *rocc; |
1692 | struct Peer *peer; | 1692 | struct Peer *peer; |
1693 | struct GNUNET_PeerIdentity pid; | ||
1694 | static char pid_str[16]; | ||
1693 | uint32_t peer_id; | 1695 | uint32_t peer_id; |
1694 | uint16_t msize; | 1696 | uint16_t msize; |
1695 | uint16_t hsize; | 1697 | uint16_t hsize; |
@@ -1740,13 +1742,15 @@ GST_handle_remote_overlay_connect (void *cls, | |||
1740 | GNUNET_CONTAINER_DLL_insert_tail (roccq_head, roccq_tail, rocc); | 1742 | GNUNET_CONTAINER_DLL_insert_tail (roccq_head, roccq_tail, rocc); |
1741 | memcpy (&rocc->a_id, &msg->peer_identity, | 1743 | memcpy (&rocc->a_id, &msg->peer_identity, |
1742 | sizeof (struct GNUNET_PeerIdentity)); | 1744 | sizeof (struct GNUNET_PeerIdentity)); |
1743 | LOG_DEBUG ("Received request for overlay connection with op_id: 0x%llx " | 1745 | GNUNET_TESTING_peer_get_identity (peer->details.local.peer, &pid); |
1744 | "from local peer %u to peer %4s with hello size: %u\n", | 1746 | (void) strncpy (pid_str, GNUNET_i2s (&pid), 15); |
1745 | rocc->op_id, peer_id, GNUNET_i2s (&rocc->a_id), hsize); | 1747 | LOG_DEBUG ("0x%llx: Remote overlay connect %4s to peer %4s with hello size: %u\n", |
1748 | rocc->op_id, pid_str, GNUNET_i2s (&rocc->a_id), hsize); | ||
1746 | rocc->peer = peer; | 1749 | rocc->peer = peer; |
1747 | rocc->peer->reference_cnt++; | 1750 | rocc->peer->reference_cnt++; |
1748 | rocc->hello = GNUNET_malloc (hsize); | 1751 | rocc->hello = GNUNET_malloc (hsize); |
1749 | memcpy (rocc->hello, msg->hello, hsize); | 1752 | memcpy (rocc->hello, msg->hello, hsize); |
1753 | rocc->tcc.op_id = rocc->op_id; | ||
1750 | rocc->tcc.cgh_th = | 1754 | rocc->tcc.cgh_th = |
1751 | GST_cache_get_handle_transport (peer_id, rocc->peer->details.local.cfg, | 1755 | GST_cache_get_handle_transport (peer_id, rocc->peer->details.local.cfg, |
1752 | &rocc_cache_get_handle_transport_cb, rocc, | 1756 | &rocc_cache_get_handle_transport_cb, rocc, |
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c index c07fa87c5..c0828d7c0 100644 --- a/src/testbed/gnunet-service-testbed_peers.c +++ b/src/testbed/gnunet-service-testbed_peers.c | |||
@@ -721,7 +721,7 @@ GST_handle_peer_get_config (void *cls, struct GNUNET_SERVER_Client *client, | |||
721 | reply = GNUNET_realloc (xconfig, msize); | 721 | reply = GNUNET_realloc (xconfig, msize); |
722 | (void) memmove (&reply[1], reply, xc_size); | 722 | (void) memmove (&reply[1], reply, xc_size); |
723 | reply->header.size = htons (msize); | 723 | reply->header.size = htons (msize); |
724 | reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION); | 724 | reply->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION); |
725 | reply->peer_id = msg->peer_id; | 725 | reply->peer_id = msg->peer_id; |
726 | reply->operation_id = msg->operation_id; | 726 | reply->operation_id = msg->operation_id; |
727 | GNUNET_TESTING_peer_get_identity (GST_peer_list[peer_id]->details.local.peer, | 727 | GNUNET_TESTING_peer_get_identity (GST_peer_list[peer_id]->details.local.peer, |
diff --git a/src/testbed/test_testbed_api.conf b/src/testbed/test_testbed_api.conf index 547a103fb..4be0c74da 100644 --- a/src/testbed/test_testbed_api.conf +++ b/src/testbed/test_testbed_api.conf | |||
@@ -3,7 +3,6 @@ AUTOSTART = NO | |||
3 | PORT = 12113 | 3 | PORT = 12113 |
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | NEIGHBOUR_LIMIT = 100 | ||
7 | TOPOLOGY = RANDOM | 6 | TOPOLOGY = RANDOM |
8 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args | 7 | #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args |
9 | 8 | ||
diff --git a/src/testbed/testbed.h b/src/testbed/testbed.h index 904e7acba..66f8ddb17 100644 --- a/src/testbed/testbed.h +++ b/src/testbed/testbed.h | |||
@@ -614,7 +614,7 @@ struct GNUNET_TESTBED_PeerGetConfigurationMessage | |||
614 | { | 614 | { |
615 | 615 | ||
616 | /** | 616 | /** |
617 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION | 617 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION |
618 | */ | 618 | */ |
619 | struct GNUNET_MessageHeader header; | 619 | struct GNUNET_MessageHeader header; |
620 | 620 | ||
@@ -638,7 +638,7 @@ struct GNUNET_TESTBED_PeerConfigurationInformationMessage | |||
638 | { | 638 | { |
639 | 639 | ||
640 | /** | 640 | /** |
641 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION | 641 | * Type is GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION |
642 | */ | 642 | */ |
643 | struct GNUNET_MessageHeader header; | 643 | struct GNUNET_MessageHeader header; |
644 | 644 | ||
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c index f029ebd9f..010d51776 100644 --- a/src/testbed/testbed_api.c +++ b/src/testbed/testbed_api.c | |||
@@ -1127,7 +1127,7 @@ message_handler (void *cls, const struct GNUNET_MessageHeader *msg) | |||
1127 | msg); | 1127 | msg); |
1128 | 1128 | ||
1129 | break; | 1129 | break; |
1130 | case GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION: | 1130 | case GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION: |
1131 | GNUNET_assert (msize >= | 1131 | GNUNET_assert (msize >= |
1132 | sizeof (struct | 1132 | sizeof (struct |
1133 | GNUNET_TESTBED_PeerConfigurationInformationMessage)); | 1133 | GNUNET_TESTBED_PeerConfigurationInformationMessage)); |
@@ -1875,7 +1875,7 @@ GNUNET_TESTBED_operation_done (struct GNUNET_TESTBED_Operation *operation) | |||
1875 | /** | 1875 | /** |
1876 | * Generates configuration by uncompressing configuration in given message. The | 1876 | * Generates configuration by uncompressing configuration in given message. The |
1877 | * given message should be of the following types: | 1877 | * given message should be of the following types: |
1878 | * GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION, | 1878 | * GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION, |
1879 | * GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION, | 1879 | * GNUNET_MESSAGE_TYPE_TESTBED_SLAVE_CONFIGURATION, |
1880 | * GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST, | 1880 | * GNUNET_MESSAGE_TYPE_TESTBED_ADD_HOST, |
1881 | * GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS, | 1881 | * GNUNET_MESSAGE_TYPE_TESTBED_LINK_CONTROLLERS, |
@@ -1896,7 +1896,7 @@ GNUNET_TESTBED_extract_config_ (const struct GNUNET_MessageHeader *msg) | |||
1896 | 1896 | ||
1897 | switch (ntohs (msg->type)) | 1897 | switch (ntohs (msg->type)) |
1898 | { | 1898 | { |
1899 | case GNUNET_MESSAGE_TYPE_TESTBED_PEER_CONFIGURATION: | 1899 | case GNUNET_MESSAGE_TYPE_TESTBED_PEER_INFORMATION: |
1900 | { | 1900 | { |
1901 | const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *imsg; | 1901 | const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *imsg; |
1902 | 1902 | ||
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c index b6de23331..56e28a830 100644 --- a/src/testbed/testbed_api_peers.c +++ b/src/testbed/testbed_api_peers.c | |||
@@ -325,7 +325,7 @@ GNUNET_TESTBED_generate_peergetconfig_msg_ (uint32_t peer_id, | |||
325 | (struct GNUNET_TESTBED_PeerGetConfigurationMessage)); | 325 | (struct GNUNET_TESTBED_PeerGetConfigurationMessage)); |
326 | msg->header.size = | 326 | msg->header.size = |
327 | htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)); | 327 | htons (sizeof (struct GNUNET_TESTBED_PeerGetConfigurationMessage)); |
328 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_CONFIGURATION); | 328 | msg->header.type = htons (GNUNET_MESSAGE_TYPE_TESTBED_GET_PEER_INFORMATION); |
329 | msg->peer_id = htonl (peer_id); | 329 | msg->peer_id = htonl (peer_id); |
330 | msg->operation_id = GNUNET_htonll (operation_id); | 330 | msg->operation_id = GNUNET_htonll (operation_id); |
331 | return msg; | 331 | return msg; |