From: Jeroen van der Heijden Date: Thu, 3 Dec 2020 10:34:35 +0000 (+0100) Subject: Update alpha version X-Git-Tag: archive/raspbian/2.0.44-1+rpi1~1^2~3^2^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0447d829851630a3bffcb5a00d2f48c59d15f753;p=siridb-server.git Update alpha version --- diff --git a/include/siri/version.h b/include/siri/version.h index 0294a646..15a908e9 100644 --- a/include/siri/version.h +++ b/include/siri/version.h @@ -15,7 +15,7 @@ * Note that debian alpha packages should use versions like this: * 2.0.34-0alpha0 */ -#define SIRIDB_VERSION_PRE_RELEASE "-alpha-0" +#define SIRIDB_VERSION_PRE_RELEASE "-alpha-1" #ifndef NDEBUG #define SIRIDB_VERSION_BUILD_RELEASE "+debug" diff --git a/itest/testing/server.py b/itest/testing/server.py index ad4b9dac..63ebae54 100644 --- a/itest/testing/server.py +++ b/itest/testing/server.py @@ -31,7 +31,7 @@ class Server: MEM_CHECK = False BUILDTYPE = 'Release' SERVER_ADDRESS = '%HOSTNAME' - IP_SUPPORT = 'ALL' + IP_SUPPORT = 'ALL' # ALL, IPV4ONLY TERMINAL = None # one of [ 'XTERM', 'XFCE4_TERMINAL', None ] BIND_CLIENT_ADDRESS = "::" BIND_SERVER_ADDRESS = "::" diff --git a/src/siri/api.c b/src/siri/api.c index 724ab503..21bfdb68 100644 --- a/src/siri/api.c +++ b/src/siri/api.c @@ -837,9 +837,11 @@ int siri_api_init(void) if (port == 0) return 0; - if (siri.cfg->ip_support == IP_SUPPORT_IPV4ONLY) { + if (siri.cfg->ip_support == IP_SUPPORT_IPV4ONLY) + { (void) uv_ip4_addr("0.0.0.0", (int) port, (struct sockaddr_in *) &addr); - } else { + } else + { (void) uv_ip6_addr("::", (int) port, (struct sockaddr_in6 *) &addr); } diff --git a/src/siri/health.c b/src/siri/health.c index 1e9957ab..c6ca284c 100644 --- a/src/siri/health.c +++ b/src/siri/health.c @@ -312,9 +312,11 @@ int siri_health_init(void) struct sockaddr_storage addr = {0}; uint16_t port = siri.cfg->http_status_port; - if (siri.cfg->ip_support == IP_SUPPORT_IPV4ONLY) { + if (siri.cfg->ip_support == IP_SUPPORT_IPV4ONLY) + { (void) uv_ip4_addr("0.0.0.0", (int) port, (struct sockaddr_in *) &addr); - } else { + } else + { (void) uv_ip6_addr("::", (int) port, (struct sockaddr_in6 *) &addr); }