SDP: Make ast_sdp_state_set_remote_sdp() return error.
authorRichard Mudgett <rmudgett@digium.com>
Mon, 24 Apr 2017 21:55:23 +0000 (16:55 -0500)
committerRichard Mudgett <rmudgett@digium.com>
Fri, 28 Apr 2017 00:08:05 +0000 (19:08 -0500)
Change-Id: I7707c9d872c476d897ff459008652b35142a35e1

include/asterisk/sdp_state.h
main/sdp_state.c

index 1382ed6..88660b6 100644 (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
index 8534501..2c018b1 100644 (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)