Merge pull request #787 from micmac1/gsm-no-nls-21.02
[feed/telephony.git] / libs / pjproject / patches / 0080-fix-sdp-neg-modify-local-offer.patch
1 --- a/pjmedia/src/pjmedia/sdp_neg.c
2 +++ b/pjmedia/src/pjmedia/sdp_neg.c
3 @@ -304,7 +304,6 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modi
4 {
5 pjmedia_sdp_session *new_offer;
6 pjmedia_sdp_session *old_offer;
7 - char media_used[PJMEDIA_MAX_SDP_MEDIA];
8 unsigned oi; /* old offer media index */
9 pj_status_t status;
10
11 @@ -323,8 +322,19 @@ PJ_DEF(pj_status_t) pjmedia_sdp_neg_modi
12 /* Change state to STATE_LOCAL_OFFER */
13 neg->state = PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER;
14
15 + /* When there is no active local SDP in state PJMEDIA_SDP_NEG_STATE_DONE,
16 + * it means that the previous initial SDP nego must have been failed,
17 + * so we'll just set the local SDP offer here.
18 + */
19 + if (!neg->active_local_sdp) {
20 + neg->initial_sdp_tmp = NULL;
21 + neg->initial_sdp = pjmedia_sdp_session_clone(pool, local);
22 + neg->neg_local_sdp = pjmedia_sdp_session_clone(pool, local);
23 +
24 + return PJ_SUCCESS;
25 + }
26 +
27 /* Init vars */
28 - pj_bzero(media_used, sizeof(media_used));
29 old_offer = neg->active_local_sdp;
30 new_offer = pjmedia_sdp_session_clone(pool, local);
31