From 2cfb04f90b8cbc0444837e3c77255fa3ae8a7c43 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 1 Mar 2020 11:39:27 -0800 Subject: [PATCH] masterserver_debug to set CURLOPT_VERBOSE --- src/hms123311.c | 7 +++++++ src/mserv.c | 1 + src/mserv.h | 1 + 3 files changed, 9 insertions(+) diff --git a/src/hms123311.c b/src/hms123311.c index d9d4fa2f8..f0eaca270 100644 --- a/src/hms123311.c +++ b/src/hms123311.c @@ -32,6 +32,11 @@ consvar_t cv_masterserver_token = { NULL, NULL, 0, NULL, NULL, 0, 0, NULL/* C90 moment */ }; +consvar_t cv_masterserver_debug = { + "masterserver_debug", "Off", CV_SAVE, CV_OnOff, + NULL, 0, NULL, NULL, 0, 0, NULL/* C90 moment */ +}; + static int hms_started; static char hms_server_token[sizeof "xxx.xxx.xxx.xxx/xxxxx"]; @@ -97,6 +102,8 @@ HMS_connect (const char *format, ...) buffer->buffer = malloc(buffer->end); buffer->needle = 0; + if (cv_masterserver_debug.value) + curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L); curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4); curl_easy_setopt(curl, CURLOPT_URL, url); curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L); diff --git a/src/mserv.c b/src/mserv.c index c493ed4dc..80389ffb2 100644 --- a/src/mserv.c +++ b/src/mserv.c @@ -233,6 +233,7 @@ void AddMServCommands(void) CV_RegisterVar(&cv_masterserver); CV_RegisterVar(&cv_http_masterserver); CV_RegisterVar(&cv_masterserver_token); + CV_RegisterVar(&cv_masterserver_debug); CV_RegisterVar(&cv_servername); COM_AddCommand("listserv", Command_Listserv_f); #endif diff --git a/src/mserv.h b/src/mserv.h index 7c042d42a..187a963a8 100644 --- a/src/mserv.h +++ b/src/mserv.h @@ -66,6 +66,7 @@ typedef struct extern consvar_t cv_masterserver, cv_servername; extern consvar_t cv_http_masterserver; extern consvar_t cv_masterserver_token; +extern consvar_t cv_masterserver_debug; // < 0 to not connect (usually -1) (offline mode) // == 0 to show all rooms, not a valid hosting room