aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/transport/gnunet-communicator-unix.c2
-rw-r--r--src/transport/test_communicator_basic.c15
-rw-r--r--src/transport/transport-testing2.c4
3 files changed, 16 insertions, 5 deletions
diff --git a/src/transport/gnunet-communicator-unix.c b/src/transport/gnunet-communicator-unix.c
index 27dda7281..148f7f886 100644
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -669,7 +669,7 @@ setup_queue (const struct GNUNET_PeerIdentity *target,
669 queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch, 669 queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch,
670 &queue->target, 670 &queue->target,
671 foreign_addr, 671 foreign_addr,
672 UNIX_MTU, 672 UNIX_MTU - sizeof (struct UNIXMessage),
673 GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED, 673 GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED,
674 0, 674 0,
675 GNUNET_NT_LOOPBACK, 675 GNUNET_NT_LOOPBACK,
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index 1ea79fa19..26a10fb74 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -200,6 +200,8 @@ make_payload (size_t payload_size)
200 struct GNUNET_TIME_AbsoluteNBO ts_n; 200 struct GNUNET_TIME_AbsoluteNBO ts_n;
201 char *payload = GNUNET_malloc (payload_size); 201 char *payload = GNUNET_malloc (payload_size);
202 202
203 LOG (GNUNET_ERROR_TYPE_DEBUG,
204 "Making payload of size %lu\n", payload_size);
203 GNUNET_assert (payload_size >= 8); // So that out timestamp fits 205 GNUNET_assert (payload_size >= 8); // So that out timestamp fits
204 ts = GNUNET_TIME_absolute_get (); 206 ts = GNUNET_TIME_absolute_get ();
205 ts_n = GNUNET_TIME_absolute_hton (ts); 207 ts_n = GNUNET_TIME_absolute_hton (ts);
@@ -238,10 +240,10 @@ size_test (void *cls)
238 GNUNET_assert (TP_SIZE_CHECK == phase); 240 GNUNET_assert (TP_SIZE_CHECK == phase);
239 if (LONG_MESSAGE_SIZE != long_message_size) 241 if (LONG_MESSAGE_SIZE != long_message_size)
240 max_size = long_message_size; 242 max_size = long_message_size;
241 if (ack >= max_size) 243 if (ack + 10 > max_size)
242 return; /* Leave some room for our protocol, so not 2^16 exactly */ 244 return; /* Leave some room for our protocol, so not 2^16 exactly */
245 ack += 10;
243 payload = make_payload (ack); 246 payload = make_payload (ack);
244 ack += 5;
245 num_sent++; 247 num_sent++;
246 GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc, 248 GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc,
247 (ack < max_size) 249 (ack < max_size)
@@ -470,7 +472,7 @@ incoming_message_cb (void *cls,
470 goodput, 472 goodput,
471 (unsigned long long) avg_latency); 473 (unsigned long long) avg_latency);
472 GNUNET_free (goodput); 474 GNUNET_free (goodput);
473 ack = 10; 475 ack = 0;
474 phase = TP_SIZE_CHECK; 476 phase = TP_SIZE_CHECK;
475 num_received = 0; 477 num_received = 0;
476 num_sent = 0; 478 num_sent = 0;
@@ -481,9 +483,14 @@ incoming_message_cb (void *cls,
481 } 483 }
482 case TP_SIZE_CHECK: 484 case TP_SIZE_CHECK:
483 { 485 {
486 size_t max_size = 64000;
487
488 GNUNET_assert (TP_SIZE_CHECK == phase);
489 if (LONG_MESSAGE_SIZE != long_message_size)
490 max_size = long_message_size;
484 num_received++; 491 num_received++;
485 update_avg_latency (payload); 492 update_avg_latency (payload);
486 if (num_received >= (64000 - 10) / 5) 493 if (num_received >= (max_size) / 10)
487 { 494 {
488 GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE, 495 GNUNET_log (GNUNET_ERROR_TYPE_MESSAGE,
489 "Size packet test done.\n"); 496 "Size packet test done.\n");
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index 8250027f7..e85e46b11 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -525,6 +525,7 @@ handle_incoming_msg (void *cls,
525 struct GNUNET_TRANSPORT_IncomingMessageAck *ack; 525 struct GNUNET_TRANSPORT_IncomingMessageAck *ack;
526 526
527 env = GNUNET_MQ_msg (ack, GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK); 527 env = GNUNET_MQ_msg (ack, GNUNET_MESSAGE_TYPE_TRANSPORT_INCOMING_MSG_ACK);
528 GNUNET_assert (NULL != env);
528 ack->reserved = htonl (0); 529 ack->reserved = htonl (0);
529 ack->fc_id = inc_msg->fc_id; 530 ack->fc_id = inc_msg->fc_id;
530 ack->sender = inc_msg->sender; 531 ack->sender = inc_msg->sender;
@@ -770,6 +771,8 @@ disconnect_cb (void *cls,
770 GNUNET_CONTAINER_DLL_remove (tc_h->client_head, 771 GNUNET_CONTAINER_DLL_remove (tc_h->client_head,
771 tc_h->client_tail, 772 tc_h->client_tail,
772 cl); 773 cl);
774 if (cl->c_mq == tc_h->c_mq)
775 tc_h->c_mq = NULL;
773 GNUNET_free (cl); 776 GNUNET_free (cl);
774 break; 777 break;
775 } 778 }
@@ -1164,6 +1167,7 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_send
1164 env = GNUNET_MQ_msg_extra (msg, 1167 env = GNUNET_MQ_msg_extra (msg,
1165 inbox_size, 1168 inbox_size,
1166 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG); 1169 GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_MSG);
1170 GNUNET_assert (NULL != env);
1167 msg->qid = htonl (tc_queue->qid); 1171 msg->qid = htonl (tc_queue->qid);
1168 msg->mid = tc_queue->mid++; 1172 msg->mid = tc_queue->mid++;
1169 msg->receiver = tc_queue->peer_id; 1173 msg->receiver = tc_queue->peer_id;