diff options
author | Philipp Tölke <toelke@in.tum.de> | 2010-10-05 18:20:14 +0000 |
---|---|---|
committer | Philipp Tölke <toelke@in.tum.de> | 2010-10-05 18:20:14 +0000 |
commit | 37bf467121fb638404b4aff5dac42f907e6b47e7 (patch) | |
tree | 5a43d791e68988eab08cc7f4373dd15a32c547dd /src | |
parent | 273e959d9136d601c898fb29833e367e994f280c (diff) | |
download | gnunet-37bf467121fb638404b4aff5dac42f907e6b47e7.tar.gz gnunet-37bf467121fb638404b4aff5dac42f907e6b47e7.zip |
Remove unnecessary DEBUG-Output
Diffstat (limited to 'src')
-rw-r--r-- | src/vpn/gnunet-daemon-vpn.c | 12 | ||||
-rw-r--r-- | src/vpn/gnunet-service-dns.c | 12 |
2 files changed, 4 insertions, 20 deletions
diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index a078747a0..1ec5bf758 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c | |||
@@ -117,7 +117,7 @@ static void helper_read(void* cls, const struct GNUNET_SCHEDULER_TaskContext* ts | |||
117 | 117 | ||
118 | int t = GNUNET_DISK_file_read(mycls.fh_from_helper, &buf, 65535); | 118 | int t = GNUNET_DISK_file_read(mycls.fh_from_helper, &buf, 65535); |
119 | if (t<=0) { | 119 | if (t<=0) { |
120 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Read error for header: %m\n"); | 120 | GNUNET_log(GNUNET_ERROR_TYPE_WARNING, "Read error for header from vpn-helper: %m\n"); |
121 | GNUNET_SCHEDULER_add_now(mycls.sched, restart_helper, cls); | 121 | GNUNET_SCHEDULER_add_now(mycls.sched, restart_helper, cls); |
122 | return; | 122 | return; |
123 | } | 123 | } |
@@ -205,8 +205,6 @@ size_t send_query(void* cls, size_t size, void* buf) | |||
205 | 205 | ||
206 | memcpy(buf, &query->pkt.hdr, len); | 206 | memcpy(buf, &query->pkt.hdr, len); |
207 | 207 | ||
208 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes.\n", len); | ||
209 | |||
210 | GNUNET_CONTAINER_DLL_remove (mycls.head, mycls.tail, query); | 208 | GNUNET_CONTAINER_DLL_remove (mycls.head, mycls.tail, query); |
211 | 209 | ||
212 | GNUNET_free(query); | 210 | GNUNET_free(query); |
@@ -258,11 +256,7 @@ static void message_token(void *cls, void *client, const struct GNUNET_MessageHe | |||
258 | 256 | ||
259 | GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, query); | 257 | GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, query); |
260 | 258 | ||
261 | struct GNUNET_CLIENT_TransmitHandle* th = GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL); | 259 | /* struct GNUNET_CLIENT_TransmitHandle* th = */ GNUNET_CLIENT_notify_transmit_ready(mycls.dns_connection, len, GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_YES, &send_query, NULL); |
262 | if (th != NULL) | ||
263 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Queued sending of %d bytes.\n", len); | ||
264 | else | ||
265 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Already queued for %d bytes.\n", len); | ||
266 | } | 260 | } |
267 | } | 261 | } |
268 | 262 | ||
@@ -270,7 +264,6 @@ static void message_token(void *cls, void *client, const struct GNUNET_MessageHe | |||
270 | 264 | ||
271 | void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg) { | 265 | void dns_answer_handler(void* cls, const struct GNUNET_MessageHeader *msg) { |
272 | if (msg == NULL) return; | 266 | if (msg == NULL) return; |
273 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Got an answer!\n"); | ||
274 | 267 | ||
275 | if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS)) goto out; | 268 | if (msg->type != htons(GNUNET_MESSAGE_TYPE_LOCAL_RESPONSE_DNS)) goto out; |
276 | 269 | ||
@@ -306,7 +299,6 @@ run (void *cls, | |||
306 | mycls.mst = GNUNET_SERVER_mst_create(&message_token, NULL); | 299 | mycls.mst = GNUNET_SERVER_mst_create(&message_token, NULL); |
307 | 300 | ||
308 | mycls.dns_connection = GNUNET_CLIENT_connect (sched, "dns", cfg); | 301 | mycls.dns_connection = GNUNET_CLIENT_connect (sched, "dns", cfg); |
309 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Connection: %x\n", mycls.dns_connection); | ||
310 | 302 | ||
311 | GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL); | 303 | GNUNET_CLIENT_receive(mycls.dns_connection, &dns_answer_handler, NULL, GNUNET_TIME_UNIT_FOREVER_REL); |
312 | 304 | ||
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c index 7880bf22e..e40b2c5c4 100644 --- a/src/vpn/gnunet-service-dns.c +++ b/src/vpn/gnunet-service-dns.c | |||
@@ -72,7 +72,6 @@ void unhijack(unsigned short port) { | |||
72 | void receive_query(void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) | 72 | void receive_query(void *cls, struct GNUNET_SERVER_Client *client, const struct GNUNET_MessageHeader *message) |
73 | { | 73 | { |
74 | struct query_packet* pkt = (struct query_packet*)message; | 74 | struct query_packet* pkt = (struct query_packet*)message; |
75 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received query of length %d\n", ntohs(pkt->hdr.size)); | ||
76 | struct dns_pkt* dns = (struct dns_pkt*)pkt->data; | 75 | struct dns_pkt* dns = (struct dns_pkt*)pkt->data; |
77 | 76 | ||
78 | struct sockaddr_in dest; | 77 | struct sockaddr_in dest; |
@@ -85,8 +84,7 @@ void receive_query(void *cls, struct GNUNET_SERVER_Client *client, const struct | |||
85 | query_states[dns->id].local_ip = pkt->orig_from; | 84 | query_states[dns->id].local_ip = pkt->orig_from; |
86 | query_states[dns->id].local_port = pkt->src_port; | 85 | query_states[dns->id].local_port = pkt->src_port; |
87 | 86 | ||
88 | int r = GNUNET_NETWORK_socket_sendto(mycls.dnsout, dns, ntohs(pkt->hdr.size) - sizeof(struct query_packet) + 1, (struct sockaddr*) &dest, sizeof dest); | 87 | /* int r = */ GNUNET_NETWORK_socket_sendto(mycls.dnsout, dns, ntohs(pkt->hdr.size) - sizeof(struct query_packet) + 1, (struct sockaddr*) &dest, sizeof dest); |
89 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "send %d bytes to socket\n", r); | ||
90 | 88 | ||
91 | GNUNET_SERVER_receive_done(client, GNUNET_OK); | 89 | GNUNET_SERVER_receive_done(client, GNUNET_OK); |
92 | } | 90 | } |
@@ -99,8 +97,6 @@ size_t send_answer(void* cls, size_t size, void* buf) { | |||
99 | 97 | ||
100 | memcpy(buf, &query->pkt.hdr, len); | 98 | memcpy(buf, &query->pkt.hdr, len); |
101 | 99 | ||
102 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sent %d bytes.\n", len); | ||
103 | |||
104 | GNUNET_CONTAINER_DLL_remove (mycls.head, mycls.tail, query); | 100 | GNUNET_CONTAINER_DLL_remove (mycls.head, mycls.tail, query); |
105 | 101 | ||
106 | GNUNET_free(query); | 102 | GNUNET_free(query); |
@@ -142,11 +138,7 @@ static void read_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext | |||
142 | 138 | ||
143 | GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, answer); | 139 | GNUNET_CONTAINER_DLL_insert_after(mycls.head, mycls.tail, mycls.tail, answer); |
144 | 140 | ||
145 | struct GNUNET_CONNECTION_TransmitHandle* th = GNUNET_SERVER_notify_transmit_ready(query_states[dns->id].client, len, GNUNET_TIME_UNIT_FOREVER_REL, &send_answer, query_states[dns->id].client); | 141 | /* struct GNUNET_CONNECTION_TransmitHandle* th = */ GNUNET_SERVER_notify_transmit_ready(query_states[dns->id].client, len, GNUNET_TIME_UNIT_FOREVER_REL, &send_answer, query_states[dns->id].client); |
146 | if (th != NULL) | ||
147 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Queued sending of %d bytes.\n", len); | ||
148 | else | ||
149 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Already queued for %d bytes.\n", len); | ||
150 | } | 142 | } |
151 | 143 | ||
152 | GNUNET_SCHEDULER_add_read_net(mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.dnsout, &read_response, NULL); | 144 | GNUNET_SCHEDULER_add_read_net(mycls.sched, GNUNET_TIME_UNIT_FOREVER_REL, mycls.dnsout, &read_response, NULL); |