diff --git a/src/single_window/render.h b/src/single_window/render.h index cad085b..5eda06a 100644 --- a/src/single_window/render.h +++ b/src/single_window/render.h @@ -58,10 +58,11 @@ class Render { static void OnSignalStatusCb(SignalStatus status, void *user_data); - static void OnConnectionStatusCb(ConnectionStatus status, void *user_data); + static void OnConnectionStatusCb(ConnectionStatus status, const char *user_id, + size_t user_id_size, void *user_data); - static void NetStatusReport(int client_id, TraversalMode mode, - const unsigned short send, + static void NetStatusReport(const char *client_id, size_t client_id_size, + TraversalMode mode, const unsigned short send, const unsigned short receive, void *user_data); static SDL_HitTestResult HitTestCallback(SDL_Window *window, diff --git a/src/single_window/render_callback_func.cpp b/src/single_window/render_callback_func.cpp index 3480234..a15d212 100644 --- a/src/single_window/render_callback_func.cpp +++ b/src/single_window/render_callback_func.cpp @@ -240,7 +240,8 @@ void Render::OnSignalStatusCb(SignalStatus status, void *user_data) { } } -void Render::OnConnectionStatusCb(ConnectionStatus status, void *user_data) { +void Render::OnConnectionStatusCb(ConnectionStatus status, const char *user_id, + const size_t user_id_size, void *user_data) { Render *render = (Render *)user_data; if (!render) { return; @@ -309,20 +310,18 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, void *user_data) { } } -void Render::NetStatusReport(int client_id, TraversalMode mode, - const unsigned short send, +void Render::NetStatusReport(const char *client_id, size_t client_id_size, + TraversalMode mode, const unsigned short send, const unsigned short receive, void *user_data) { Render *render = (Render *)user_data; if (!render) { return; } - if (client_id != 0 && 0 == strcmp(render->client_id_, "")) { - std::string client_id_s = std::to_string(client_id); + if (0 == strcmp(render->client_id_, "")) { memset(&render->client_id_, 0, sizeof(render->client_id_)); - strncpy(render->client_id_, client_id_s.c_str(), - sizeof(render->client_id_)); - LOG_INFO("Use client id [{}] and save id into cache file", client_id_s); + strncpy(render->client_id_, client_id, client_id_size); + LOG_INFO("Use client id [{}] and save id into cache file", client_id); render->SaveSettingsIntoCacheFile(); } if (mode != TraversalMode::UnknownMode) { diff --git a/thirdparty/projectx b/thirdparty/projectx index 35d4f52..9d2e6f0 160000 --- a/thirdparty/projectx +++ b/thirdparty/projectx @@ -1 +1 @@ -Subproject commit 35d4f522c57a26222a82d5b42a76f5c99dbd3ad3 +Subproject commit 9d2e6f0c2a3fe20d0a70d0faee778fbb5f5325a2