From 797f9d180e6ca8b2671166407ae62bca12c36205 Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Mon, 19 Nov 2018 17:46:38 +0000 Subject: [PATCH 1/2] Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages --- src/mserv.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/mserv.c b/src/mserv.c index 2bb2923d..a84266c8 100644 --- a/src/mserv.c +++ b/src/mserv.c @@ -557,9 +557,21 @@ const char *GetMODVersion(void) msg.room = MODID; // Might as well use it for something. sprintf(msg.buffer,"%d",MODVERSION); if (MS_Write(&msg) < 0) + { + CONS_Alert(CONS_ERROR, M_GetText("Could not send to the Master Server\n")); + M_StartMessage(M_GetText("Could not send to the Master Server\n"), NULL, MM_NOTHING); + CloseConnection(); return NULL; + } + + if (MS_Read(&msg) < 0) + { + CONS_Alert(CONS_ERROR, M_GetText("No reply from the Master Server\n")); + M_StartMessage(M_GetText("No reply from the Master Server\n"), NULL, MM_NOTHING); + CloseConnection(); + return NULL; + } - MS_Read(&msg); CloseConnection(); if(strcmp(msg.buffer,"NULL") != 0) @@ -587,9 +599,19 @@ void GetMODVersion_Console(void) msg.room = MODID; // Might as well use it for something. sprintf(msg.buffer,"%d",MODVERSION); if (MS_Write(&msg) < 0) + { + CONS_Alert(CONS_ERROR, M_GetText("Could not send to the Master Server\n")); + CloseConnection(); return; + } + + if (MS_Read(&msg) < 0) + { + CONS_Alert(CONS_ERROR, M_GetText("No reply from the Master Server\n")); + CloseConnection(); + return; + } - MS_Read(&msg); CloseConnection(); if(strcmp(msg.buffer,"NULL") != 0) From 418943acdc2f96cdde2446897690c89b582665ff Mon Sep 17 00:00:00 2001 From: Monster Iestyn Date: Mon, 19 Nov 2018 17:47:23 +0000 Subject: [PATCH 2/2] change return type of M_CheckMODVersion to boolean --- src/m_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/m_menu.c b/src/m_menu.c index c9adbfb9..cfcb2458 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -6048,7 +6048,7 @@ void M_SortServerList(void) #ifndef NONET #ifdef UPDATE_ALERT -static int M_CheckMODVersion(void) +static boolean M_CheckMODVersion(void) { char updatestring[500]; const char *updatecheck = GetMODVersion();