From 6b62992c2534c1a8714a602843c6ed80ef97d657 Mon Sep 17 00:00:00 2001 From: thorkill Date: Tue, 30 Jun 2015 18:10:38 +0200 Subject: [PATCH] Revert "Silence most noisy sources of memory leakage." This reverts commit 408fb3b011fde8edbcec1b8c10f9b59a20bcc20e. --- src/meta.c | 3 +-- src/net_packet.c | 1 - src/protocol_auth.c | 7 +------ 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/meta.c b/src/meta.c index ff06d0ce..260cb005 100644 --- a/src/meta.c +++ b/src/meta.c @@ -287,8 +287,7 @@ bool receive_meta(connection_t *c) { char *request = buffer_readline(&c->inbuf); if(request) { - bool result = false; - result = receive_request(c, request); + bool result = receive_request(c, request); if(!result) return false; continue; diff --git a/src/net_packet.c b/src/net_packet.c index a95e9771..6183e253 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -837,7 +837,6 @@ bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t } vpn_packet_t inpkt; - bzero(&inpkt, sizeof(inpkt)); inpkt.offset = DEFAULT_PACKET_OFFSET; if(type == PKT_PROBE) { diff --git a/src/protocol_auth.c b/src/protocol_auth.c index 78c19ba3..d30d9e08 100644 --- a/src/protocol_auth.c +++ b/src/protocol_auth.c @@ -498,11 +498,6 @@ bool metakey_h(connection_t *c, const char *request) { char enckey[len]; char key[len]; - bzero(key, len); - bzero(enckey, len); - - cipher = digest = maclength =compression = 0; - if(sscanf(request, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, hexkey) != 5) { logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname); return false; @@ -697,7 +692,7 @@ bool send_ack(connection_t *c) { to create node_t and edge_t structures. */ struct timeval now; - bool choice = false; + bool choice; /* Estimate weight */