get tricle from ice options

Author: Thomas

src/library/webrtc-connection/webrtc_connection.cpp

@@ -16,7 +16,11 @@ namespace nabto {
 
 WebrtcConnectionPtr WebrtcConnection::create(SignalingStreamPtr sigStream, NabtoDevicePtr device, std::vector<struct TurnServer>& turnServers, EventQueuePtr queue, TrackEventCallback trackCb, CheckAccessCallback accessCb, DatachannelEventCallback datachannelCb)
 {
-    return std::make_shared<WebrtcConnection>(sigStream, device, turnServers, queue, trackCb, accessCb, datachannelCb);
+    auto ptr = std::make_shared<WebrtcConnection>(sigStream, device, turnServers, queue, trackCb, accessCb, datachannelCb);
+    if (ptr) {
+        ptr->init();
+    }
+    return ptr;
 }
 
 WebrtcConnection::WebrtcConnection(SignalingStreamPtr sigStream, NabtoDevicePtr device, std::vector<struct TurnServer>& turnServers, EventQueuePtr queue, TrackEventCallback trackCb, CheckAccessCallback accessCb, DatachannelEventCallback datachannelCb)
@@ -32,6 +36,11 @@ WebrtcConnection::~WebrtcConnection()
     }
 }
 
+void WebrtcConnection::init()
+{
+    createPeerConnection();
+}
+
 void WebrtcConnection::stop()
 {
     if (pc_) {
@@ -69,9 +78,14 @@ void WebrtcConnection::handleCandidate(rtc::Candidate cand)
 void WebrtcConnection::handleDescription(rtc::Description desc)
 {
     NPLOGD << "Got Description: " << desc;
-    if (!pc_) {
-        createPeerConnection();
+    auto ice = desc.iceOptions();
+    canTrickle_ = false;
+    for (auto& i : ice) {
+        if (i == "trickle") {
+            canTrickle_ = true;
+        }
     }
+
     try {
         // TODO: remove metadata from v2 but maybe keep for v1
         nlohmann::json metadata;
@@ -84,9 +98,6 @@ void WebrtcConnection::handleDescription(rtc::Description desc)
 
 void WebrtcConnection::handleOfferAnswer(const std::string& data, const nlohmann::json& metadata) {
     NPLOGD << "Got Offer/Answer: " << data;
-     if (!pc_) {
-        createPeerConnection();
-    }
     try {
         nlohmann::json sdp = nlohmann::json::parse(data);
         rtc::Description remDesc(sdp["sdp"].get<std::string>(), sdp["type"].get<std::string>());
@@ -348,9 +359,6 @@ NabtoDeviceConnectionRef WebrtcConnection::getConnectionRef() {
 
 void WebrtcConnection::createTracks(const std::vector<MediaTrackPtr>& tracks)
 {
-    if (!pc_) {
-        createPeerConnection();
-    }
     for (auto t : tracks) {
         auto sdp = t->getSdp();
         rtc::Description::Media media(sdp);

src/library/webrtc-connection/webrtc_connection.hpp

@@ -41,6 +41,7 @@ class WebrtcConnection : public std::enable_shared_from_this<WebrtcConnection>
     WebrtcConnection(SignalingStreamPtr sigStream, NabtoDevicePtr device, std::vector<struct TurnServer>& turnServers, EventQueuePtr queue, TrackEventCallback trackCb, CheckAccessCallback accessCb, DatachannelEventCallback datachannelCb);
     ~WebrtcConnection();
 
+    void init();
 
     // signaling v2
     void handleCandidate(rtc::Candidate cand);

test/signaling-tests/signaling_tests_v2.cpp

@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(recv_metadata, *boost::unit_test::timeout(180))
 BOOST_AUTO_TEST_CASE(answer_an_offer, *boost::unit_test::timeout(180))
 {
     nlohmann::json offerData = {
-        {"sdp", "v=0\r\no=- 4001653510419693843 2 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\na=group:BUNDLE 0\r\na=extmap-allow-mixed\r\na=msid-semantic: WMS\r\nm=application 9 UDP/DTLS/SCTP webrtc-datachannel\r\nc=IN IP4 0.0.0.0\r\na=ice-ufrag:9aLM\r\na=ice-pwd:jtaHrFFgBekhsoOD+0pS3PaI\r\na=ice-options:trickle\r\na=fingerprint:sha-256 28:E0:2D:E0:11:02:A0:1A:39:8C:86:B2:19:11:5D:98:F3:8C:79:8F:56:08:52:E2:30:25:35:C9:67:FE:93:B7\r\na=setup:actpass\r\na=mid:0\r\na=sctp-port:5000\r\na=max-message-size:262144\r\n"},
+        {"sdp", "v=0\r\no=- 4001653510419693843 2 IN IP4 127.0.0.1\r\ns=-\r\nt=0 0\r\na=group:BUNDLE 0\r\na=extmap-allow-mixed\r\na=msid-semantic: WMS\r\nm=application 9 UDP/DTLS/SCTP webrtc-datachannel\r\nc=IN IP4 0.0.0.0\r\na=ice-ufrag:9aLM\r\na=ice-pwd:jtaHrFFgBekhsoOD+0pS3PaI\r\na=ice-options:ice2,trickle\r\na=fingerprint:sha-256 28:E0:2D:E0:11:02:A0:1A:39:8C:86:B2:19:11:5D:98:F3:8C:79:8F:56:08:52:E2:30:25:35:C9:67:FE:93:B7\r\na=setup:actpass\r\na=mid:0\r\na=sctp-port:5000\r\na=max-message-size:262144\r\n"},
         {"type", "offer"}
     };
     auto td = nabto::test::TestDevice::create();