Reland: Implement true negotiation for DatagramTransport with fallback to RTP.
In short, the caller places a x-opaque line in SDP for each m= section that
uses datagram transport. If the answerer supports datagram transport, it will
parse this line and create a datagram transport. It will then echo the x-opaque
line into the answer (to indicate that it accepted use of datagram transport).
If the offer and answer contain exactly the same x-opaque line, both peers will
use datagram transport. If the x-opaque line is omitted from the answer (or is
different in the answer) they will fall back to RTP.
Note that a different x-opaque line in the answer means the answerer did not
understand something in the negotiation proto. Since WebRTC cannot know what
was misunderstood, or whether it's still possible to use the datagram transport,
it must fall back to RTP. This may change in the future, possibly by passing
the answer to the datagram transport, but it's good enough for now.
Negotiation consists of four parts:
1. DatagramTransport exposes transport parameters for both client and server
perspectives. The client just echoes what it received from the server (modulo
any fields it might not have understood).
2. SDP adds a x-opaque line for opaque transport parameters. Identical to
x-mt, but this is specific to datagram transport and goes in each m= section,
and appears in the answer as well as the offer.
- This is propagated to Jsep as part of the TransportDescription.
- SDP files: transport_description.h,cc, transport_description_factory.h,cc,
media_session.cc, webrtc_sdp.cc
3. JsepTransport/Controller:
- Exposes opaque parameters for each mid (m= section). On offerer, this means
pre-allocating a datagram transport and getting its parameters. On the
answerer, this means echoing the offerer's parameters.
- Uses a composite RTP transport to receive from either default RTP or
datagram transport until both offer and answer arrive.
- If a provisional answer arrives, sets the composite to send on the
provisionally selected transport.
- Once both offer and answer are set, deletes the unneeded transports and
keeps whichever transport is selected.
4. PeerConnection pulls transport parameters out of Jsep and adds them to SDP.
Bug: webrtc:9719
Change-Id: Ifcc428c8d76fb77dcc8abaa79507c620bcfb31b9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140920
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Bjorn Mellem <mellem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28198}
diff --git a/pc/webrtc_sdp.cc b/pc/webrtc_sdp.cc
index 83bd378..5784def 100644
--- a/pc/webrtc_sdp.cc
+++ b/pc/webrtc_sdp.cc
@@ -249,6 +249,9 @@
// |MediaTransportInterface::GetTransportParametersOffer|.
static const char kMediaTransportSettingLine[] = "x-mt";
+// This is a non-standardized setting for plugin transports.
+static const char kOpaqueTransportParametersLine[] = "x-opaque";
+
// RTP payload type is in the 0-127 range. Use -1 to indicate "all" payload
// types.
const int kWildcardPayloadType = -1;
@@ -548,6 +551,17 @@
AddLine(os.str(), message);
}
+// Adds an x-otp SDP attribute line based on opaque transport parameters.
+static void AddOpaqueTransportLine(
+ const cricket::OpaqueTransportParameters params,
+ std::string* message) {
+ rtc::StringBuilder os;
+ InitAttrLine(kOpaqueTransportParametersLine, &os);
+ os << kSdpDelimiterColon << params.protocol << kSdpDelimiterColon
+ << rtc::Base64::Encode(params.parameters);
+ AddLine(os.str(), message);
+}
+
// Writes a SDP attribute line based on |attribute| and |value| to |message|.
static void AddAttributeLine(const std::string& attribute,
int value,
@@ -1536,6 +1550,11 @@
AddLine(os.str(), message);
}
}
+
+ if (transport_info->description.opaque_parameters) {
+ AddOpaqueTransportLine(*transport_info->description.opaque_parameters,
+ message);
+ }
}
// RFC 3388
@@ -2115,6 +2134,26 @@
return true;
}
+bool ParseOpaqueTransportLine(const std::string& line,
+ std::string* protocol,
+ std::string* transport_parameters,
+ SdpParseError* error) {
+ std::string value;
+ if (!GetValue(line, kOpaqueTransportParametersLine, &value, error)) {
+ return false;
+ }
+ std::string tmp_parameters;
+ if (!rtc::tokenize_first(value, kSdpDelimiterColonChar, protocol,
+ &tmp_parameters)) {
+ return ParseFailedGetValue(line, kOpaqueTransportParametersLine, error);
+ }
+ if (!rtc::Base64::Decode(tmp_parameters, rtc::Base64::DO_STRICT,
+ transport_parameters, nullptr)) {
+ return ParseFailedGetValue(line, kOpaqueTransportParametersLine, error);
+ }
+ return true;
+}
+
bool ParseSessionDescription(const std::string& message,
size_t* pos,
std::string* session_id,
@@ -3137,6 +3176,13 @@
if (!ParseIceOptions(line, &transport->transport_options, error)) {
return false;
}
+ } else if (HasAttribute(line, kOpaqueTransportParametersLine)) {
+ transport->opaque_parameters = cricket::OpaqueTransportParameters();
+ if (!ParseOpaqueTransportLine(
+ line, &transport->opaque_parameters->protocol,
+ &transport->opaque_parameters->parameters, error)) {
+ return false;
+ }
} else if (HasAttribute(line, kAttributeFmtp)) {
if (!ParseFmtpAttributes(line, media_type, media_desc, error)) {
return false;