From c2906dfa05ad6f2d3b952d21d09178e724180e95 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 28 Apr 2017 11:53:37 -0500
Subject: [PATCH] SDP: Remove sdp_state.remote_capabilities
The sdp_state.remote_capabilities was only used inside merge_sdps() and
subsequent calls to merge_sdps() by re-INVITE's would leak them.
Change-Id: I0ceb7838ea044cc913e8ad4a255c39c9740ae0ce
---
main/sdp_state.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/main/sdp_state.c b/main/sdp_state.c
index 0da93e4aca..a9979eb7d9 100644
--- a/main/sdp_state.c
+++ b/main/sdp_state.c
@@ -340,9 +340,7 @@ struct ast_sdp_state {
struct sdp_state_capabilities *negotiated_capabilities;
/*! Proposed capabilities */
struct sdp_state_capabilities *proposed_capabilities;
- /*! Remote capabilities, learned through remote SDP */
- struct ast_stream_topology *remote_capabilities;
- /*! Local SDP. Generated via the options and local capabilities. */
+ /*! Local SDP. Generated via the options and currently negotiated/proposed capabilities. */
struct ast_sdp *local_sdp;
/*! SDP options. Configured options beyond media capabilities. */
struct ast_sdp_options *options;
@@ -389,7 +387,6 @@ void ast_sdp_state_free(struct ast_sdp_state *sdp_state)
sdp_state_capabilities_free(sdp_state->negotiated_capabilities);
sdp_state_capabilities_free(sdp_state->proposed_capabilities);
- ast_stream_topology_free(sdp_state->remote_capabilities);
ast_sdp_free(sdp_state->local_sdp);
ast_sdp_options_free(sdp_state->options);
ast_sdp_translator_free(sdp_state->translator);
@@ -1007,15 +1004,17 @@ static struct ast_sdp *sdp_create_from_state(const struct ast_sdp_state *sdp_sta
static int merge_sdps(struct ast_sdp_state *sdp_state, const struct ast_sdp *remote_sdp)
{
struct sdp_state_capabilities *joint_capabilities;
+ struct ast_stream_topology *remote_capabilities;
int i;
- sdp_state->remote_capabilities = ast_get_topology_from_sdp(remote_sdp);
- if (!sdp_state->remote_capabilities) {
+ remote_capabilities = ast_get_topology_from_sdp(remote_sdp);
+ if (!remote_capabilities) {
return -1;
}
joint_capabilities = merge_capabilities(sdp_state->proposed_capabilities,
- sdp_state->remote_capabilities, sdp_state->options, 0);
+ remote_capabilities, sdp_state->options, 0);
+ ast_stream_topology_free(remote_capabilities);
if (!joint_capabilities) {
return -1;
}
@@ -1114,9 +1113,6 @@ int ast_sdp_state_reset(struct ast_sdp_state *sdp_state)
ast_sdp_free(sdp_state->local_sdp);
sdp_state->local_sdp = NULL;
- ast_stream_topology_free(sdp_state->remote_capabilities);
- sdp_state->remote_capabilities = NULL;
-
set_proposed_capabilities(sdp_state, NULL);
sdp_state->role = SDP_ROLE_NOT_SET;
--
GitLab