diff options
author | t3sserakt <t3ss@posteo.de> | 2023-02-08 10:29:27 +0100 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2023-02-08 10:29:27 +0100 |
commit | be0909d95bc5fa961b91223729b9858a864e3f61 (patch) | |
tree | a7f151bc16ce01883a1e977daa94af74a2c558ba | |
parent | a4b5e8d59bd8a607d5e26bc5ca1d9fab44c6e08a (diff) | |
download | gnunet-be0909d95bc5fa961b91223729b9858a864e3f61.tar.gz gnunet-be0909d95bc5fa961b91223729b9858a864e3f61.zip |
TNG: Removed debug log statements not controlled by the global logging mechanism.
-rw-r--r-- | src/transport/gnunet-communicator-tcp.c | 28 | ||||
-rw-r--r-- | src/transport/test_transport_start_with_config.c | 2 |
2 files changed, 8 insertions, 22 deletions
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c index 86b98cee1..7d4360bb0 100644 --- a/src/transport/gnunet-communicator-tcp.c +++ b/src/transport/gnunet-communicator-tcp.c | |||
@@ -1518,9 +1518,8 @@ send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, | |||
1518 | struct TCPConfirmationAck tca; | 1518 | struct TCPConfirmationAck tca; |
1519 | struct TcpHandshakeAckSignature thas; | 1519 | struct TcpHandshakeAckSignature thas; |
1520 | 1520 | ||
1521 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | 1521 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1522 | "transport", | 1522 | "sending challenge\n"); |
1523 | "sending challenge\n"); | ||
1524 | 1523 | ||
1525 | tca.header.type = ntohs ( | 1524 | tca.header.type = ntohs ( |
1526 | GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK); | 1525 | GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK); |
@@ -1546,9 +1545,8 @@ send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, | |||
1546 | &tca, | 1545 | &tca, |
1547 | sizeof(tca))); | 1546 | sizeof(tca))); |
1548 | queue->cwrite_off += sizeof(tca); | 1547 | queue->cwrite_off += sizeof(tca); |
1549 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | 1548 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1550 | "transport", | 1549 | "sending challenge done\n"); |
1551 | "sending challenge done\n"); | ||
1552 | } | 1550 | } |
1553 | 1551 | ||
1554 | 1552 | ||
@@ -2111,9 +2109,6 @@ queue_read (void *cls) | |||
2111 | BUF_SIZE - queue->cread_off); | 2109 | BUF_SIZE - queue->cread_off); |
2112 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2110 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2113 | "Received %zd bytes from TCP queue\n", rcvd); | 2111 | "Received %zd bytes from TCP queue\n", rcvd); |
2114 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | ||
2115 | "transport", | ||
2116 | "Received %zd bytes from TCP queue\n", rcvd); | ||
2117 | if (-1 == rcvd) | 2112 | if (-1 == rcvd) |
2118 | { | 2113 | { |
2119 | if ((EAGAIN != errno) && (EINTR != errno)) | 2114 | if ((EAGAIN != errno) && (EINTR != errno)) |
@@ -2695,9 +2690,8 @@ transmit_kx (struct Queue *queue, | |||
2695 | queue->challenge = tc.challenge; | 2690 | queue->challenge = tc.challenge; |
2696 | queue->cwrite_off += sizeof(tc); | 2691 | queue->cwrite_off += sizeof(tc); |
2697 | 2692 | ||
2698 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | 2693 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2699 | "transport", | 2694 | "handshake written\n"); |
2700 | "handshake written\n"); | ||
2701 | } | 2695 | } |
2702 | 2696 | ||
2703 | 2697 | ||
@@ -2882,10 +2876,6 @@ queue_read_kx (void *cls) | |||
2882 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2876 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2883 | "Received %lu bytes for KX\n", | 2877 | "Received %lu bytes for KX\n", |
2884 | rcvd); | 2878 | rcvd); |
2885 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | ||
2886 | "transport", | ||
2887 | "Received %lu bytes for KX\n", | ||
2888 | rcvd); | ||
2889 | if (-1 == rcvd) | 2879 | if (-1 == rcvd) |
2890 | { | 2880 | { |
2891 | if ((EAGAIN != errno) && (EINTR != errno)) | 2881 | if ((EAGAIN != errno) && (EINTR != errno)) |
@@ -2979,9 +2969,6 @@ proto_read_kx (void *cls) | |||
2979 | sizeof(pq->ibuf) - pq->ibuf_off); | 2969 | sizeof(pq->ibuf) - pq->ibuf_off); |
2980 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2970 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2981 | "Proto received %lu bytes for KX\n", rcvd); | 2971 | "Proto received %lu bytes for KX\n", rcvd); |
2982 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | ||
2983 | "transport", | ||
2984 | "Proto received %lu bytes for KX\n", rcvd); | ||
2985 | if (-1 == rcvd) | 2972 | if (-1 == rcvd) |
2986 | { | 2973 | { |
2987 | if ((EAGAIN != errno) && (EINTR != errno)) | 2974 | if ((EAGAIN != errno) && (EINTR != errno)) |
@@ -4048,8 +4035,7 @@ main (int argc, char *const *argv) | |||
4048 | }; | 4035 | }; |
4049 | int ret; | 4036 | int ret; |
4050 | 4037 | ||
4051 | GNUNET_log_from_nocheck (GNUNET_ERROR_TYPE_DEBUG, | 4038 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4052 | "transport", | ||
4053 | "Starting tcp communicator\n"); | 4039 | "Starting tcp communicator\n"); |
4054 | if (GNUNET_OK != | 4040 | if (GNUNET_OK != |
4055 | GNUNET_STRINGS_get_utf8_args (argc, argv, | 4041 | GNUNET_STRINGS_get_utf8_args (argc, argv, |
diff --git a/src/transport/test_transport_start_with_config.c b/src/transport/test_transport_start_with_config.c index c4b6c55ad..8a7a3dbb5 100644 --- a/src/transport/test_transport_start_with_config.c +++ b/src/transport/test_transport_start_with_config.c | |||
@@ -47,7 +47,7 @@ main (int argc, | |||
47 | size_t data_len; | 47 | size_t data_len; |
48 | 48 | ||
49 | GNUNET_log_setup ("test-netjail", | 49 | GNUNET_log_setup ("test-netjail", |
50 | "DEBUG", | 50 | "INFO", |
51 | NULL); | 51 | NULL); |
52 | 52 | ||
53 | if (0 == strcmp ("-s", argv[1])) | 53 | if (0 == strcmp ("-s", argv[1])) |