diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/transport/gnunet-communicator-tcp.c | 111 | ||||
-rw-r--r-- | src/transport/test_communicator_basic.c | 46 | ||||
-rw-r--r-- | src/transport/test_communicator_tcp_basic_peer1.conf | 2 | ||||
-rw-r--r-- | src/transport/test_communicator_tcp_basic_peer2.conf | 2 | ||||
-rw-r--r-- | src/transport/test_communicator_tcp_rekey_peer2.conf | 2 | ||||
-rw-r--r-- | src/transport/transport-testing-communicator.c | 1 |
6 files changed, 116 insertions, 48 deletions
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c index 59f42496a..0c79fc1b4 100644 --- a/src/transport/gnunet-communicator-tcp.c +++ b/src/transport/gnunet-communicator-tcp.c | |||
@@ -541,6 +541,11 @@ struct Queue | |||
541 | enum GNUNET_NetworkType nt; | 541 | enum GNUNET_NetworkType nt; |
542 | 542 | ||
543 | /** | 543 | /** |
544 | * The connection status of this queue. | ||
545 | */ | ||
546 | enum GNUNET_TRANSPORT_ConnectionStatus cs; | ||
547 | |||
548 | /** | ||
544 | * Is MQ awaiting a #GNUNET_MQ_impl_send_continue() call? | 549 | * Is MQ awaiting a #GNUNET_MQ_impl_send_continue() call? |
545 | */ | 550 | */ |
546 | int mq_awaits_continue; | 551 | int mq_awaits_continue; |
@@ -828,7 +833,8 @@ int addrs_lens; | |||
828 | /** | 833 | /** |
829 | * Size of data received without KX challenge played back. | 834 | * Size of data received without KX challenge played back. |
830 | */ | 835 | */ |
831 | size_t unverified_size; | 836 | // TODO remove? |
837 | // size_t unverified_size; | ||
832 | 838 | ||
833 | /** | 839 | /** |
834 | * Database for peer's HELLOs. | 840 | * Database for peer's HELLOs. |
@@ -1434,6 +1440,9 @@ try_handle_plaintext (struct Queue *queue) | |||
1434 | struct TcpHandshakeAckSignature thas; | 1440 | struct TcpHandshakeAckSignature thas; |
1435 | const struct ChallengeNonceP challenge = queue->challenge; | 1441 | const struct ChallengeNonceP challenge = queue->challenge; |
1436 | 1442 | ||
1443 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
1444 | "try handle plaintext!\n"); | ||
1445 | |||
1437 | if ((sizeof(*hdr) > queue->pread_off)) | 1446 | if ((sizeof(*hdr) > queue->pread_off)) |
1438 | { | 1447 | { |
1439 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1448 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -1441,16 +1450,16 @@ try_handle_plaintext (struct Queue *queue) | |||
1441 | return 0; /* not even a header */ | 1450 | return 0; /* not even a header */ |
1442 | } | 1451 | } |
1443 | 1452 | ||
1444 | if ((-1 != unverified_size) && (unverified_size > INITIAL_CORE_KX_SIZE)) | 1453 | /* if ((-1 != unverified_size) && (unverified_size > INITIAL_CORE_KX_SIZE)) */ |
1445 | { | 1454 | /* { */ |
1446 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1455 | /* GNUNET_log (GNUNET_ERROR_TYPE_ERROR, */ |
1447 | "Already received data of size %lu bigger than KX size %lu!\n", | 1456 | /* "Already received data of size %lu bigger than KX size %lu!\n", */ |
1448 | unverified_size, | 1457 | /* unverified_size, */ |
1449 | INITIAL_CORE_KX_SIZE); | 1458 | /* INITIAL_CORE_KX_SIZE); */ |
1450 | GNUNET_break_op (0); | 1459 | /* GNUNET_break_op (0); */ |
1451 | queue_finish (queue); | 1460 | /* queue_finish (queue); */ |
1452 | return 0; | 1461 | /* return 0; */ |
1453 | } | 1462 | /* } */ |
1454 | 1463 | ||
1455 | type = ntohs (hdr->type); | 1464 | type = ntohs (hdr->type); |
1456 | switch (type) | 1465 | switch (type) |
@@ -1513,7 +1522,41 @@ try_handle_plaintext (struct Queue *queue) | |||
1513 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1522 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1514 | "Handling plaintext, ack processed!"); | 1523 | "Handling plaintext, ack processed!"); |
1515 | 1524 | ||
1516 | unverified_size = -1; | 1525 | // unverified_size = -1; |
1526 | |||
1527 | /* char *foreign_addr; */ | ||
1528 | |||
1529 | /* switch (queue->address->sa_family) */ | ||
1530 | /* { */ | ||
1531 | /* case AF_INET: */ | ||
1532 | /* GNUNET_asprintf (&foreign_addr, */ | ||
1533 | /* "%s-%s", */ | ||
1534 | /* COMMUNICATOR_ADDRESS_PREFIX, */ | ||
1535 | /* GNUNET_a2s (queue->address, queue->address_len)); */ | ||
1536 | /* break; */ | ||
1537 | |||
1538 | /* case AF_INET6: */ | ||
1539 | /* GNUNET_asprintf (&foreign_addr, */ | ||
1540 | /* "%s-%s", */ | ||
1541 | /* COMMUNICATOR_ADDRESS_PREFIX, */ | ||
1542 | /* GNUNET_a2s (queue->address, queue->address_len)); */ | ||
1543 | /* break; */ | ||
1544 | |||
1545 | /* default: */ | ||
1546 | /* GNUNET_assert (0); */ | ||
1547 | /* } */ | ||
1548 | |||
1549 | /* queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch, */ | ||
1550 | /* &queue->target, */ | ||
1551 | /* foreign_addr, */ | ||
1552 | /* 0 /\* no MTU *\/, */ | ||
1553 | /* GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED, */ | ||
1554 | /* 0, /\* Priority *\/ */ | ||
1555 | /* queue->nt, */ | ||
1556 | /* queue->cs, */ | ||
1557 | /* queue->mq); */ | ||
1558 | |||
1559 | /* GNUNET_free (foreign_addr); */ | ||
1517 | 1560 | ||
1518 | size = ntohs (hdr->size); | 1561 | size = ntohs (hdr->size); |
1519 | break; | 1562 | break; |
@@ -1590,8 +1633,8 @@ try_handle_plaintext (struct Queue *queue) | |||
1590 | return 0; | 1633 | return 0; |
1591 | } | 1634 | } |
1592 | GNUNET_assert (0 != size); | 1635 | GNUNET_assert (0 != size); |
1593 | if (-1 != unverified_size) | 1636 | /* if (-1 != unverified_size) */ |
1594 | unverified_size += size; | 1637 | /* unverified_size += size; */ |
1595 | return size; | 1638 | return size; |
1596 | } | 1639 | } |
1597 | 1640 | ||
@@ -2139,11 +2182,12 @@ queue_write (void *cls) | |||
2139 | queue->cwrite_off += queue->pwrite_off; | 2182 | queue->cwrite_off += queue->pwrite_off; |
2140 | queue->pwrite_off = 0; | 2183 | queue->pwrite_off = 0; |
2141 | } | 2184 | } |
2142 | if ((-1 != unverified_size)&& ((0 == queue->pwrite_off) && | 2185 | // if ((-1 != unverified_size)&& ((0 == queue->pwrite_off) && |
2143 | ((0 == queue->rekey_left_bytes) || | 2186 | if (((0 == queue->pwrite_off) && |
2144 | (0 == | 2187 | ((0 == queue->rekey_left_bytes) || |
2145 | GNUNET_TIME_absolute_get_remaining ( | 2188 | (0 == |
2146 | queue->rekey_time).rel_value_us)))) | 2189 | GNUNET_TIME_absolute_get_remaining ( |
2190 | queue->rekey_time).rel_value_us)))) | ||
2147 | { | 2191 | { |
2148 | inject_rekey (queue); | 2192 | inject_rekey (queue); |
2149 | } | 2193 | } |
@@ -2282,7 +2326,7 @@ mq_error (void *cls, enum GNUNET_MQ_Error error) | |||
2282 | * @param queue queue to boot | 2326 | * @param queue queue to boot |
2283 | */ | 2327 | */ |
2284 | static void | 2328 | static void |
2285 | boot_queue (struct Queue *queue, enum GNUNET_TRANSPORT_ConnectionStatus cs) | 2329 | boot_queue (struct Queue *queue) |
2286 | { | 2330 | { |
2287 | queue->nt = | 2331 | queue->nt = |
2288 | GNUNET_NT_scanner_get_type (is, queue->address, queue->address_len); | 2332 | GNUNET_NT_scanner_get_type (is, queue->address, queue->address_len); |
@@ -2333,7 +2377,7 @@ boot_queue (struct Queue *queue, enum GNUNET_TRANSPORT_ConnectionStatus cs) | |||
2333 | GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED, | 2377 | GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED, |
2334 | 0, /* Priority */ | 2378 | 0, /* Priority */ |
2335 | queue->nt, | 2379 | queue->nt, |
2336 | cs, | 2380 | queue->cs, |
2337 | queue->mq); | 2381 | queue->mq); |
2338 | GNUNET_free (foreign_addr); | 2382 | GNUNET_free (foreign_addr); |
2339 | } | 2383 | } |
@@ -2557,7 +2601,7 @@ free_proto_queue (struct ProtoQueue *pq) | |||
2557 | * @param queue The queue context. | 2601 | * @param queue The queue context. |
2558 | */ | 2602 | */ |
2559 | static void | 2603 | static void |
2560 | send_challenge (struct TCPConfirmation tc, struct Queue *queue) | 2604 | send_challenge (struct ChallengeNonceP challenge, struct Queue *queue) |
2561 | { | 2605 | { |
2562 | struct TCPConfirmationAck tca; | 2606 | struct TCPConfirmationAck tca; |
2563 | struct TcpHandshakeAckSignature thas; | 2607 | struct TcpHandshakeAckSignature thas; |
@@ -2569,7 +2613,7 @@ send_challenge (struct TCPConfirmation tc, struct Queue *queue) | |||
2569 | tca.header.type = ntohs ( | 2613 | tca.header.type = ntohs ( |
2570 | GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK); | 2614 | GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK); |
2571 | tca.header.size = ntohs (sizeof(tca)); | 2615 | tca.header.size = ntohs (sizeof(tca)); |
2572 | tca.challenge = tc.challenge; | 2616 | tca.challenge = challenge; |
2573 | tca.sender = my_identity; | 2617 | tca.sender = my_identity; |
2574 | tca.monotonic_time = | 2618 | tca.monotonic_time = |
2575 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (cfg)); | 2619 | GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get_monotonic (cfg)); |
@@ -2665,7 +2709,8 @@ proto_read_kx (void *cls) | |||
2665 | "start kx proto\n"); | 2709 | "start kx proto\n"); |
2666 | 2710 | ||
2667 | start_initial_kx_out (queue); | 2711 | start_initial_kx_out (queue); |
2668 | boot_queue (queue, GNUNET_TRANSPORT_CS_INBOUND); | 2712 | queue->cs = GNUNET_TRANSPORT_CS_INBOUND; |
2713 | boot_queue (queue); | ||
2669 | queue->read_task = | 2714 | queue->read_task = |
2670 | GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2715 | GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
2671 | queue->sock, | 2716 | queue->sock, |
@@ -2676,7 +2721,8 @@ proto_read_kx (void *cls) | |||
2676 | queue->sock, | 2721 | queue->sock, |
2677 | &queue_write, | 2722 | &queue_write, |
2678 | queue); | 2723 | queue); |
2679 | send_challenge (tc, queue); | 2724 | // TODO To early! Move it somewhere else. |
2725 | // send_challenge (tc, queue); | ||
2680 | 2726 | ||
2681 | GNUNET_CONTAINER_DLL_remove (proto_head, proto_tail, pq); | 2727 | GNUNET_CONTAINER_DLL_remove (proto_head, proto_tail, pq); |
2682 | GNUNET_free (pq); | 2728 | GNUNET_free (pq); |
@@ -2762,7 +2808,9 @@ queue_read_kx (void *cls) | |||
2762 | rcvd = GNUNET_NETWORK_socket_recv (queue->sock, | 2808 | rcvd = GNUNET_NETWORK_socket_recv (queue->sock, |
2763 | &queue->cread_buf[queue->cread_off], | 2809 | &queue->cread_buf[queue->cread_off], |
2764 | BUF_SIZE - queue->cread_off); | 2810 | BUF_SIZE - queue->cread_off); |
2765 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %lu bytes for KX\n", rcvd); | 2811 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2812 | "Received %lu bytes for KX\n", | ||
2813 | rcvd); | ||
2766 | if (-1 == rcvd) | 2814 | if (-1 == rcvd) |
2767 | { | 2815 | { |
2768 | if ((EAGAIN != errno) && (EINTR != errno)) | 2816 | if ((EAGAIN != errno) && (EINTR != errno)) |
@@ -2804,14 +2852,20 @@ queue_read_kx (void *cls) | |||
2804 | queue_destroy (queue); | 2852 | queue_destroy (queue); |
2805 | return; | 2853 | return; |
2806 | } | 2854 | } |
2807 | send_challenge (tc, queue); | 2855 | send_challenge (tc.challenge, queue); |
2808 | /* update queue timeout */ | 2856 | /* update queue timeout */ |
2809 | reschedule_queue_timeout (queue); | 2857 | reschedule_queue_timeout (queue); |
2810 | /* prepare to continue with regular read task immediately */ | 2858 | /* prepare to continue with regular read task immediately */ |
2811 | memmove (queue->cread_buf, | 2859 | memmove (queue->cread_buf, |
2812 | &queue->cread_buf[INITIAL_KX_SIZE], | 2860 | &queue->cread_buf[INITIAL_KX_SIZE], |
2813 | queue->cread_off - (INITIAL_KX_SIZE)); | 2861 | queue->cread_off - (INITIAL_KX_SIZE)); |
2862 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2863 | "cread_off is %lu bytes before adjusting\n", | ||
2864 | queue->cread_off); | ||
2814 | queue->cread_off -= INITIAL_KX_SIZE; | 2865 | queue->cread_off -= INITIAL_KX_SIZE; |
2866 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
2867 | "cread_off set to %lu bytes\n", | ||
2868 | queue->cread_off); | ||
2815 | if (0 < queue->cread_off) | 2869 | if (0 < queue->cread_off) |
2816 | queue->read_task = GNUNET_SCHEDULER_add_now (&queue_read, queue); | 2870 | queue->read_task = GNUNET_SCHEDULER_add_now (&queue_read, queue); |
2817 | } | 2871 | } |
@@ -2893,7 +2947,8 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address) | |||
2893 | queue->address = in; | 2947 | queue->address = in; |
2894 | queue->address_len = in_len; | 2948 | queue->address_len = in_len; |
2895 | queue->sock = sock; | 2949 | queue->sock = sock; |
2896 | boot_queue (queue, GNUNET_TRANSPORT_CS_OUTBOUND); | 2950 | queue->cs = GNUNET_TRANSPORT_CS_OUTBOUND; |
2951 | boot_queue (queue); | ||
2897 | // queue->mq_awaits_continue = GNUNET_YES; | 2952 | // queue->mq_awaits_continue = GNUNET_YES; |
2898 | queue->read_task = | 2953 | queue->read_task = |
2899 | GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, | 2954 | GNUNET_SCHEDULER_add_read_net (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT, |
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c index 10c942daa..0eeaecb6c 100644 --- a/src/transport/test_communicator_basic.c +++ b/src/transport/test_communicator_basic.c | |||
@@ -61,6 +61,8 @@ static char *cfg_peers_name[NUM_PEERS]; | |||
61 | 61 | ||
62 | static int ret; | 62 | static int ret; |
63 | 63 | ||
64 | static int bidirect = GNUNET_NO; | ||
65 | |||
64 | static size_t long_message_size; | 66 | static size_t long_message_size; |
65 | 67 | ||
66 | static struct GNUNET_TIME_Absolute start_short; | 68 | static struct GNUNET_TIME_Absolute start_short; |
@@ -71,6 +73,8 @@ static struct GNUNET_TIME_Absolute timeout; | |||
71 | 73 | ||
72 | static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *my_tc; | 74 | static struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *my_tc; |
73 | 75 | ||
76 | static char *communicator_name; | ||
77 | |||
74 | static char *test_name; | 78 | static char *test_name; |
75 | 79 | ||
76 | static struct GNUNET_STATISTICS_GetHandle *box_stats; | 80 | static struct GNUNET_STATISTICS_GetHandle *box_stats; |
@@ -343,11 +347,8 @@ long_test_cb (void *cls) | |||
343 | payload = make_payload (long_message_size); | 347 | payload = make_payload (long_message_size); |
344 | num_sent_long++; | 348 | num_sent_long++; |
345 | GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc, | 349 | GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc, |
346 | ((BURST_PACKETS | 350 | (BURST_PACKETS == |
347 | * 0.91 == | 351 | num_sent_long) |
348 | num_received_long) || | ||
349 | (BURST_PACKETS == | ||
350 | num_sent_long)) | ||
351 | ? NULL | 352 | ? NULL |
352 | : &long_test, | 353 | : &long_test, |
353 | NULL, | 354 | NULL, |
@@ -385,11 +386,8 @@ short_test_cb (void *cls) | |||
385 | payload = make_payload (SHORT_MESSAGE_SIZE); | 386 | payload = make_payload (SHORT_MESSAGE_SIZE); |
386 | num_sent_short++; | 387 | num_sent_short++; |
387 | GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc, | 388 | GNUNET_TRANSPORT_TESTING_transport_communicator_send (my_tc, |
388 | ((BURST_PACKETS | 389 | (BURST_PACKETS == |
389 | * 0.91 == | 390 | num_sent_short) |
390 | num_received_short) || | ||
391 | (BURST_PACKETS == | ||
392 | num_sent_short)) | ||
393 | ? NULL | 391 | ? NULL |
394 | : &short_test, | 392 | : &short_test, |
395 | NULL, | 393 | NULL, |
@@ -625,7 +623,8 @@ incoming_message_cb (void *cls, | |||
625 | num_received_short++; | 623 | num_received_short++; |
626 | duration = GNUNET_TIME_absolute_get_duration (start_short); | 624 | duration = GNUNET_TIME_absolute_get_duration (start_short); |
627 | update_avg_latency (payload); | 625 | update_avg_latency (payload); |
628 | if (num_received_short == BURST_PACKETS * 0.91) | 626 | if ((num_sent_short == BURST_PACKETS) && (num_received_short > |
627 | BURST_PACKETS * 0.91) ) | ||
629 | { | 628 | { |
630 | LOG (GNUNET_ERROR_TYPE_MESSAGE, | 629 | LOG (GNUNET_ERROR_TYPE_MESSAGE, |
631 | "Short size packet test done.\n"); | 630 | "Short size packet test done.\n"); |
@@ -647,6 +646,9 @@ incoming_message_cb (void *cls, | |||
647 | // num_sent_short = 0; | 646 | // num_sent_short = 0; |
648 | avg_latency = 0; | 647 | avg_latency = 0; |
649 | // num_received = 0; | 648 | // num_received = 0; |
649 | /*LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
650 | "Finished\n"); | ||
651 | GNUNET_SCHEDULER_shutdown ();*/ | ||
650 | long_test (NULL); | 652 | long_test (NULL); |
651 | } | 653 | } |
652 | break; | 654 | break; |
@@ -662,7 +664,8 @@ incoming_message_cb (void *cls, | |||
662 | num_received_long++; | 664 | num_received_long++; |
663 | duration = GNUNET_TIME_absolute_get_duration (start_long); | 665 | duration = GNUNET_TIME_absolute_get_duration (start_long); |
664 | update_avg_latency (payload); | 666 | update_avg_latency (payload); |
665 | if (num_received_long == BURST_PACKETS * 0.91) | 667 | if ((num_sent_long == BURST_PACKETS) && (num_received_long > BURST_PACKETS |
668 | * 0.91) ) | ||
666 | { | 669 | { |
667 | LOG (GNUNET_ERROR_TYPE_MESSAGE, | 670 | LOG (GNUNET_ERROR_TYPE_MESSAGE, |
668 | "Long size packet test done.\n"); | 671 | "Long size packet test done.\n"); |
@@ -723,8 +726,11 @@ incoming_message_cb (void *cls, | |||
723 | short_test (NULL); | 726 | short_test (NULL); |
724 | break; | 727 | break; |
725 | } | 728 | } |
726 | if ((0 == strcmp ("rekey", test_name))||(0 == strcmp ("backchannel", | 729 | if ((0 == strcmp ("udp", communicator_name)) && ((0 == strcmp ("rekey", |
727 | test_name)) ) | 730 | test_name)) |
731 | ||(0 == strcmp ( | ||
732 | "backchannel", | ||
733 | test_name))) ) | ||
728 | { | 734 | { |
729 | if (NULL != box_stats) | 735 | if (NULL != box_stats) |
730 | GNUNET_STATISTICS_get_cancel (box_stats); | 736 | GNUNET_STATISTICS_get_cancel (box_stats); |
@@ -810,12 +816,19 @@ run (void *cls) | |||
810 | &handle_backchannel_cb, | 816 | &handle_backchannel_cb, |
811 | cfg_peers_name[i]); /* cls */ | 817 | cfg_peers_name[i]); /* cls */ |
812 | 818 | ||
813 | if ((0 == strcmp ("rekey", test_name))||(0 == strcmp ("backchannel", | 819 | if ((0 == strcmp ("udp", communicator_name)) && ((0 == strcmp ("rekey", |
814 | test_name)) ) | 820 | test_name))|| |
821 | (0 == strcmp ( | ||
822 | "backchannel", | ||
823 | test_name))) ) | ||
815 | { | 824 | { |
816 | stats[i] = GNUNET_STATISTICS_create ("C-UDP", | 825 | stats[i] = GNUNET_STATISTICS_create ("C-UDP", |
817 | cfg_peers[i]); | 826 | cfg_peers[i]); |
818 | } | 827 | } |
828 | else if ((0 == strcmp ("bidirect", test_name))) | ||
829 | { | ||
830 | bidirect = GNUNET_YES; | ||
831 | } | ||
819 | } | 832 | } |
820 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, | 833 | GNUNET_SCHEDULER_add_shutdown (&do_shutdown, |
821 | NULL); | 834 | NULL); |
@@ -827,7 +840,6 @@ main (int argc, | |||
827 | char *const *argv) | 840 | char *const *argv) |
828 | { | 841 | { |
829 | struct GNUNET_CRYPTO_EddsaPrivateKey *private_key; | 842 | struct GNUNET_CRYPTO_EddsaPrivateKey *private_key; |
830 | char *communicator_name; | ||
831 | char *test_mode; | 843 | char *test_mode; |
832 | char *cfg_peer; | 844 | char *cfg_peer; |
833 | 845 | ||
diff --git a/src/transport/test_communicator_tcp_basic_peer1.conf b/src/transport/test_communicator_tcp_basic_peer1.conf index 2411f485b..b32aa1c17 100644 --- a/src/transport/test_communicator_tcp_basic_peer1.conf +++ b/src/transport/test_communicator_tcp_basic_peer1.conf | |||
@@ -33,7 +33,7 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_1.sock | |||
33 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args | 33 | #PREFIX = xterm -geometry 100x85 -T peer1 -e gdb --args |
34 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 34 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
35 | BINDTO = 60002 | 35 | BINDTO = 60002 |
36 | DISABLE_V6 = NO | 36 | DISABLE_V6 = YES |
37 | 37 | ||
38 | [communicator-udp] | 38 | [communicator-udp] |
39 | BINDTO = 60002 | 39 | BINDTO = 60002 |
diff --git a/src/transport/test_communicator_tcp_basic_peer2.conf b/src/transport/test_communicator_tcp_basic_peer2.conf index 8005718bf..b73157f0d 100644 --- a/src/transport/test_communicator_tcp_basic_peer2.conf +++ b/src/transport/test_communicator_tcp_basic_peer2.conf | |||
@@ -34,7 +34,7 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock | |||
34 | #PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args | 34 | #PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args |
35 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 35 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
36 | BINDTO = 60003 | 36 | BINDTO = 60003 |
37 | DISABLE_V6 = NO | 37 | DISABLE_V6 = YES |
38 | 38 | ||
39 | [communicator-udp] | 39 | [communicator-udp] |
40 | BINDTO = 60003 | 40 | BINDTO = 60003 |
diff --git a/src/transport/test_communicator_tcp_rekey_peer2.conf b/src/transport/test_communicator_tcp_rekey_peer2.conf index 1036039c4..086a996ae 100644 --- a/src/transport/test_communicator_tcp_rekey_peer2.conf +++ b/src/transport/test_communicator_tcp_rekey_peer2.conf | |||
@@ -38,7 +38,7 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test_gnunet-communicator-unix_2.sock | |||
38 | #PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args | 38 | #PREFIX = xterm -geometry 100x85 -T peer2 -e gdb --args |
39 | #PREFIX = valgrind --leak-check=full --track-origins=yes | 39 | #PREFIX = valgrind --leak-check=full --track-origins=yes |
40 | BINDTO = 60003 | 40 | BINDTO = 60003 |
41 | DISABLE_V6 = NO | 41 | DISABLE_V6 = YES |
42 | REKEY_INTERVAL = 100ms | 42 | REKEY_INTERVAL = 100ms |
43 | 43 | ||
44 | [communicator-udp] | 44 | [communicator-udp] |
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c index 56240864c..de356fb9c 100644 --- a/src/transport/transport-testing-communicator.c +++ b/src/transport/transport-testing-communicator.c | |||
@@ -317,6 +317,7 @@ handle_add_address (void *cls, | |||
317 | client->tc; | 317 | client->tc; |
318 | uint16_t size; | 318 | uint16_t size; |
319 | size = ntohs (msg->header.size) - sizeof(*msg); | 319 | size = ntohs (msg->header.size) - sizeof(*msg); |
320 | LOG (GNUNET_ERROR_TYPE_DEBUG, "received add address cb %u\n", size); | ||
320 | if (0 == size) | 321 | if (0 == size) |
321 | return; /* receive-only communicator */ | 322 | return; /* receive-only communicator */ |
322 | LOG (GNUNET_ERROR_TYPE_DEBUG, "received add address cb %u\n", size); | 323 | LOG (GNUNET_ERROR_TYPE_DEBUG, "received add address cb %u\n", size); |