sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "SDP: Make ast_sdp_state_set_remote_sdp() return error."

This commit is contained in:
Jenkins2 2017-05-01 17:01:20 -05:00 committed by Gerrit Code Review
parent b67423c8a3 d71c6e3bfd
commit 9af53d3563
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/asterisk/sdp_state.h
View File

@ -146,9 +146,12 @@ const void *ast_sdp_state_get_local_sdp_impl(struct ast_sdp_state *sdp_state);
* \param sdp_state
* \param sdp
*
* \retval 0 Success
* \retval non-0 Failure
*
* \since 15
*/
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);
/*!
* \brief Set the remote SDP from an Implementation

9
main/sdp_state.c
View File

@ -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)