From 32c2471e0498db0bf0b56be8592adf4af6ca1660 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 7 Dec 2017 22:42:24 +0100 Subject: [PATCH 1/2] Check if version is of format vX.YYY or vXX.YYY to decide whether on a deployed version or not Signed-off-by: DL6ER --- args.c | 5 ++++- log.c | 3 ++- request.c | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/args.c b/args.c index bee1ce0b8..cdd9dd134 100644 --- a/args.c +++ b/args.c @@ -70,7 +70,10 @@ void parse_args(int argc, char* argv[]) if(strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "version") == 0) { - if(strcmp(GIT_BRANCH, "master") == 0) + char version[] = GIT_BRANCH; + // Check if version is of format vX.YYY or vXX.YYY + // '.' can never be part of a commit hash + if(version[2] == '.' || version[3] == '.') printf("%s\n",GIT_VERSION); else printf("vDev-%s\n",GIT_HASH); diff --git a/log.c b/log.c index 7c3b3c4b8..5b5f1d1e3 100644 --- a/log.c +++ b/log.c @@ -144,7 +144,8 @@ void log_counter_info(void) void log_FTL_version(void) { logg("FTL branch: %s", GIT_BRANCH); - logg("FTL hash: %s", GIT_VERSION); + logg("FTL version: %s", GIT_VERSION); + logg("FTL tag: %s", GIT_TAG); logg("FTL date: %s", GIT_DATE); logg("FTL user: %s", username); } diff --git a/request.c b/request.c index caab79f5e..48604c31b 100644 --- a/request.c +++ b/request.c @@ -1038,7 +1038,8 @@ void getVersion(int *sock) { char server_message[SOCKETBUFFERLEN]; - if(strcmp(GIT_BRANCH, "master") == 0) + char version[] = GIT_BRANCH; + if(version[2] == '.' || version[3] == '.') sprintf(server_message,"version %s\ntag %s\nbranch %s\ndate %s\n", GIT_VERSION, GIT_TAG, GIT_BRANCH, GIT_DATE); else sprintf(server_message,"version vDev-%s\ntag %s\nbranch %s\ndate %s\n", GIT_HASH, GIT_TAG, GIT_BRANCH, GIT_DATE); From c9d990f4035d682e7f9d68eb4e0ca33b45971878 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 8 Dec 2017 17:18:09 +0100 Subject: [PATCH 2/2] Use a better detection for '.' in the version string / commit hash Signed-off-by: DL6ER --- args.c | 6 +++--- request.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/args.c b/args.c index cdd9dd134..0ab9f0813 100644 --- a/args.c +++ b/args.c @@ -70,10 +70,10 @@ void parse_args(int argc, char* argv[]) if(strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "version") == 0) { - char version[] = GIT_BRANCH; - // Check if version is of format vX.YYY or vXX.YYY + char version[] = GIT_VERSION; + // Check if version is of format vX.YY // '.' can never be part of a commit hash - if(version[2] == '.' || version[3] == '.') + if(strstr(version, ".") != NULL) printf("%s\n",GIT_VERSION); else printf("vDev-%s\n",GIT_HASH); diff --git a/request.c b/request.c index 48604c31b..196a413a6 100644 --- a/request.c +++ b/request.c @@ -1038,8 +1038,8 @@ void getVersion(int *sock) { char server_message[SOCKETBUFFERLEN]; - char version[] = GIT_BRANCH; - if(version[2] == '.' || version[3] == '.') + char version[] = GIT_VERSION; + if(strstr(version, ".") != NULL) sprintf(server_message,"version %s\ntag %s\nbranch %s\ndate %s\n", GIT_VERSION, GIT_TAG, GIT_BRANCH, GIT_DATE); else sprintf(server_message,"version vDev-%s\ntag %s\nbranch %s\ndate %s\n", GIT_HASH, GIT_TAG, GIT_BRANCH, GIT_DATE);