Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 886134 - Change Datachannel m-line from SCTP/DTLS to DTLS/SCTP - target FF24 r=jesup

Browse Source
This commit is contained in:
Ethan Hugg 2013-07-02 15:08:59 -07:00
parent b4e5d925e1
commit e40a3c820b
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
media/webrtc/signaling/src/sipcc/core/gsm/gsm_sdp_crypto.c
View File

@ -995,8 +995,8 @@ gsmsdp_negotiate_offer_crypto (fsmdef_dcb_t *dcb_p, cc_sdp_t *cc_sdp_p,
negotiated_transport = SDP_TRANSPORT_RTPSAVPF;
break;
case SDP_TRANSPORT_SCTPDTLS:
negotiated_transport = SDP_TRANSPORT_SCTPDTLS;
case SDP_TRANSPORT_DTLSSCTP:
negotiated_transport = SDP_TRANSPORT_DTLSSCTP;
break;
default:
@ -1076,8 +1076,8 @@ gsmsdp_negotiate_answer_crypto (fsmdef_dcb_t *dcb_p, cc_sdp_t *cc_sdp_p,
negotiated_transport = SDP_TRANSPORT_RTPSAVPF;
break;
case SDP_TRANSPORT_SCTPDTLS:
negotiated_transport = SDP_TRANSPORT_SCTPDTLS;
case SDP_TRANSPORT_DTLSSCTP:
negotiated_transport = SDP_TRANSPORT_DTLSSCTP;
break;
default:
@ -1315,7 +1315,7 @@ gsmsdp_init_sdp_media_transport (fsmdef_dcb_t *dcb_p, void *sdp_p,
config_get_value(CFGID_SDPMODE, &sdpmode, sizeof(sdpmode));
if (SDP_MEDIA_APPLICATION == media->type) {
media->transport = SDP_TRANSPORT_SCTPDTLS;
media->transport = SDP_TRANSPORT_DTLSSCTP;
} else if (rtpsavpf) {
media->transport = SDP_TRANSPORT_RTPSAVPF;
} else if (sdpmode) {

2
media/webrtc/signaling/src/sipcc/core/sdp/sdp.h
View File

@ -179,7 +179,7 @@ typedef enum {
SDP_TRANSPORT_RTPSAVP,
SDP_TRANSPORT_TCP,
SDP_TRANSPORT_RTPSAVPF,
SDP_TRANSPORT_SCTPDTLS,
SDP_TRANSPORT_DTLSSCTP,
SDP_MAX_TRANSPORT_TYPES,
SDP_TRANSPORT_UNSUPPORTED,
SDP_TRANSPORT_INVALID

2
media/webrtc/signaling/src/sipcc/core/sdp/sdp_main.c
View File

@ -229,7 +229,7 @@ const sdp_namearray_t sdp_transport[SDP_MAX_TRANSPORT_TYPES] =
{"RTP/SAVP", sizeof("RTP/SAVP")},
{"tcp", sizeof("tcp")},
{"RTP/SAVPF", sizeof("RTP/SAVPF")},
{"SCTP/DTLS", sizeof("SCTP/DTLS")}
{"DTLS/SCTP", sizeof("DTLS/SCTP")}
};
/* Note: These *must* be in the same order as the enum type. */

24
media/webrtc/signaling/src/sipcc/core/sdp/sdp_token.c
View File

@ -1196,14 +1196,14 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, u16 level, const char *ptr)
}
}
/* TODO(ehugg): This block is for forward
compatibility with FF24. Should be in FF23 only.
See Bug 886134 */
#define DATACHANNEL_NEW_TRANSPORT "DTLS/SCTP"
/* TODO(ehugg): Remove this next block when backward
compatibility with versions earlier than FF24
is no longer required. See Bug 886134 */
#define DATACHANNEL_OLD_TRANSPORT "SCTP/DTLS"
if (mca_p->transport == SDP_TRANSPORT_UNSUPPORTED) {
if (cpr_strncasecmp(tmp, DATACHANNEL_NEW_TRANSPORT,
strlen(DATACHANNEL_NEW_TRANSPORT)) == 0) {
mca_p->transport = SDP_TRANSPORT_SCTPDTLS;
if (cpr_strncasecmp(tmp, DATACHANNEL_OLD_TRANSPORT,
strlen(DATACHANNEL_OLD_TRANSPORT)) == 0) {
mca_p->transport = SDP_TRANSPORT_DTLSSCTP;
}
}
@ -1231,7 +1231,7 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, u16 level, const char *ptr)
(mca_p->transport == SDP_TRANSPORT_UDPTL) ||
(mca_p->transport == SDP_TRANSPORT_UDPSPRT) ||
(mca_p->transport == SDP_TRANSPORT_LOCAL) ||
(mca_p->transport == SDP_TRANSPORT_SCTPDTLS)) {
(mca_p->transport == SDP_TRANSPORT_DTLSSCTP)) {
/* Port format is simply <port>. Make sure that either
* the choose param is allowed or that the choose value
* wasn't specified.
@ -1383,8 +1383,8 @@ sdp_result_e sdp_parse_media (sdp_t *sdp_p, u16 level, const char *ptr)
sdp_parse_payload_types(sdp_p, mca_p, ptr);
}
/* Parse SCTP/DTLS port */
if (mca_p->transport == SDP_TRANSPORT_SCTPDTLS) {
/* Parse DTLS/SCTP port */
if (mca_p->transport == SDP_TRANSPORT_DTLSSCTP) {
ptr = sdp_getnextstrtok(ptr, port, sizeof(port), " \t", &result);
if (result != SDP_SUCCESS) {
sdp_parse_error(sdp_p->peerconnection,
@ -1565,7 +1565,7 @@ sdp_result_e sdp_build_media (sdp_t *sdp_p, u16 level, flex_string *fs)
flex_string_sprintf(fs, "%s",
sdp_get_transport_name(mca_p->transport));
if(mca_p->transport != SDP_TRANSPORT_SCTPDTLS) {
if(mca_p->transport != SDP_TRANSPORT_DTLSSCTP) {
/* Build the format lists */
for (i=0; i < mca_p->num_payloads; i++) {
@ -1577,7 +1577,7 @@ sdp_result_e sdp_build_media (sdp_t *sdp_p, u16 level, flex_string *fs)
}
}
} else {
/* Add port to SDP if transport is SCTP/DTLS */
/* Add port to SDP if transport is DTLS/SCTP */
flex_string_sprintf(fs, " %u ", (u32)mca_p->sctpport);
}

2
media/webrtc/signaling/test/signaling_unittests.cpp
View File

@ -2273,7 +2273,7 @@ TEST_F(SignalingTest, missingUfrag)
"a=candidate:0 2 UDP 2113601790 192.168.178.20 50769 typ host\r\n"
"a=candidate:1 2 UDP 1694236670 77.9.79.167 50769 typ srflx raddr "
"192.168.178.20 rport 50769\r\n"
"m=application 54054 SCTP/DTLS 5000 \r\n"
"m=application 54054 DTLS/SCTP 5000 \r\n"
"c=IN IP4 77.9.79.167\r\n"
"a=fmtp:HuRUu]Dtcl\\zM,7(OmEU%O$gU]x/z\tD protocol=webrtc-datachannel;"
"streams=16\r\n"