mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-11-17 06:48:33 +00:00
Thu Apr 3 11:09:19 EDT 2008 Pekka.Pessi@nokia.com
* soa_static.c: when generating offer with ordered mode, fill gaps in session If session has m= lines that user SDP does not, the ordered mode got confused when generating 2nd offer (e.g., for re-INVITE). git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8018 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
1 parent
ad8ed1be64
commit
e9e9acd16c
3 files changed
+40
-34
No files matched your search
@@ -805,34 +805,37 @@ int soa_sdp_upgrade(soa_session_t *ss,
|
||||
soa_sdp_media_upgrade_rtpmaps(ss, m, rm);
|
||||
}
|
||||
}
|
||||
else if (sss->sss_ordered_user) {
|
||||
/* Update session with unused media in u_media */
|
||||
else {
|
||||
|
||||
if (!sss->sss_reuse_rejected) {
|
||||
/* Mark previously used slots */
|
||||
for (i = 0; i < Ns; i++) {
|
||||
if (s_media[i])
|
||||
continue;
|
||||
s_media[i] = soa_sdp_make_rejected_media(home, o_media[i], session, 0);
|
||||
}
|
||||
}
|
||||
if (sss->sss_ordered_user) {
|
||||
/* Update session with unused media in u_media */
|
||||
|
||||
for (j = 0; j < Nu; j++) {
|
||||
if (u_media[j] == SDP_MEDIA_NONE)
|
||||
continue;
|
||||
|
||||
for (i = 0; i < size - 1; i++) {
|
||||
if (s_media[i] == NULL) {
|
||||
s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE;
|
||||
u2s[j] = i, s2u[i] = j;
|
||||
break;
|
||||
if (!sss->sss_reuse_rejected) {
|
||||
/* Mark previously used slots */
|
||||
for (i = 0; i < Ns; i++) {
|
||||
if (s_media[i])
|
||||
continue;
|
||||
s_media[i] =
|
||||
soa_sdp_make_rejected_media(home, o_media[i], session, 0);
|
||||
}
|
||||
}
|
||||
|
||||
assert(i != size - 1);
|
||||
for (j = 0; j < Nu; j++) {
|
||||
if (u_media[j] == SDP_MEDIA_NONE)
|
||||
continue;
|
||||
|
||||
for (i = 0; i < size - 1; i++) {
|
||||
if (s_media[i] == NULL) {
|
||||
s_media[i] = u_media[j], u_media[j] = SDP_MEDIA_NONE;
|
||||
u2s[j] = i, s2u[i] = j;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
assert(i != size - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
/* Match unused user media by media types with the existing session */
|
||||
for (i = 0; i < Ns; i++) {
|
||||
if (s_media[i])
|
||||
|
||||
Reference in new issue
Block a user