diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-09-16 13:53:27 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-09-16 13:53:27 +0000 |
commit | a01069103ba40de0386ff895199ced38b6653734 (patch) | |
tree | e0afc9e7d72a837a23b92c5fefd578875eb3e9cf /src/vpn | |
parent | c474ffed78a7d2f93f71650cc9c5ae4625588062 (diff) | |
download | gnunet-a01069103ba40de0386ff895199ced38b6653734.tar.gz gnunet-a01069103ba40de0386ff895199ced38b6653734.zip |
c3054, also do not memset after GNUNET_malloc, malloc already memsets to 0
Diffstat (limited to 'src/vpn')
-rw-r--r-- | src/vpn/gnunet-daemon-exit.c | 5 | ||||
-rw-r--r-- | src/vpn/gnunet-service-dns.c | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/vpn/gnunet-daemon-exit.c b/src/vpn/gnunet-daemon-exit.c index 3a05f2e24..abafe9ed6 100644 --- a/src/vpn/gnunet-daemon-exit.c +++ b/src/vpn/gnunet-daemon-exit.c | |||
@@ -644,7 +644,6 @@ read_service_conf (void *cls __attribute__ ((unused)), const char *section) | |||
644 | 644 | ||
645 | struct redirect_service *serv = | 645 | struct redirect_service *serv = |
646 | GNUNET_malloc (sizeof (struct redirect_service)); | 646 | GNUNET_malloc (sizeof (struct redirect_service)); |
647 | memset (serv, 0, sizeof (struct redirect_service)); | ||
648 | serv->my_port = local_port; | 647 | serv->my_port = local_port; |
649 | 648 | ||
650 | if (0 == strcmp ("localhost4", hostname)) | 649 | if (0 == strcmp ("localhost4", hostname)) |
@@ -1034,7 +1033,6 @@ receive_tcp_service (void *cls | |||
1034 | */ | 1033 | */ |
1035 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); | 1034 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); |
1036 | 1035 | ||
1037 | memset (state, 0, sizeof (struct redirect_state)); | ||
1038 | state->tunnel = tunnel; | 1036 | state->tunnel = tunnel; |
1039 | state->serv = serv; | 1037 | state->serv = serv; |
1040 | state->type = SERVICE; | 1038 | state->type = SERVICE; |
@@ -1112,7 +1110,6 @@ receive_tcp_remote (void *cls | |||
1112 | 1110 | ||
1113 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); | 1111 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); |
1114 | 1112 | ||
1115 | memset (state, 0, sizeof (struct redirect_state)); | ||
1116 | state->tunnel = tunnel; | 1113 | state->tunnel = tunnel; |
1117 | state->type = REMOTE; | 1114 | state->type = REMOTE; |
1118 | state->hashmap = tcp_connections; | 1115 | state->hashmap = tcp_connections; |
@@ -1194,7 +1191,6 @@ receive_udp_remote (void *cls | |||
1194 | */ | 1191 | */ |
1195 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); | 1192 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); |
1196 | 1193 | ||
1197 | memset (state, 0, sizeof (struct redirect_state)); | ||
1198 | state->tunnel = tunnel; | 1194 | state->tunnel = tunnel; |
1199 | state->hashmap = udp_connections; | 1195 | state->hashmap = udp_connections; |
1200 | state->type = REMOTE; | 1196 | state->type = REMOTE; |
@@ -1297,7 +1293,6 @@ receive_udp_service (void *cls | |||
1297 | */ | 1293 | */ |
1298 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); | 1294 | struct redirect_state *state = GNUNET_malloc (sizeof (struct redirect_state)); |
1299 | 1295 | ||
1300 | memset (state, 0, sizeof (struct redirect_state)); | ||
1301 | state->tunnel = tunnel; | 1296 | state->tunnel = tunnel; |
1302 | state->serv = serv; | 1297 | state->serv = serv; |
1303 | state->type = SERVICE; | 1298 | state->type = SERVICE; |
diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c index 271c8a772..80cbbbd16 100644 --- a/src/vpn/gnunet-service-dns.c +++ b/src/vpn/gnunet-service-dns.c | |||
@@ -445,7 +445,6 @@ receive_mesh_answer (void *cls | |||
445 | 445 | ||
446 | struct answer_packet_list *answer = | 446 | struct answer_packet_list *answer = |
447 | GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *)); | 447 | GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *)); |
448 | memset (answer, 0, len + 2 * sizeof (struct answer_packet_list *)); | ||
449 | 448 | ||
450 | answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS); | 449 | answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS); |
451 | answer->pkt.hdr.size = htons (len); | 450 | answer->pkt.hdr.size = htons (len); |
@@ -457,6 +456,7 @@ receive_mesh_answer (void *cls | |||
457 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Answer only contains %d answers.\n", | 456 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Answer only contains %d answers.\n", |
458 | ntohs (pdns->s.ancount)); | 457 | ntohs (pdns->s.ancount)); |
459 | free_parsed_dns_packet (pdns); | 458 | free_parsed_dns_packet (pdns); |
459 | GNUNET_free (answer); | ||
460 | return GNUNET_OK; | 460 | return GNUNET_OK; |
461 | } | 461 | } |
462 | 462 | ||
@@ -564,7 +564,6 @@ send_rev_query (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
564 | 564 | ||
565 | struct answer_packet_list *answer = | 565 | struct answer_packet_list *answer = |
566 | GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *)); | 566 | GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *)); |
567 | memset (answer, 0, len + 2 * sizeof (struct answer_packet_list *)); | ||
568 | 567 | ||
569 | answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS); | 568 | answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS); |
570 | answer->pkt.hdr.size = htons (len); | 569 | answer->pkt.hdr.size = htons (len); |
@@ -661,7 +660,6 @@ receive_dht (void *cls, struct GNUNET_TIME_Absolute exp | |||
661 | 660 | ||
662 | struct answer_packet_list *answer = | 661 | struct answer_packet_list *answer = |
663 | GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *)); | 662 | GNUNET_malloc (len + 2 * sizeof (struct answer_packet_list *)); |
664 | memset (answer, 0, len + 2 * sizeof (struct answer_packet_list *)); | ||
665 | 663 | ||
666 | answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS); | 664 | answer->pkt.hdr.type = htons (GNUNET_MESSAGE_TYPE_VPN_DNS_LOCAL_RESPONSE_DNS); |
667 | answer->pkt.hdr.size = htons (len); | 665 | answer->pkt.hdr.size = htons (len); |