Browse Source

TT#14008 always add a=mid to media section

closes #1361

Change-Id: I8c3dfb54f47f0cfeb913f27b240eed55e2ca8154
(cherry picked from commit a4e3f96b3f)
mr8.5.6
Richard Fuchs 4 years ago
parent
commit
41b4db7bda
2 changed files with 34 additions and 3 deletions
  1. +3
    -3
      daemon/sdp.c
  2. +31
    -0
      t/auto-daemon-tests.pl

+ 3
- 3
daemon/sdp.c View File

@ -2382,15 +2382,15 @@ int sdp_replace(struct sdp_chopper *chop, GQueue *sessions, struct call_monologu
copy_up_to_end_of(chop, &sdp_media->s);
if (!sdp_media->port_num || !ps->selected_sfd)
goto next;
if (call_media->media_id.s) {
chopper_append_c(chop, "a=mid:");
chopper_append_str(chop, &call_media->media_id);
chopper_append_c(chop, "\r\n");
}
if (!sdp_media->port_num || !ps->selected_sfd)
goto next;
if (proto_is_rtp(call_media->protocol))
insert_codec_parameters(chop, call_media);


+ 31
- 0
t/auto-daemon-tests.pl View File

@ -38,6 +38,37 @@ my ($sock_a, $sock_b, $sock_c, $sock_d, $port_a, $port_b, $ssrc, $resp,
# DTLS early start with ICE (GH 1035 TT 84804)
new_call;
offer('a=mid on zero streams', { ICE => 'remove' }, <<SDP);
v=0
o=- 1545997027 1 IN IP4 198.51.100.1
s=tester
t=0 0
m=audio 2000 RTP/AVP 0
c=IN IP4 198.51.100.14
a=sendrecv
a=mid:0
m=audio 0 RTP/AVP 0
c=IN IP4 198.51.100.14
a=sendrecv
a=mid:1
----------------------------------
v=0
o=- 1545997027 1 IN IP4 198.51.100.1
s=tester
t=0 0
m=audio PORT RTP/AVP 0
c=IN IP4 203.0.113.1
a=mid:0
a=rtpmap:0 PCMU/8000
a=sendrecv
a=rtcp:PORT
m=audio PORT RTP/AVP 0
c=IN IP4 203.0.113.1
a=mid:1
SDP
($sock_a, $sock_b, $sock_c, $sock_d) = new_call([qw(198.51.100.4 2000)], [qw(198.51.100.4 2001)], [qw(198.51.100.8 3000)], [qw(198.51.100.8 3001)]);
offer('ICE offer with DTLS', {


Loading…
Cancel
Save