From f60923c4a908761d8432ec9c1b38743539b3a5a7 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 7 Feb 2019 17:36:07 -0500 Subject: [PATCH 1/3] [discord] rewrite secret, party_id [discord] rewrite secret, party_id [discord] rewrite secret, party_id [discord] rewrite secret, party_id --- Makefile | 2 +- discord/discord.c | 72 +++++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 32e7a6b82b..de4a3216c7 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ endif DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb -CFLAGS += $(DEF_FLAGS) +CFLAGS += $(DEF_FLAGS) -Wformat-truncation CXXFLAGS += $(DEF_FLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS OBJCFLAGS := $(CFLAGS) -D__STDC_CONSTANT_MACROS diff --git a/discord/discord.c b/discord/discord.c index 4500980abd..e9394ae4be 100644 --- a/discord/discord.c +++ b/discord/discord.c @@ -55,6 +55,8 @@ #include #include "../file_path_special.h" +#include + static int64_t start_time = 0; static int64_t pause_time = 0; static int64_t ellapsed_time = 0; @@ -65,12 +67,21 @@ static unsigned discord_status = 0; struct netplay_room *room; -static char user_id[128]; -static char user_name[128]; -static char party_name[128]; -static char client_party_name[128]; -static char user_avatar[PATH_MAX_LENGTH]; +/* The discord API specifies these variables: +- userId --------- char[24] - the userId of the player asking to join +- username ------- char[344] - the username of the player asking to join +- discriminator -- char[8] - the discriminator of the player asking to join +- spectateSecret - char[128] - secret used for spectatin matches +- joinSecret - char[128] - secret used to join matches +- partyId - char[128] - the party you would be joining +*/ +static char user_id[24]; +static char user_name[344]; +static char self_party_id[128]; +static char peer_party_id[128]; + +static char user_avatar[PATH_MAX_LENGTH]; static bool connecting = false; static char cdn_url[] = "https://cdn.discordapp.com/avatars"; @@ -119,6 +130,8 @@ static bool discord_download_avatar( file_transfer_t *transf = NULL; + RARCH_LOG("[Discord] user avatar id: %s\n", user_id); + fill_pathname_application_special(buf, sizeof(buf), APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS); @@ -149,14 +162,11 @@ static bool discord_download_avatar( static void handle_discord_ready(const DiscordUser* connectedUser) { strlcpy(user_name, connectedUser->username, sizeof(user_name)); - strlcpy(party_name, connectedUser->username, sizeof(user_name)); - strlcat(party_name, "|", sizeof(party_name)); - strlcat(party_name, connectedUser->discriminator, sizeof(party_name)); - RARCH_LOG("[Discord] connected to user: %s#%s - avatar id: %s\n", + RARCH_LOG("[Discord] connected to user: %s#%s\n", connectedUser->username, - connectedUser->discriminator, - connectedUser->userId); + connectedUser->discriminator); + #ifdef HAVE_MENU discord_download_avatar(connectedUser->userId, connectedUser->avatar); #endif @@ -175,7 +185,7 @@ static void handle_discord_error(int errcode, const char* message) static void handle_discord_join_cb(retro_task_t *task, void *task_data, void *user_data, const char *err) { struct netplay_room *room; - char tmp_hostname[32]; + char join_hostname[PATH_MAX_LENGTH]; http_transfer_data_t *data = (http_transfer_data_t*)task_data; @@ -194,13 +204,13 @@ static void handle_discord_join_cb(retro_task_t *task, void *task_data, void *us deinit_netplay(); netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL); - snprintf(tmp_hostname, sizeof(tmp_hostname), "%s|%d", + snprintf(join_hostname, sizeof(join_hostname), "%s|%d", room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port); - RARCH_LOG("[Discord] joining lobby at: %s\n", tmp_hostname); + RARCH_LOG("[Discord] joining lobby at: %s\n", join_hostname); task_push_netplay_crc_scan(room->gamecrc, - room->gamename, tmp_hostname, room->corename, room->subsystem_name); + room->gamename, join_hostname, room->corename, room->subsystem_name); connecting = true; discord_update(DISCORD_PRESENCE_NETPLAY_CLIENT); } @@ -224,24 +234,16 @@ finish: static void handle_discord_join(const char* secret) { char url [2048] = "http://lobby.libretro.com/"; - char tmp_hostname[32]; static struct string_list *list = NULL; RARCH_LOG("[Discord] join secret: (%s)\n", secret); list = string_split(secret, "|"); - strlcpy(client_party_name, list->elems[1].data, sizeof(client_party_name)); - strlcat(client_party_name, "|", sizeof(client_party_name)); - strlcat(client_party_name, list->elems[2].data, sizeof(client_party_name)); - - strlcat(url, list->elems[0].data, sizeof(url)); + strlcpy(peer_party_id, list->elems[0].data, sizeof(peer_party_id)); + strlcat(url, peer_party_id, sizeof(url)); strlcat(url, "/", sizeof(url)); - RARCH_LOG("[Discord] querying lobby id: %s at %s\n", list->elems[0].data, url); - - snprintf(tmp_hostname, - sizeof(tmp_hostname), - "%s|%s", list->elems[0].data, list->elems[1].data); + RARCH_LOG("[Discord] querying lobby id: %s at %s\n", peer_party_id, url); task_push_http_transfer(url, true, NULL, handle_discord_join_cb, NULL); } @@ -315,7 +317,7 @@ void discord_update(enum discord_presence presence) if (!connecting && (presence == DISCORD_PRESENCE_NONE || presence == DISCORD_PRESENCE_MENU)) { memset(&discord_presence, 0, sizeof(discord_presence)); - client_party_name[0] = '\0'; + peer_party_id[0] = '\0'; } switch (presence) @@ -378,7 +380,7 @@ void discord_update(enum discord_presence presence) if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL)) { - client_party_name[0] = '\0'; + peer_party_id[0] = '\0'; discord_presence.partyId = NULL; discord_presence.partyMax = 0; discord_presence.partySize = 0; @@ -398,27 +400,29 @@ void discord_update(enum discord_presence presence) { char join_secret[128]; - snprintf(join_secret, sizeof(join_secret), "%d|%s", room->id, party_name); + + snprintf(self_party_id, sizeof(self_party_id), "%d", room->id); + snprintf(join_secret, sizeof(join_secret), "%d|%" PRId64, room->id, cpu_features_get_time_usec()); discord_presence.joinSecret = strdup(join_secret); /* discord_presence.spectateSecret = "SPECSPECSPEC"; */ - discord_presence.partyId = strdup(party_name); + discord_presence.partyId = strdup(self_party_id); discord_presence.partyMax = 2; discord_presence.partySize = 1; RARCH_LOG("[Discord] join secret: %s\n", join_secret); - RARCH_LOG("[Discord] party id: %s\n", party_name); + RARCH_LOG("[Discord] party id: %s\n", self_party_id); } break; case DISCORD_PRESENCE_NETPLAY_CLIENT: - RARCH_LOG("[Discord] party id: %s\n", client_party_name); - discord_presence.partyId = strdup(client_party_name); + RARCH_LOG("[Discord] party id: %s\n", peer_party_id); + discord_presence.partyId = strdup(peer_party_id); break; case DISCORD_PRESENCE_NETPLAY_NETPLAY_STOPPED: { if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) && !netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL)) { - client_party_name[0] = '\0'; + peer_party_id[0] = '\0'; discord_presence.partyId = NULL; discord_presence.partyMax = 0; discord_presence.partySize = 0; From 701ac1dd724f235cc73afe28a63071f951826a33 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 7 Feb 2019 17:49:46 -0500 Subject: [PATCH 2/3] there is no need for these to be so big --- Makefile | 2 +- network/netplay/netplay_discovery.h | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index de4a3216c7..32e7a6b82b 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ endif DEF_FLAGS += -Wall $(INCLUDE_DIRS) -I. -Ideps -Ideps/stb -CFLAGS += $(DEF_FLAGS) -Wformat-truncation +CFLAGS += $(DEF_FLAGS) CXXFLAGS += $(DEF_FLAGS) -std=c++11 -D__STDC_CONSTANT_MACROS OBJCFLAGS := $(CFLAGS) -D__STDC_CONSTANT_MACROS diff --git a/network/netplay/netplay_discovery.h b/network/netplay/netplay_discovery.h index aeedf60a87..15962d7009 100644 --- a/network/netplay/netplay_discovery.h +++ b/network/netplay/netplay_discovery.h @@ -66,15 +66,15 @@ enum netplay_host_method struct netplay_room { int id; - char nickname [PATH_MAX_LENGTH]; - char address [PATH_MAX_LENGTH]; - char mitm_address[PATH_MAX_LENGTH]; + char nickname [2048]; + char address [2048]; + char mitm_address[2048]; int port; int mitm_port; - char corename [PATH_MAX_LENGTH]; - char frontend [PATH_MAX_LENGTH]; - char coreversion [PATH_MAX_LENGTH]; - char gamename [PATH_MAX_LENGTH]; + char corename [2048]; + char frontend [2048]; + char coreversion [2048]; + char gamename [2048]; int gamecrc; int timestamp; int host_method; @@ -82,9 +82,9 @@ struct netplay_room bool has_spectate_password; bool lan; bool fixed; - char retroarch_version[PATH_MAX_LENGTH]; - char subsystem_name[PATH_MAX_LENGTH]; - char country[PATH_MAX_LENGTH]; + char retroarch_version [2048]; + char subsystem_name [2048]; + char country[2048]; struct netplay_room *next; }; From 03107c5b73614472eff2742fd3bd83b5617aa348 Mon Sep 17 00:00:00 2001 From: radius Date: Thu, 7 Feb 2019 17:58:21 -0500 Subject: [PATCH 3/3] [discord] update log messages --- README.md | 2 +- discord/discord.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 77436fbd5c..c9f7b7b4b8 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Latest binaries are currently hosted on the [buildbot](http://buildbot.libretro. ## Support -To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [Discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org. +To reach developers, either make an issue here on GitHub, make a thread on the [forum](http://www.libretro.com/forums/), chat on [discord](https://discord.gg/C4amCeV), or visit our IRC channel: #retroarch @ irc.freenode.org. ## Documentation diff --git a/discord/discord.c b/discord/discord.c index e9394ae4be..88a9651a02 100644 --- a/discord/discord.c +++ b/discord/discord.c @@ -130,7 +130,7 @@ static bool discord_download_avatar( file_transfer_t *transf = NULL; - RARCH_LOG("[Discord] user avatar id: %s\n", user_id); + RARCH_LOG("[discord] user avatar id: %s\n", user_id); fill_pathname_application_special(buf, sizeof(buf), @@ -152,7 +152,7 @@ static bool discord_download_avatar( transf->enum_idx = MENU_ENUM_LABEL_CB_DISCORD_AVATAR; strlcpy(transf->path, buf, sizeof(transf->path)); - RARCH_LOG("[Discord] downloading avatar from: %s\n", url_encoded); + RARCH_LOG("[discord] downloading avatar from: %s\n", url_encoded); task_push_http_transfer(url_encoded, true, NULL, cb_generic_download, transf); return false; @@ -163,7 +163,7 @@ static void handle_discord_ready(const DiscordUser* connectedUser) { strlcpy(user_name, connectedUser->username, sizeof(user_name)); - RARCH_LOG("[Discord] connected to user: %s#%s\n", + RARCH_LOG("[discord] connected to user: %s#%s\n", connectedUser->username, connectedUser->discriminator); @@ -174,12 +174,12 @@ static void handle_discord_ready(const DiscordUser* connectedUser) static void handle_discord_disconnected(int errcode, const char* message) { - RARCH_LOG("[Discord] disconnected (%d: %s)\n", errcode, message); + RARCH_LOG("[discord] disconnected (%d: %s)\n", errcode, message); } static void handle_discord_error(int errcode, const char* message) { - RARCH_LOG("[Discord] error (%d: %s)\n", errcode, message); + RARCH_LOG("[discord] error (%d: %s)\n", errcode, message); } static void handle_discord_join_cb(retro_task_t *task, void *task_data, void *user_data, const char *err) @@ -208,7 +208,7 @@ static void handle_discord_join_cb(retro_task_t *task, void *task_data, void *us room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port); - RARCH_LOG("[Discord] joining lobby at: %s\n", join_hostname); + RARCH_LOG("[discord] joining lobby at: %s\n", join_hostname); task_push_netplay_crc_scan(room->gamecrc, room->gamename, join_hostname, room->corename, room->subsystem_name); connecting = true; @@ -236,20 +236,20 @@ static void handle_discord_join(const char* secret) char url [2048] = "http://lobby.libretro.com/"; static struct string_list *list = NULL; - RARCH_LOG("[Discord] join secret: (%s)\n", secret); + RARCH_LOG("[discord] join secret: (%s)\n", secret); list = string_split(secret, "|"); strlcpy(peer_party_id, list->elems[0].data, sizeof(peer_party_id)); strlcat(url, peer_party_id, sizeof(url)); strlcat(url, "/", sizeof(url)); - RARCH_LOG("[Discord] querying lobby id: %s at %s\n", peer_party_id, url); + RARCH_LOG("[discord] querying lobby id: %s at %s\n", peer_party_id, url); task_push_http_transfer(url, true, NULL, handle_discord_join_cb, NULL); } static void handle_discord_spectate(const char* secret) { - RARCH_LOG("[Discord] spectate (%s)\n", secret); + RARCH_LOG("[discord] spectate (%s)\n", secret); } static void handle_discord_join_response(void *ignore, const char *line) @@ -275,7 +275,7 @@ static void handle_discord_join_request(const DiscordUser* request) menu_input_ctx_line_t line; #endif - RARCH_LOG("[Discord] join request from %s#%s - %s %s\n", + RARCH_LOG("[discord] join request from %s#%s - %s %s\n", request->username, request->discriminator, request->userId, @@ -353,8 +353,8 @@ void discord_update(enum discord_presence presence) if (!label) label = (char *)path_basename(path_get(RARCH_PATH_BASENAME)); #if 0 - RARCH_LOG("[Discord] current core: %s\n", system_id); - RARCH_LOG("[Discord] current content: %s\n", label); + RARCH_LOG("[discord] current core: %s\n", system_id); + RARCH_LOG("[discord] current content: %s\n", label); #endif discord_presence.largeImageKey = system_id; @@ -393,7 +393,7 @@ void discord_update(enum discord_presence presence) if (room->id == 0) return; - RARCH_LOG("[Discord] netplay room details: id=%d, nick=%s IP=%s port=%d\n", + RARCH_LOG("[discord] netplay room details: id=%d, nick=%s IP=%s port=%d\n", room->id, room->nickname, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port); @@ -409,12 +409,12 @@ void discord_update(enum discord_presence presence) discord_presence.partyMax = 2; discord_presence.partySize = 1; - RARCH_LOG("[Discord] join secret: %s\n", join_secret); - RARCH_LOG("[Discord] party id: %s\n", self_party_id); + RARCH_LOG("[discord] join secret: %s\n", join_secret); + RARCH_LOG("[discord] party id: %s\n", self_party_id); } break; case DISCORD_PRESENCE_NETPLAY_CLIENT: - RARCH_LOG("[Discord] party id: %s\n", peer_party_id); + RARCH_LOG("[discord] party id: %s\n", peer_party_id); discord_presence.partyId = strdup(peer_party_id); break; case DISCORD_PRESENCE_NETPLAY_NETPLAY_STOPPED: @@ -439,7 +439,7 @@ void discord_update(enum discord_presence presence) break; } - RARCH_LOG("[Discord] updating (%d)\n", presence); + RARCH_LOG("[discord] updating (%d)\n", presence); Discord_UpdatePresence(&discord_presence); discord_status = presence; @@ -452,7 +452,7 @@ void discord_init(void) DiscordEventHandlers handlers; - RARCH_LOG("[Discord] initializing ..\n"); + RARCH_LOG("[discord] initializing ..\n"); start_time = time(0); memset(&handlers, 0, sizeof(handlers)); @@ -471,14 +471,14 @@ void discord_init(void) snprintf(command, sizeof(command), "sh -c %s", get_retroarch_launch_arguments()); #endif - RARCH_LOG("[Discord] registering startup command: %s\n", command); + RARCH_LOG("[discord] registering startup command: %s\n", command); Discord_Register(settings->arrays.discord_app_id, command); discord_ready = true; } void discord_shutdown(void) { - RARCH_LOG("[Discord] shutting down ..\n"); + RARCH_LOG("[discord] shutting down ..\n"); Discord_ClearPresence(); Discord_Shutdown(); discord_ready = false;