diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-08-17 10:03:53 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-08-17 10:03:53 +0000 |
| commit | 241e7a9e37cdf313a2e33cc1c97a4fe66baa79b1 (patch) | |
| tree | b9616c94d860dd1ac96157bbfe7d550fef57ed14 /pjmedia/src | |
| parent | 2a3ccd6bdbb28bd8cc0abc972bf3182073277d6a (diff) | |
Re #1320: Fixed SDP negotiator in generating connection info for SDP media answer when the media is deactivated (was always adding connection line for the media, even if SDP session already has one).
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3708 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
| -rw-r--r-- | pjmedia/src/pjmedia/sdp_neg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia/sdp_neg.c b/pjmedia/src/pjmedia/sdp_neg.c index dbba836d..e9e822f1 100644 --- a/pjmedia/src/pjmedia/sdp_neg.c +++ b/pjmedia/src/pjmedia/sdp_neg.c @@ -1125,6 +1125,7 @@ static pj_status_t match_offer(pj_pool_t *pool, pj_bool_t prefer_remote_codec_order, const pjmedia_sdp_media *offer, const pjmedia_sdp_media *preanswer, + const pjmedia_sdp_session *preanswer_sdp, pjmedia_sdp_media **p_answer) { unsigned i; @@ -1142,7 +1143,8 @@ static pj_status_t match_offer(pj_pool_t *pool, /* If offer has zero port, just clone the offer */ if (offer->desc.port == 0) { - answer = sdp_media_clone_deactivate(pool, offer, preanswer, NULL); + answer = sdp_media_clone_deactivate(pool, offer, preanswer, + preanswer_sdp); *p_answer = answer; return PJ_SUCCESS; } @@ -1437,7 +1439,7 @@ static pj_status_t create_answer( pj_pool_t *pool, { /* See if it has matching codec. */ status = match_offer(pool, prefer_remote_codec_order, - om, im, &am); + om, im, initial, &am); if (status == PJ_SUCCESS) { /* Mark media as used. */ media_used[j] = 1; |