summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-04-22 20:47:36 (GMT)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-04-23 08:05:02 (GMT)
commit4e0e2271a75f2577e94f983b81a7eab2a649f527 (patch)
treef5f53487d1dd3b1e7a4e15a195bb93634869ad2f
parent5283bbe993d9f2ca6deb842012ec85d37e14f362 (diff)
downloadlibnice-4e0e2271a75f2577e94f983b81a7eab2a649f527.tar.gz
libnice-4e0e2271a75f2577e94f983b81a7eab2a649f527.tar.xz
discovery: Remove never used and leaked msn_turn_* fields in CandidateDiscovery
-rw-r--r--agent/discovery.c9
-rw-r--r--agent/discovery.h2
2 files changed, 3 insertions, 8 deletions
diff --git a/agent/discovery.c b/agent/discovery.c
index 6ad4ae5..b76f474 100644
--- a/agent/discovery.c
+++ b/agent/discovery.c
@@ -77,8 +77,7 @@ void discovery_free_item (gpointer data, gpointer user_data)
{
CandidateDiscovery *cand = data;
g_assert (user_data == NULL);
- g_free (cand->msn_turn_username);
- g_free (cand->msn_turn_password);
+
g_slice_free (CandidateDiscovery, cand);
}
@@ -889,10 +888,8 @@ static gboolean priv_discovery_tick_unlocked (gpointer pointer)
if (turn_compat == STUN_USAGE_TURN_COMPATIBILITY_MSN ||
turn_compat == STUN_USAGE_TURN_COMPATIBILITY_OC2007) {
- g_free (cand->msn_turn_username);
- g_free (cand->msn_turn_password);
- cand->msn_turn_username = username;
- cand->msn_turn_password = password;
+ g_free (username);
+ g_free (password);
}
}
diff --git a/agent/discovery.h b/agent/discovery.h
index 973702e..5a12a8c 100644
--- a/agent/discovery.h
+++ b/agent/discovery.h
@@ -57,8 +57,6 @@ typedef struct
Component *component;
TurnServer *turn;
StunAgent stun_agent;
- uint8_t *msn_turn_username;
- uint8_t *msn_turn_password;
StunTimer timer;
uint8_t stun_buffer[STUN_MAX_MESSAGE_SIZE];
StunMessage stun_message;