diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-05-01 17:01:20 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-05-01 17:01:20 -0500 |
| commit | 9af53d3563047f9849cdaf3883a6b00340242236 (patch) | |
| tree | 90362c7a5cde6620fef5cde171387b89a5367966 /main/sdp_state.c | |
| parent | b67423c8a317f870a91a85a7af92e3d799c32ad8 (diff) | |
| parent | d71c6e3bfd0db7b069da326c155766b679de552f (diff) | |
Merge "SDP: Make ast_sdp_state_set_remote_sdp() return error."
Diffstat (limited to 'main/sdp_state.c')
| -rw-r--r-- | main/sdp_state.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/main/sdp_state.c b/main/sdp_state.c index b058d7f9b..c00175a11 100644 --- a/main/sdp_state.c +++ b/main/sdp_state.c @@ -1073,7 +1073,7 @@ const void *ast_sdp_state_get_local_sdp_impl(struct ast_sdp_state *sdp_state) return ast_sdp_translator_from_sdp(sdp_state->translator, sdp); } -void ast_sdp_state_set_remote_sdp(struct ast_sdp_state *sdp_state, const struct ast_sdp *sdp) +int ast_sdp_state_set_remote_sdp(struct ast_sdp_state *sdp_state, const struct ast_sdp *sdp) { ast_assert(sdp_state != NULL); @@ -1081,12 +1081,13 @@ void ast_sdp_state_set_remote_sdp(struct ast_sdp_state *sdp_state, const struct sdp_state->role = SDP_ROLE_ANSWERER; } - merge_sdps(sdp_state, sdp); + return merge_sdps(sdp_state, sdp); } int ast_sdp_state_set_remote_sdp_from_impl(struct ast_sdp_state *sdp_state, void *remote) { struct ast_sdp *sdp; + int ret; ast_assert(sdp_state != NULL); @@ -1094,9 +1095,9 @@ int ast_sdp_state_set_remote_sdp_from_impl(struct ast_sdp_state *sdp_state, void if (!sdp) { return -1; } - ast_sdp_state_set_remote_sdp(sdp_state, sdp); + ret = ast_sdp_state_set_remote_sdp(sdp_state, sdp); ast_sdp_free(sdp); - return 0; + return ret; } int ast_sdp_state_reset(struct ast_sdp_state *sdp_state) |