Merge branch 'develop' into feature/NatTraversal

.vscode/tasks.json

@@ -8,7 +8,7 @@
             "type": "shell",
             "command": "make",
             "args": [
-                "-j3"
+                "-j3", "ENABLE_DEBUG=1"
             ],
             "group": "build",
             "problemMatcher": []
@@ -19,7 +19,7 @@
             "command": "make",
             "args": [
                 "-j3",
-                "tests"
+                "tests", "ENABLE_DEBUG=1"
             ],
             "group": {
                 "kind": "build",

Config.cpp

@@ -43,7 +43,7 @@ bool CConfig::load()
     std::ifstream file;
     file.open(m_filename, std::ios::in);
     if(!file.is_open()) {
-        CLog::logError("Failed to open configuration file %s", m_filename);
+        CLog::logError("Failed to open configuration file %s", m_filename.c_str());
         return false;
     }
 
@@ -93,28 +93,16 @@ void CConfig::stripComment(std::string& s) const
     free(sdup);// could we use delete sdup here?
 }
 
-TConfigValue * CConfig::readKeyAndValue(const std::string s) const
+TConfigValue * CConfig::readKeyAndValue(const std::string& s) const
 {
     TConfigValue* res = nullptr;
-
-    char * sdup = strdup(boost::trim_copy(s).c_str());
-
-    char * keyPtr = strtok(sdup, "=");
-    std::string key(keyPtr != nullptr ? keyPtr : "");
-
-    boost::trim(key);
-
-    if(!key.empty()) {
-        char * valuePtr = strtok(nullptr, "=");
-        std::string value(valuePtr != nullptr? valuePtr : "");
-
+    auto sCopy = boost::trim_copy(s);
+    auto equalPos = sCopy.find_first_of('=');
+    if(equalPos != std::string::npos) {
         res = new TConfigValue;
-        res->m_key = key;
-        res->m_value = boost::trim_copy(value);
+        res->m_key.assign(sCopy.substr(0, equalPos));
+        res->m_value.assign(sCopy.substr(equalPos + 1));
     }
-
-    free(sdup);// could we use delete sdup here?
-
     return res;
 }
 

Config.h

@@ -106,7 +106,7 @@ public:
 
 private:
     void stripComment(std::string& s) const;
-    TConfigValue * readKeyAndValue(const std::string s) const;
+    TConfigValue * readKeyAndValue(const std::string& s) const;
     TConfigValue * lookupValue(const std::string& section, const std::string& key) const;
 
     std::string m_filename;

Makefile

@@ -21,10 +21,14 @@ export CFG_DIR=/usr/local/etc/
 export DATA_DIR=/usr/local/share/dstargateway.d/
 export LOG_DIR=/var/log/dstargateway/
 
+ifeq ($(ENABLE_DEBUG), 1)
 # choose this if you want debugging help
 export CPPFLAGS=-g -ggdb -W -Wall -Werror -std=c++17
+else
 # or, you can choose this for a much smaller executable without debugging help
-#CPPFLAGS=-W -Wall -Werror -std=c++17
+CPPFLAGS=-W -O3 -Wall -Werror -std=c++17
+endif
+
 export CC=g++
 export LDFLAGS:=-lcurl -pthread
 

README.md

@@ -72,11 +72,11 @@ git checkout develop
 ## 3.4. Prerequisites and dependencies
 Before first time building you need to install dependencies and prerequisites
 ```
-apt install build-essential libcurl4-openssl-dev libboost-dev
+sudo apt install build-essential libcurl4-openssl-dev libboost-dev
 ```
 If you are going to build with gpsd support, also install libgps-dev
 ```
-apt install libgps-dev
+sudo apt install libgps-dev
 ```
 ## 3.5. Building
 Regular building
@@ -117,6 +117,7 @@ the testing framwrok used is Google Test.
 
 # 5. Version History
 ## 5.1. Version 0.5
+- [Bugfix] Failed to download XLX Hosts when URL contains a = sign ([#14](https://github.com/F4FXL/DStarGateway/issues/14))
 - [Bugfix] Remote control connection failed ([#13](https://github.com/F4FXL/DStarGateway/issues/13))
 - [Bugfix] Trying to connect to ghost ircDDB when no ircDDB is configured
 ## 5.2. Version 0.4

Tests/Config/getValue.cpp

@@ -0,0 +1,57 @@
+/*
+ *   Copyright (c) 2021-2022 by Geoffrey Merck F4FXL / KC3FRA
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gtest/gtest.h>
+#include <unistd.h>
+#include <string>
+
+#include "../../Config.h"
+
+namespace ConfigTests
+{
+
+    class Config_getValue : public ::testing::Test
+    {
+    protected:
+        std::string m_configPath;
+
+        void SetUp() override
+        {
+            char buf[2048];
+            auto size = ::readlink("/proc/self/exe", buf, 2048);
+            if(size > 0) {
+                m_configPath.assign(buf, size);
+                auto lastSlashPos = m_configPath.find_last_of('/');
+                m_configPath.resize(lastSlashPos);
+                m_configPath.append("/Config/test.cfg");
+            }
+        }
+    };
+
+    TEST_F(Config_getValue, getURL)
+    {
+        CConfig config(m_configPath);
+
+        bool ret = config.load();
+        std::string value;
+        config.getValue("[XLX]", "hostfileUrl", value, 0U, 2048U, "http://www.f4fxl.org?src=github");
+ 
+        EXPECT_TRUE(ret);
+        EXPECT_STREQ(value.c_str(), "http://xlxapi.rlx.lu/api.php?do=GetXLXDMRMaster");
+    }
+}

Tests/Config/load.cpp

@@ -0,0 +1,61 @@
+/*
+ *   Copyright (c) 2021-2022 by Geoffrey Merck F4FXL / KC3FRA
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <gtest/gtest.h>
+#include <unistd.h>
+#include <string>
+
+#include "../../Config.h"
+
+namespace ConfigTests
+{
+
+    class Config_load : public ::testing::Test
+    {
+    protected:
+        std::string m_configPath;
+
+        void SetUp() override
+        {
+            char buf[2048];
+            auto size = ::readlink("/proc/self/exe", buf, 2048);
+            if(size > 0) {
+                m_configPath.assign(buf, size);
+                auto lastSlashPos = m_configPath.find_last_of('/');
+                m_configPath.resize(lastSlashPos);
+                m_configPath.append("/Config/test.cfg");
+            }
+        }
+    };
+
+    TEST_F(Config_load, fileExist)
+    {
+        CConfig config(m_configPath);
+
+        bool ret = config.load(); 
+        EXPECT_TRUE(ret);
+    }
+
+    TEST_F(Config_load, fileDoesNotExist)
+    {
+        CConfig config("/this/file/does/not/exist/and/if/exists/we/have/a/serious/issue");
+
+        bool ret = config.load(); 
+        EXPECT_FALSE(ret);
+    }
+}

Tests/Config/test.cfg

@@ -0,0 +1,4 @@
+[XLX]
+hostfileUrl=http://xlxapi.rlx.lu/api.php?do=GetXLXDMRMaster
+
+