Merge pull request #19 from nabto/sc-3871

Use connected/disconnected instead of offline/online

Author: mkm85

examples/libdatachannel/src/common/webrtc_connection/webrtc_connection.cpp

@@ -423,8 +423,8 @@ void WebrtcConnection::handleChannelStateChange(
   std::shared_ptr<rtc::PeerConnection> pc = nullptr;
 
   switch (state) {
-    case nabto::webrtc::SignalingChannelState::OFFLINE:
-      NPLOGD << "Got channel state: OFFLINE";
+    case nabto::webrtc::SignalingChannelState::DISCONNECTED:
+      NPLOGD << "Got channel state: DISCONNECTED";
       // This means we tried to send a signaling message but the client is
       // not connected to the backend. If we expect the client to connect
       // momentarily, we will then get a CLIENT_CONNECTED event and the
@@ -443,8 +443,8 @@ void WebrtcConnection::handleChannelStateChange(
         deinit();
       }
       break;
-    case nabto::webrtc::SignalingChannelState::ONLINE:
-      NPLOGD << "Got channel state ONLINE";
+    case nabto::webrtc::SignalingChannelState::CONNECTED:
+      NPLOGD << "Got channel state CONNECTED";
       // This means client reconnected, the client should do ICE restart
       // if needed so we can just ignore.
       break;

sdk/integration_test/integration_test.cpp

@@ -315,7 +315,7 @@ TEST(connect, client_disconnect_after_connect) {
   ASSERT_TRUE(cliConn != nullptr);
   cliConn->addStateChangeListener(
       [&connEventProm](nabto::webrtc::SignalingChannelState event) {
-        if (event == nabto::webrtc::SignalingChannelState::OFFLINE) {
+        if (event == nabto::webrtc::SignalingChannelState::DISCONNECTED) {
           connEventProm.set_value();
         }
       });

sdk/src/signaling_device/include/nabto/webrtc/device.hpp

@@ -362,16 +362,16 @@ std::string signalingDeviceStateToString(SignalingDeviceState state);
  * Events a Signaling Channel can emit.
  *
  *  - NEW: The channel was just created.
- *  - ONLINE: The SDK received an indication that the client is online.
- *  - OFFLINE: The SDK tried to send a message to the client but the client was
+ *  - CONNECTED: The SDK received an indication that the client is online.
+ *  - DISCONNECTED: The SDK tried to send a message to the client but the client was
  * offline.
  *  - FAILED: The channel received a error, which is fatal in the protocol.
  *  - CLOSED: The channel was closed by the application.
  */
 enum class SignalingChannelState : std::uint8_t {
   NEW,
-  ONLINE,
-  OFFLINE,
+  CONNECTED,
+  DISCONNECTED,
   FAILED,
   CLOSED
 };

sdk/src/signaling_device/src/signaling.cpp

@@ -28,10 +28,10 @@ std::string signalingChannelStateToString(SignalingChannelState state) {
   switch (state) {
     case SignalingChannelState::NEW:
       return "NEW";
-    case SignalingChannelState::ONLINE:
-      return "ONLINE";
-    case SignalingChannelState::OFFLINE:
-      return "OFFLINE";
+    case SignalingChannelState::CONNECTED:
+      return "CONNECTED";
+    case SignalingChannelState::DISCONNECTED:
+      return "DISCONNECTED";
     case SignalingChannelState::FAILED:
       return "FAILED";
     case SignalingChannelState::CLOSED:

sdk/src/signaling_device/src/signaling_channel_impl.cpp

@@ -124,7 +124,7 @@ void SignalingChannelImpl::peerConnected() {
       signaler_->websocketSendMessage(channelId_, message);
     }
   }
-  changeState(SignalingChannelState::ONLINE);
+  changeState(SignalingChannelState::CONNECTED);
 }
 
 void SignalingChannelImpl::peerOffline() {
@@ -133,7 +133,7 @@ void SignalingChannelImpl::peerOffline() {
 
     NABTO_SIGNALING_LOGI << "Peer: " << channelId_ << " went offline";
   }
-  changeState(SignalingChannelState::OFFLINE);
+  changeState(SignalingChannelState::DISCONNECTED);
 }
 
 void SignalingChannelImpl::handleError(const SignalingError& error) {