aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <schanzen@gnunet.org>2023-07-28 20:41:58 +0200
committerMartin Schanzenbach <schanzen@gnunet.org>2023-07-28 20:41:58 +0200
commitd9d1e7b861aae0c5f72152faa41da0a7feabc6f0 (patch)
treede02e5a5cd3e6f4757ae767450fd511bc6aa086a
parent17c852381a483b943273cdebbf48f23d2919c278 (diff)
downloadgnunet-d9d1e7b861aae0c5f72152faa41da0a7feabc6f0.tar.gz
gnunet-d9d1e7b861aae0c5f72152faa41da0a7feabc6f0.zip
TNG: Actually use faster queue in UDP tests. Tests fail now.
-rw-r--r--src/transport/test_communicator_basic.c3
-rw-r--r--src/transport/test_communicator_udp_rekey_peer1.conf1
-rw-r--r--src/transport/test_communicator_udp_rekey_peer2.conf1
-rw-r--r--src/transport/transport-testing-communicator.c8
4 files changed, 11 insertions, 2 deletions
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index 14d1a4792..2e81855d6 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -405,7 +405,8 @@ process_statistics (void *cls,
405 { 405 {
406 ret = 2; 406 ret = 2;
407 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 407 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
408 "Not enough BOX messages!\n"); 408 "Not enough BOX messages! (want: %u, have %llu)\n",
409 6000, value);
409 GNUNET_SCHEDULER_shutdown (); 410 GNUNET_SCHEDULER_shutdown ();
410 } 411 }
411 return GNUNET_OK; 412 return GNUNET_OK;
diff --git a/src/transport/test_communicator_udp_rekey_peer1.conf b/src/transport/test_communicator_udp_rekey_peer1.conf
index 6bfeafe33..a881a5034 100644
--- a/src/transport/test_communicator_udp_rekey_peer1.conf
+++ b/src/transport/test_communicator_udp_rekey_peer1.conf
@@ -45,6 +45,7 @@ REKEY_INTERVAL = 100ms
45BINDTO = 60002 45BINDTO = 60002
46DISABLE_V6 = YES 46DISABLE_V6 = YES
47MAX_QUEUE_LENGTH=5000 47MAX_QUEUE_LENGTH=5000
48# REKEY_INTERVAL = 100ms
48REKEY_MAX_BYTES=9MiB 49REKEY_MAX_BYTES=9MiB
49 50
50[communicator-test] 51[communicator-test]
diff --git a/src/transport/test_communicator_udp_rekey_peer2.conf b/src/transport/test_communicator_udp_rekey_peer2.conf
index 474ca0c15..b5e128009 100644
--- a/src/transport/test_communicator_udp_rekey_peer2.conf
+++ b/src/transport/test_communicator_udp_rekey_peer2.conf
@@ -45,6 +45,7 @@ REKEY_INTERVAL = 100ms
45BINDTO = 60003 45BINDTO = 60003
46DISABLE_V6 = YES 46DISABLE_V6 = YES
47MAX_QUEUE_LENGTH=5000 47MAX_QUEUE_LENGTH=5000
48#REKEY_INTERVAL = 100ms
48REKEY_MAX_BYTES=9MiB 49REKEY_MAX_BYTES=9MiB
49 50
50[communicator-test] 51[communicator-test]
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
index 1bf88bb3d..e1090eaeb 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -772,6 +772,7 @@ shutdown_process (struct GNUNET_OS_Process *proc)
772 GNUNET_OS_process_destroy (proc); 772 GNUNET_OS_process_destroy (proc);
773} 773}
774 774
775
775/** 776/**
776 * @brief Task run at shutdown to kill the statistics process 777 * @brief Task run at shutdown to kill the statistics process
777 * 778 *
@@ -784,6 +785,7 @@ shutdown_statistics (void *cls)
784 shutdown_process (proc); 785 shutdown_process (proc);
785} 786}
786 787
788
787/** 789/**
788 * @brief Task run at shutdown to kill the peerstore process 790 * @brief Task run at shutdown to kill the peerstore process
789 * 791 *
@@ -796,6 +798,7 @@ shutdown_peerstore (void *cls)
796 shutdown_process (proc); 798 shutdown_process (proc);
797} 799}
798 800
801
799/** 802/**
800 * @brief Task run at shutdown to kill a communicator process 803 * @brief Task run at shutdown to kill a communicator process
801 * 804 *
@@ -913,6 +916,7 @@ resolver_start (struct
913 916
914} 917}
915 918
919
916/** 920/**
917 * @brief Start Statistics 921 * @brief Start Statistics
918 * 922 *
@@ -942,6 +946,7 @@ statistics_start (
942 GNUNET_free (binary); 946 GNUNET_free (binary);
943} 947}
944 948
949
945/** 950/**
946 * @brief Start Peerstore 951 * @brief Start Peerstore
947 * 952 *
@@ -971,6 +976,7 @@ peerstore_start (
971 GNUNET_free (binary); 976 GNUNET_free (binary);
972} 977}
973 978
979
974/** 980/**
975 * @brief Start NAT 981 * @brief Start NAT
976 * 982 *
@@ -1200,7 +1206,7 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_send
1200 inbox_size, 1206 inbox_size,
1201 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG); 1207 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG);
1202 GNUNET_assert (NULL != env); 1208 GNUNET_assert (NULL != env);
1203 msg->qid = htonl (tc_queue->qid); 1209 msg->qid = tc_queue->qid;
1204 msg->mid = tc_queue->mid++; 1210 msg->mid = tc_queue->mid++;
1205 msg->receiver = tc_queue->peer_id; 1211 msg->receiver = tc_queue->peer_id;
1206 mh = (struct GNUNET_MessageHeader *) &msg[1]; 1212 mh = (struct GNUNET_MessageHeader *) &msg[1];