From 5a690ebbb6e6682ea2d16b0436abd0513ab5a59e Mon Sep 17 00:00:00 2001
From: dijunkun <junkun.di@hotmail.com>
Date: Fri, 7 Jun 2024 16:27:05 +0800
Subject: [PATCH] Do not use 'S-' or 'C-' as the prefix for the user id of a
 peer

---
 src/main_window/main_window.cpp               | 37 +++----------------
 src/main_window/main_window.h                 |  2 +-
 src/main_window/main_window_callback_func.cpp |  2 +-
 thirdparty/projectx                           |  2 +-
 4 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/src/main_window/main_window.cpp b/src/main_window/main_window.cpp
index 84740c2..af63b85 100644
--- a/src/main_window/main_window.cpp
+++ b/src/main_window/main_window.cpp
@@ -185,7 +185,7 @@ int MainWindow::CreateConnectionPeer() {
   peer_ = CreatePeer(&params_);
   if (peer_) {
     LOG_INFO("Create peer instance successful");
-    std::string user_id = "S-" + mac_addr_str_;
+    std::string user_id = mac_addr_str_;
     Init(peer_, user_id.c_str());
     LOG_INFO("Peer init finish");
   } else {
@@ -291,34 +291,7 @@ int MainWindow::Run() {
   // Our state
   ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
 
-  mac_addr_str_ = GetMac();
-
-  params_.use_cfg_file = false;
-  params_.signal_server_ip = "150.158.81.30";
-  params_.signal_server_port = 9099;
-  params_.stun_server_ip = "150.158.81.30";
-  params_.stun_server_port = 3478;
-  params_.turn_server_ip = "150.158.81.30";
-  params_.turn_server_port = 3478;
-  params_.turn_server_username = "dijunkun";
-  params_.turn_server_password = "dijunkunpw";
-  params_.hardware_acceleration = config_center_.IsHardwareVideoCodec();
-  params_.av1_encoding = config_center_.GetVideoEncodeFormat() ==
-                                 ConfigCenter::VIDEO_ENCODE_FORMAT::AV1
-                             ? true
-                             : false;
-  params_.on_receive_video_buffer = OnReceiveVideoBufferCb;
-  params_.on_receive_audio_buffer = OnReceiveAudioBufferCb;
-  params_.on_receive_data_buffer = OnReceiveDataBufferCb;
-  params_.on_signal_status = OnSignalStatusCb;
-  params_.on_connection_status = OnConnectionStatusCb;
-  params_.user_data = this;
-
-  peer_ = CreatePeer(&params_);
-  LOG_INFO("Create peer");
-  std::string user_id = "S-" + mac_addr_str_;
-  Init(peer_, user_id.c_str());
-  LOG_INFO("Peer init finish");
+  CreateConnectionPeer();
 
   {
     nv12_buffer_ = new char[NV12_BUFFER_SIZE];
@@ -499,7 +472,7 @@ int MainWindow::Run() {
                   !connection_established_) {
                 ret = JoinConnection(peer_, remote_id_, client_password_);
                 if (0 == ret) {
-                  is_client_ = true;
+                  is_client_mode_ = true;
                 }
 
               } else if (connect_button_label_ ==
@@ -512,7 +485,7 @@ int MainWindow::Run() {
                 is_create_connection_ = false;
                 connection_established_ = false;
                 received_frame_ = false;
-                is_client_ = false;
+                is_client_mode_ = false;
               }
 
               if (0 == ret) {
@@ -844,7 +817,7 @@ int MainWindow::Run() {
   // Cleanup
   if (is_create_connection_) {
     LeaveConnection(peer_);
-    is_client_ = false;
+    is_client_mode_ = false;
   }
 
   if (peer_) {
diff --git a/src/main_window/main_window.h b/src/main_window/main_window.h
index 3ddb217..ddd8d7d 100644
--- a/src/main_window/main_window.h
+++ b/src/main_window/main_window.h
@@ -98,7 +98,7 @@ class MainWindow {
   char input_password_[7] = "";
   char remote_id_[20] = "";
   char client_password_[20] = "";
-  bool is_client_ = false;
+  bool is_client_mode_ = false;
 
  private:
   int screen_width_ = 1280;
diff --git a/src/main_window/main_window_callback_func.cpp b/src/main_window/main_window_callback_func.cpp
index 497d6bd..c81db8d 100644
--- a/src/main_window/main_window_callback_func.cpp
+++ b/src/main_window/main_window_callback_func.cpp
@@ -154,7 +154,7 @@ void MainWindow::OnConnectionStatusCb(ConnectionStatus status,
   } else if (ConnectionStatus::Connected == status) {
     main_window->connection_status_str_ = "Connected";
     main_window->connection_established_ = true;
-    if (!main_window->is_client_) {
+    if (main_window->is_client_mode_) {
       main_window->start_screen_capture_ = true;
       main_window->start_mouse_control_ = true;
     }
diff --git a/thirdparty/projectx b/thirdparty/projectx
index caba777..eee3b2a 160000
--- a/thirdparty/projectx
+++ b/thirdparty/projectx
@@ -1 +1 @@
-Subproject commit caba77765d1d79ed4087cc55b30aade6cb95bee0
+Subproject commit eee3b2a95e1c26ce3214adc2c633405abe9d918e