github/openNDS
1
1
Fork 0
mirror of https://github.com/openNDS/openNDS.git synced 2026-05-04 03:01:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Shorten MHD version check

Browse Source 
Signed-off-by: Rob White <rob@blue-wave.net>
This commit is contained in:
Rob White
2020-02-10 23:21:53 +00:00
parent 15ba5ea4c8
commit beb316166a
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.c
View File

@@ -247,6 +247,7 @@ main_loop(void)
int major = 0;
int minor = 0;
int patch = 0;
int outdated = 0;
const char *version = MHD_get_version();
debug(LOG_NOTICE, "MHD version is %s", version);
@@ -254,24 +255,16 @@ main_loop(void)
if (sscanf(version, "%d.%d.%d", &major, &minor, &patch) == 3) {
if (major < MIN_MHD_MAJOR) {
debug(LOG_ERR, "libmicrohttpd is out of date, please upgrade to version %d.%d.%d or higher",
MIN_MHD_MAJOR, MIN_MHD_MINOR, MIN_MHD_PATCH);
if (config->use_outdated_mhd == 0) {
debug(LOG_ERR, "exiting...");
exit(1);
}
outdated = 1;
} else if (minor < MIN_MHD_MINOR) {
debug(LOG_ERR, "libmicrohttpd is out of date, please upgrade to version %d.%d.%d or higher",
MIN_MHD_MAJOR, MIN_MHD_MINOR, MIN_MHD_PATCH);
if (config->use_outdated_mhd == 0) {
debug(LOG_ERR, "exiting...");
exit(1);
}
outdated = 1;
} else if (patch < MIN_MHD_PATCH) {
outdated = 1;
}
if (outdated == 1) {
debug(LOG_ERR, "libmicrohttpd is out of date, please upgrade to version %d.%d.%d or higher",
MIN_MHD_MAJOR, MIN_MHD_MINOR, MIN_MHD_PATCH);
@@ -282,15 +275,14 @@ main_loop(void)
}
}
// Encode gatewayname
htmlentityencode(http_encoded, sizeof(http_encoded), config->gw_name, strlen(config->gw_name));
config->http_encoded_gw_name = http_encoded;
/* Set the time when nodogsplash started */
sysuptime = get_system_uptime ();
debug(LOG_INFO, "main: System Uptime is %li seconds", sysuptime);
/* Set the time when nodogsplash started */
if (!started_time) {
debug(LOG_INFO, "Setting started_time");
started_time = time(NULL);