fix: failed to connet with sfu

Author: TzuHuanTai

src/args.h

@@ -104,7 +104,7 @@ struct Args {
 
     // ipc
     std::string ipc_channel = "none";
-    int ipc_channel_mode = 0;
+    int ipc_channel_mode = -1;
     std::string socket_path = "/tmp/pi-webrtc-ipc.sock";
 
     // webrtc

src/parser.cpp

@@ -16,7 +16,7 @@ static const std::unordered_map<std::string, int> v4l2_fmt_table = {
 };
 
 static const std::unordered_map<std::string, int> ipc_mode_table = {
-    {"none", 0},
+    {"none", -1},
     {"lossy", ChannelMode::Lossy},
     {"reliable", ChannelMode::Reliable},
 };

src/rtc/conductor.cpp

@@ -137,14 +137,15 @@ rtc::scoped_refptr<RtcPeer> Conductor::CreatePeerConnection(PeerConfig config) {
 
     peer->SetPeer(result.MoveValue());
 
-    if (config.is_sfu_peer && !config.is_publisher) {
-        return peer;
-    }
-
-    if (config.is_sfu_peer || args.ipc_channel_mode == ChannelMode::Lossy) {
+    if (config.is_sfu_peer) {
+        if (!config.is_publisher) {
+            return peer;
+        }
+        peer->CreateDataChannel(ChannelMode::Lossy);
+        peer->CreateDataChannel(ChannelMode::Reliable);
+    } else if (args.ipc_channel_mode == ChannelMode::Lossy) {
         SetupIpcDataChannel(peer, ChannelMode::Lossy);
-    }
-    if (config.is_sfu_peer || args.ipc_channel_mode == ChannelMode::Reliable) {
+    } else if (args.ipc_channel_mode == ChannelMode::Reliable) {
         SetupIpcDataChannel(peer, ChannelMode::Reliable);
     }
 

src/rtc/data_channel_subject.cpp

@@ -26,9 +26,6 @@ void DataChannelSubject::OnStateChange() {
     webrtc::DataChannelInterface::DataState state = data_channel_->state();
     DEBUG_PRINT("[%s] OnStateChange => %s", data_channel_->label().c_str(),
                 webrtc::DataChannelInterface::DataStateString(state));
-    if (state == webrtc::DataChannelInterface::DataState::kClosed) {
-        on_closed_func_(label());
-    }
 }
 
 void DataChannelSubject::Terminate() {

src/rtc/rtc_peer.cpp

@@ -73,14 +73,15 @@ rtc::scoped_refptr<webrtc::PeerConnectionInterface> RtcPeer::GetPeer() { return
 std::shared_ptr<DataChannelSubject> RtcPeer::CreateDataChannel(ChannelMode mode) {
     struct webrtc::DataChannelInit init;
     init.ordered = true;
-    init.negotiated = true;
     init.id = static_cast<int>(mode);
-    auto label = id_ + ChannelModeToString(mode);
-
+    if (!config_.is_sfu_peer) {
+        init.negotiated = true;
+    }
     if (mode == ChannelMode::Lossy) {
         init.maxRetransmits = 0;
     }
 
+    auto label = ChannelModeToString(mode);
     auto result = peer_connection_->CreateDataChannelOrError(label, &init);
 
     if (!result.ok()) {

src/rtc/rtc_peer.h

@@ -21,7 +21,7 @@ enum ChannelMode {
 static inline std::string ChannelModeToString(ChannelMode id) {
     switch (id) {
         case Command:
-            return "cmd_channel";
+            return "command";
         case Lossy:
             return "_lossy";
         case Reliable: