mii/libdatachannel
1
0
Fork 0
mirror of https://github.com/mii443/libdatachannel.git synced 2025-08-23 15:48:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle local description rollback

Browse Source
This commit is contained in:
Paul-Louis Ageneau
2020-11-01 13:47:21 +01:00
parent 72016a7d26
commit 9f12c19a02
4 changed files with 73 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/rtc/description.hpp
View File

@ -46,8 +46,8 @@ public:
string typeString() const;
Role role() const;
string bundleMid() const;
string iceUfrag() const;
string icePwd() const;
std::optional<string> iceUfrag() const;
std::optional<string> icePwd() const;
std::optional<string> fingerprint() const;
bool ended() const;
@ -206,7 +206,7 @@ private:
Role mRole;
string mUsername;
string mSessionId;
string mIceUfrag, mIcePwd;
std::optional<string> mIceUfrag, mIcePwd;
std::optional<string> mFingerprint;
// Entries

1
include/rtc/peerconnection.hpp
View File

@ -166,6 +166,7 @@ private:
const std::unique_ptr<Processor> mProcessor;
std::optional<Description> mLocalDescription, mRemoteDescription;
std::optional<Description> mCurrentLocalDescription;
mutable std::mutex mLocalDescriptionMutex, mRemoteDescriptionMutex;
std::shared_ptr<IceTransport> mIceTransport;

25
src/description.cpp
View File

