feat: allow specifying initial ice mode

Exposes the new parameter introduced in paullouisageneau/libjuice#294

Please see that PR for rationale.

Author: achingbrain

include/rtc/peerconnection.hpp

@@ -38,6 +38,7 @@ struct RTC_CPP_EXPORT DataChannelInit {
 struct RTC_CPP_EXPORT LocalDescriptionInit {
     optional<string> iceUfrag;
     optional<string> icePwd;
+    optional<string> iceMode;
 };
 
 class RTC_CPP_EXPORT PeerConnection final : CheshireCat<impl::PeerConnection> {

src/impl/icetransport.cpp

@@ -140,8 +140,16 @@ IceTransport::IceTransport(const Configuration &config, candidate_callback candi
 			addIceServer(server);
 }
 
-void IceTransport::setIceAttributes(string uFrag, string pwd) {
-	if (juice_set_local_ice_attributes(mAgent.get(), uFrag.c_str(), pwd.c_str()) < 0) {
+void IceTransport::setIceAttributes(string uFrag, string pwd, string iceMode) {
+	juice_ice_mode_t mode = JUICE_ICE_MODE_UNKNOWN;
+
+	if (iceMode.compare("controlling") == 0) {
+		mode = JUICE_ICE_MODE_CONTROLLING;
+	} else if (iceMode.compare("controlled") == 0) {
+		mode = JUICE_ICE_MODE_CONTROLLED;
+	}
+
+	if (juice_set_local_ice_attributes(mAgent.get(), uFrag.c_str(), pwd.c_str(), mode) < 0) {
 		throw std::invalid_argument("Invalid ICE attributes");
 	}
 }
@@ -584,7 +592,7 @@ IceTransport::IceTransport(const Configuration &config, candidate_callback candi
 	                       RecvCallback, this);
 }
 
-void IceTransport::setIceAttributes([[maybe_unused]] string uFrag, [[maybe_unused]] string pwd) {
+void IceTransport::setIceAttributes([[maybe_unused]] string uFrag, [[maybe_unused]] string pwd, [[maybe_unused]] string iceMode) {
 	PLOG_WARNING << "Setting custom ICE attributes is not supported with libnice, please use libjuice";
 }
 

src/impl/icetransport.hpp

@@ -51,7 +51,7 @@ class IceTransport : public Transport {
 	void setRemoteDescription(const Description &description);
 	bool addRemoteCandidate(const Candidate &candidate);
 	void gatherLocalCandidates(string mid, std::vector<IceServer> additionalIceServers = {});
-	void setIceAttributes(string uFrag, string pwd);
+	void setIceAttributes(string uFrag, string pwd, string iceMode);
 
 	optional<string> getLocalAddress() const;
 	optional<string> getRemoteAddress() const;

src/peerconnection.cpp

@@ -140,8 +140,10 @@ void PeerConnection::setLocalDescription(Description::Type type, LocalDescriptio
 		return; // closed
 
 	if (init.iceUfrag && init.icePwd) {
-		PLOG_DEBUG << "Setting custom ICE attributes, ufrag=\"" << *init.iceUfrag << "\", pwd=\"" << *init.icePwd << "\"";
-		iceTransport->setIceAttributes(*init.iceUfrag, *init.icePwd);
+		string iceMode = (init.iceMode ? init.iceMode : "auto").value();
+
+		PLOG_DEBUG << "Setting custom ICE attributes, ufrag=\"" << *init.iceUfrag << "\", pwd=\"" << *init.icePwd << "\", iceMode=\"" << iceMode << "\"";
+		iceTransport->setIceAttributes(*init.iceUfrag, *init.icePwd, iceMode);
 	}
 
 	Description local = iceTransport->getLocalDescription(type);