@ -130,12 +130,6 @@ Description::Description(const string &sdp, Type type, Role role)
}
}
if (mIceUfrag.empty())
throw std::invalid_argument("Missing ice-ufrag parameter in SDP description");
if (mIcePwd.empty())
throw std::invalid_argument("Missing ice-pwd parameter in SDP description");
if (mUsername.empty())
mUsername = "rtc";
@ -158,9 +152,9 @@ string Description::bundleMid() const {
return !mEntries.empty() ? mEntries[0]->mid() : "0";
}
string Description::iceUfrag() const { return mIceUfrag; }
std::optional<string> Description::iceUfrag() const { return mIceUfrag; }
string Description::icePwd() const { return mIcePwd; }
std::optional<string> Description::icePwd() const { return mIcePwd; }
std::optional<string> Description::fingerprint() const { return mFingerprint; }
@ -222,12 +216,13 @@ string Description::generateSdp(string_view eol) const {
// Session-level attributes
sdp << "a=msid-semantic:WMS *" << eol;
sdp << "a=setup:" << mRole << eol;
sdp << "a=ice-ufrag:" << mIceUfrag << eol;
sdp << "a=ice-pwd:" << mIcePwd << eol;
if (mIceUfrag)
sdp << "a=ice-ufrag:" << *mIceUfrag << eol;
if (mIcePwd)
sdp << "a=ice-pwd:" << *mIcePwd << eol;
if (!mEnded)
sdp << "a=ice-options:trickle" << eol;
if (mFingerprint)
sdp << "a=fingerprint:sha-256 " << *mFingerprint << eol;
@ -281,12 +276,13 @@ string Description::generateApplicationSdp(string_view eol) const {
// Session-level attributes
sdp << "a=msid-semantic:WMS *" << eol;
sdp << "a=setup:" << mRole << eol;
sdp << "a=ice-ufrag:" << mIceUfrag << eol;
sdp << "a=ice-pwd:" << mIcePwd << eol;
if (mIceUfrag)
sdp << "a=ice-ufrag:" << *mIceUfrag << eol;
if (mIcePwd)
sdp << "a=ice-pwd:" << *mIcePwd << eol;
if (!mEnded)
sdp << "a=ice-options:trickle" << eol;
if (mFingerprint)
sdp << "a=fingerprint:sha-256 " << *mFingerprint << eol;
@ -820,4 +816,3 @@ std::ostream &operator<<(std::ostream &out, rtc::Description::Role role) {
}
return out << str;
}

65
src/peerconnection.cpp
View File

@ -103,7 +103,23 @@ bool PeerConnection::hasMedia() const {
}
void PeerConnection::setLocalDescription(Description::Type type) {
PLOG_VERBOSE << "Setting local description";
PLOG_VERBOSE << "Setting local description, type=" << Description::typeToString(type);
SignalingState signalingState = mSignalingState.load();
if (type == Description::Type::Rollback) {
if (signalingState == SignalingState::HaveLocalOffer ||
signalingState == SignalingState::HaveLocalPranswer) {
PLOG_VERBOSE << "Rolling back pending local description";
if (mCurrentLocalDescription)
mLocalDescription.emplace(std::move(*mCurrentLocalDescription));
else
mLocalDescription.reset();
mCurrentLocalDescription.reset();
changeSignalingState(SignalingState::Stable);
}
return;
}
if (!mNegociationNeeded.exchange(false)) {
PLOG_DEBUG << "No negociation needed";
@ -119,7 +135,6 @@ void PeerConnection::setLocalDescription(Description::Type type) {
}
// Get the new signaling state
SignalingState signalingState = mSignalingState.load();
SignalingState newSignalingState;
switch (signalingState) {
case SignalingState::Stable:
@ -143,12 +158,13 @@ void PeerConnection::setLocalDescription(Description::Type type) {
newSignalingState = SignalingState::Stable;
break;
default:
default: {
std::ostringstream oss;
oss << "Unexpected local description in signaling state " << signalingState << ", ignoring";
LOG_WARNING << oss.str();
return;
}
}
auto iceTransport = std::atomic_load(&mIceTransport);
if (!iceTransport) {
@ -170,6 +186,13 @@ void PeerConnection::setLocalDescription(Description::Type type) {
void PeerConnection::setRemoteDescription(Description description) {
PLOG_VERBOSE << "Setting remote description: " << string(description);
if (description.type() == Description::Type::Rollback) {
// This is mostly useless because we accept any offer
PLOG_VERBOSE << "Rolling back pending remote description";
changeSignalingState(SignalingState::Stable);
return;
}
validateRemoteDescription(description);
// Get the new signaling state
@ -188,6 +211,24 @@ void PeerConnection::setRemoteDescription(Description description) {
break;
case SignalingState::HaveLocalOffer:
description.hintType(Description::Type::Answer);
if (description.type() == Description::Type::Offer) {
// The ICE agent will automatically initiate a rollback when a peer that had previously
// created an offer receives an offer from the remote peer
setLocalDescription(Description::Type::Rollback);
newSignalingState = SignalingState::HaveRemoteOffer;
break;
}
if (description.type() != Description::Type::Answer &&
description.type() != Description::Type::Pranswer) {
std::ostringstream oss;
oss << "Unexpected remote " << description.type() << " description in signaling state "
<< signalingState;
throw std::logic_error(oss.str());
}
newSignalingState = SignalingState::Stable;
break;
case SignalingState::HaveRemotePranswer:
description.hintType(Description::Type::Answer);
if (description.type() != Description::Type::Answer &&
@ -200,11 +241,12 @@ void PeerConnection::setRemoteDescription(Description description) {
newSignalingState = SignalingState::Stable;
break;
default:
default: {
std::ostringstream oss;
oss << "Unexpected remote description in signaling state " << signalingState;
throw std::logic_error(oss.str());
}
}
// Candidates will be added at the end, extract them for now
auto remoteCandidates = description.extractCandidates();
@ -766,6 +808,12 @@ void PeerConnection::openTracks() {
}
void PeerConnection::validateRemoteDescription(const Description &description) {
if (!description.iceUfrag())
throw std::invalid_argument("Remote description has no ICE user fragment");
if (!description.icePwd())
throw std::invalid_argument("Remote description has no ICE password");
if (!description.fingerprint())
throw std::invalid_argument("Remote description has no fingerprint");
@ -784,8 +832,9 @@ void PeerConnection::validateRemoteDescription(const Description &description) {
if (activeMediaCount == 0)
throw std::invalid_argument("Remote description has no active media");
if (auto local = localDescription())
if (description.iceUfrag() == local->iceUfrag() && description.icePwd() == local->icePwd())
if (auto local = localDescription(); local && local->iceUfrag() && local->icePwd())
if (*description.iceUfrag() == *local->iceUfrag() &&
*description.icePwd() == *local->icePwd())
throw std::logic_error("Got the local description as remote description");
PLOG_VERBOSE << "Remote description looks valid";
@ -882,8 +931,10 @@ void PeerConnection::processLocalDescription(Description description) {
std::lock_guard lock(mLocalDescriptionMutex);
std::vector<Candidate> existingCandidates;
if (mLocalDescription)
if (mLocalDescription) {
existingCandidates = mLocalDescription->extractCandidates();
mCurrentLocalDescription.emplace(std::move(*mLocalDescription));
}
mLocalDescription.emplace(std::move(description));
for (const auto &candidate : existingCandidates)