Compare commits
89 Commits
GUI
...
conansuppo
Author | SHA1 | Date | |
---|---|---|---|
366cc46ecf | |||
87c9b932ff | |||
e01697f7ad | |||
7f9d039f94 | |||
38e38fb878 | |||
d12817feae | |||
5f65ca528f | |||
9d91779f15 | |||
0679c0a5fe | |||
916bdb7358 | |||
b5aa78a59f | |||
d364bc2ed8 | |||
1f2dabfa82 | |||
e4861adbc2 | |||
17a3722d7a | |||
2b00bc61cf | |||
0d5c7a61b4 | |||
eb66222304 | |||
3e8b00f23e | |||
826006dcba | |||
3f4de8ec42 | |||
220275a617 | |||
deb54c4f3a | |||
154b71f50f | |||
bda51e6b24 | |||
789e4c9458 | |||
c904c0701c | |||
be8299e294 | |||
e9e63e1c27 | |||
9bfddef920 | |||
3d29ab4b17 | |||
d4d9b13b20 | |||
20bd14ad95 | |||
3e5ffff839 | |||
37ba7dce21 | |||
05f3600613 | |||
2e3e4986f6 | |||
346875312b | |||
ed08771107 | |||
ad11f040f2 | |||
a81c69f833 | |||
9de1729c52 | |||
726009a379 | |||
d7fb231705 | |||
9a628d60f6 | |||
40110b13ca | |||
b3da9b64fa | |||
fd14c07fe8 | |||
819803835c | |||
a140f74119 | |||
17c5a38a0c | |||
d6564f5647 | |||
1254466e66 | |||
fda91c380f | |||
2cbbc7fe92 | |||
f64ebed804 | |||
36a945eb1d | |||
4a040d6a85 | |||
41a8e8e7e1 | |||
e7cc041bc4 | |||
095eb5c0cd | |||
a231e6c852 | |||
8d688716eb | |||
4b19ecf3c3 | |||
85ba334c21 | |||
2762605ca4 | |||
81de98bf6c | |||
3f75484f77 | |||
f4069d02bf | |||
ce4a3a830e | |||
af4a9c8350 | |||
86fd995923 | |||
12ff16dc8e | |||
ea648d5946 | |||
8c0c888472 | |||
fed6d251be | |||
ca47949a38 | |||
8199fc2c1e | |||
998f3ea5e8 | |||
d8c3d4ffb8 | |||
ede1afcce3 | |||
1239ae015a | |||
5271a25cbc | |||
fb65ef98fa | |||
da53941cba | |||
4344e7c118 | |||
a356bca964 | |||
268aa3a1ad | |||
3be8203111 |
@ -1,49 +1,43 @@
|
||||
image: luki42/dynuiprefresher_build:latest
|
||||
include: '/Docker/Windows_Conan/.gitlab-ci.yml'
|
||||
|
||||
image: conanio/gcc10
|
||||
|
||||
stages:
|
||||
- cmake
|
||||
- docker
|
||||
- build
|
||||
- build_package
|
||||
- test
|
||||
- packageing
|
||||
|
||||
cache:
|
||||
paths:
|
||||
- build/
|
||||
- src/
|
||||
- inc/
|
||||
- tests/
|
||||
- postinst
|
||||
- .conan/
|
||||
|
||||
cmake:
|
||||
stage: cmake
|
||||
script:
|
||||
- cmake -S . -B build
|
||||
|
||||
build:
|
||||
conan_linux:
|
||||
stage: build
|
||||
before_script:
|
||||
- conan profile new default --detect --force # Generates default profile detecting GCC and sets old ABI
|
||||
- conan profile update settings.compiler.libcxx=libstdc++11 default # Sets libcxx to C++11 ABI
|
||||
- mkdir -p build # create build folder
|
||||
- CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing -g cmake -if build
|
||||
script:
|
||||
- cmake -S . -B build -D WinBuild=OFF #cmake project
|
||||
- cd build
|
||||
- make
|
||||
- make -j4 #build
|
||||
artifacts:
|
||||
paths:
|
||||
- "build/bin/*"
|
||||
- build/bin/
|
||||
expire_in: 1 days
|
||||
|
||||
|
||||
build_package:
|
||||
stage: build_package
|
||||
conan_windows:
|
||||
stage: build
|
||||
image: luki42/dynuiprefresher_build:conanbuild
|
||||
before_script:
|
||||
- mkdir -p build # create build folder
|
||||
- CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing -g cmake -if build --profile mingw64.profile
|
||||
script:
|
||||
- cmake -S . -B build -D WinBuild=ON #cmake project
|
||||
- cd build
|
||||
- make package
|
||||
- make -j4 #build
|
||||
artifacts:
|
||||
paths:
|
||||
- "build/packages/*"
|
||||
|
||||
test:
|
||||
stage: test
|
||||
script:
|
||||
- cd build
|
||||
- make test
|
||||
- make build-xml
|
||||
artifacts:
|
||||
reports:
|
||||
junit: build/report.xml
|
||||
- build/bin/
|
||||
expire_in: 1 days
|
322
CMakeLists.txt
322
CMakeLists.txt
@ -9,22 +9,22 @@
|
||||
# for test build gtest needs to be installed.
|
||||
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
project(iprefresher DESCRIPTION "Dynu ip refresher")
|
||||
SET(PROJECT_VERSION 1.3.3)
|
||||
project(dynuiprefresher DESCRIPTION "Dynu ip refresher" LANGUAGES)
|
||||
SET(PROJECT_VERSION 1.3.4)
|
||||
|
||||
# CONFIGURATION
|
||||
SET(CMAKE_BUILD_TYPE Release) # manually SET build type (Release / Debug)
|
||||
SET(CMAKE_BUILD_TYPE Debug) # manually SET build type (Release / Debug)
|
||||
SET(LIB_METHOD STATIC) #SHARED / STATIC
|
||||
|
||||
option(BUILD_DOC "Build documentation" ON) # additional dependency for Doxygen
|
||||
option(PACKAGING "Allow Packaging to <exe>, <deb> or <rpm>" ON) # additional dependencies for RPMbuild,dpkg or NSIS
|
||||
option(TESTS "Build Tests" ON) # additional dependencies for GTEST - to build tests
|
||||
option(GUI "Build GUI elements" ON) # additional dependencies to QT libraries needed
|
||||
set(WinBuild false)
|
||||
option(WinBuild "cross compile for Windows Platform" OFF)
|
||||
|
||||
# helper variables
|
||||
SET(CMAKE_CXX_STANDARD 17)
|
||||
string(TIMESTAMP TIMESTAMP_NOW "%d.%m.%Y")
|
||||
SET(Application_Name "dynuiprefresher")
|
||||
|
||||
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
@ -32,125 +32,57 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
# setup winbuild compilers
|
||||
if (${WinBuild})
|
||||
message(STATUS "setup Mingw Toolchain for cross compile.")
|
||||
set(LIBSUFFIX .dll)
|
||||
set(SUFFIX .exe)
|
||||
|
||||
set(CMAKE_SYSTEM_NAME WindowsStore)
|
||||
set(CMAKE_SYSTEM_VERSION 10.0)
|
||||
set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) # x64 build toolchain
|
||||
#set(TOOLCHAIN_PREFIX i686-w64-mingw32)
|
||||
|
||||
# cross compilers to use for C and C++
|
||||
set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}-gcc)
|
||||
set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}-g++)
|
||||
set(CMAKE_RC_COMPILER ${TOOLCHAIN_PREFIX}-windres)
|
||||
|
||||
# target environment on the build host system
|
||||
set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
|
||||
|
||||
|
||||
# modify default behavior of FIND_XXX() commands to
|
||||
# search for headers/libs in the target environment and
|
||||
# search for programs in the build host environment
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
|
||||
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
|
||||
|
||||
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CSS_STANDARD_LIBRARIES}")
|
||||
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
|
||||
# currently libs are dynamically linked eg. dlls have to be copied to same folder
|
||||
# todo link dynamically.
|
||||
# maybe so: set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++ -static")
|
||||
# or set(CMAKE_CXX_STANDARD_LIBRARIES -lcurl -lpthread -static-libgcc -static-libstdc++ -lcrypto -lssl -lws2_32 -static -DCURL_STATICLIB)
|
||||
# or add_definitions(-DCURL_STATICLIB)
|
||||
|
||||
# windows config path is same as executable
|
||||
set(CONFIG_PATH "./iprefresher.cfg")
|
||||
# windows config path is in %appdata% folder of user
|
||||
set(CONFIG_PATH "std::string(std::getenv(\"USERPROFILE\")) + \"\\\\AppData\\\\Roaming\\\\DynuIPrefresher\\\\\"")
|
||||
# temp file is also stored in appdata folder
|
||||
set(TempFilePath "std::string(std::getenv(\"USERPROFILE\")) + \"\\\\AppData\\\\Roaming\\\\DynuIPrefresher\\\\\"")
|
||||
else ()
|
||||
message(STATUS "using nativ gcc toolchain.")
|
||||
set(LIBSUFFIX .so)
|
||||
set(SUFFIX "")
|
||||
|
||||
# set /etc/ config path
|
||||
set(CONFIG_PATH "/etc/iprefresher.cfg")
|
||||
# set linux config path
|
||||
set(CONFIG_PATH "\"/etc/\"")
|
||||
# set path of temp file
|
||||
set(TempFilePath "\"/var/tmp/\"")
|
||||
endif ()
|
||||
|
||||
# test compiler settings and enable languages here
|
||||
message("")
|
||||
message(STATUS "Testing the C++ compiler!")
|
||||
enable_language(CXX)
|
||||
message("")
|
||||
message(STATUS "Testing the C compiler!")
|
||||
enable_language(C)
|
||||
|
||||
# config libs
|
||||
message("")
|
||||
message(STATUS "Config of Libraries")
|
||||
# libcurl
|
||||
if (${WinBuild})
|
||||
SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
|
||||
# configure libcurl
|
||||
FIND_PATH(CURL_INCLUDE_DIRS curl/curl.h /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
|
||||
FIND_LIBRARY(CURL_LIBRARIES NAMES libcurl.dll.a HINTS /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib) # search for actual lib
|
||||
|
||||
message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
|
||||
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
||||
message(STATUS "")
|
||||
# include conan libraries
|
||||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
|
||||
conan_basic_setup(TARGETS)
|
||||
|
||||
include_directories(${CURL_INCLUDE_DIRS} inc)
|
||||
include_directories(inc)
|
||||
|
||||
# configure libconfig
|
||||
FIND_PATH(LIBCONFIG++_INCLUDE_DIRS libconfig.h++ /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
|
||||
FIND_LIBRARY(LIBCONFIG++_LIBRARIES NAMES libconfig++.dll.a HINTS /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib) # search for actual lib
|
||||
|
||||
message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
|
||||
message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}")
|
||||
|
||||
include_directories(${LIBCONFIG++_INCLUDE_DIRS} inc)
|
||||
|
||||
if (${GUI})
|
||||
set(CMAKE_PREFIX_PATH "/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib/cmake")
|
||||
endif ()
|
||||
else ()
|
||||
find_package(CURL REQUIRED)
|
||||
if (CURL_INCLUDE_DIRS AND CURL_LIBRARIES)
|
||||
message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")
|
||||
message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
|
||||
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
||||
else ()
|
||||
message(FATAL_ERROR "Could not find CURL")
|
||||
endif ()
|
||||
include_directories(${CURL_INCLUDE_DIR} inc)
|
||||
|
||||
message("")
|
||||
# libconfig
|
||||
FIND_PATH(LIBCONFIG++_INCLUDE_DIRS
|
||||
NAMES libconfig.h++
|
||||
PATHS /usr/include /usr/local/include) # search for libconfig include headers
|
||||
FIND_LIBRARY(LIBCONFIG++_LIBRARIES
|
||||
NAMES config++
|
||||
PATHS /usr/lib /usr/local/lib) # search for actual lib
|
||||
|
||||
if (LIBCONFIG++_INCLUDE_DIRS AND LIBCONFIG++_LIBRARIES)
|
||||
message(STATUS "Fount libconfig!")
|
||||
message(STATUS "Using libconfig include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
|
||||
message(STATUS "Using libconfig lib(s): ${LIBCONFIG++_LIBRARIES}")
|
||||
else ()
|
||||
message(FATAL_ERROR "Could not find LIBCONFIG")
|
||||
endif ()
|
||||
|
||||
include_directories(${LIBCONFIG_INCLUDE_DIRS})
|
||||
endif ()
|
||||
|
||||
if (${GUI})
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
find_package(Qt5PrintSupport REQUIRED)
|
||||
find_package(Qt5Sql REQUIRED)
|
||||
endif ()
|
||||
# include the library headers created by conan
|
||||
include_directories(${CONAN_INCLUDE_DIRS})
|
||||
|
||||
message("")
|
||||
|
||||
#read sample config
|
||||
FILE(READ ${CMAKE_SOURCE_DIR}/config/iprefresher.cfg SAMPLECONFIG)
|
||||
#add version header
|
||||
FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
|
||||
FILE(READ ${CMAKE_SOURCE_DIR}/config/dynuiprefresher.cfg SAMPLECONFIG)
|
||||
#add StaticData header
|
||||
FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/StaticData.h
|
||||
"/**
|
||||
* Version header to store Version, Config dir and a Sample config
|
||||
* StaticData header to store Version, Config dir and a Sample config
|
||||
* Do not edit this file manually, it is generated by the cmake script!
|
||||
*
|
||||
* @author Lukas Heiligenbrunner
|
||||
@ -161,82 +93,58 @@ FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Version {
|
||||
namespace StaticData {
|
||||
const std::string VERSION = \"${PROJECT_VERSION}\";
|
||||
const std::string ConfigDir = \"${CONFIG_PATH}\";
|
||||
const std::string TempFilePath = ${TempFilePath};
|
||||
const std::string ConfigDir = ${CONFIG_PATH};
|
||||
const std::string ConfName = \"${Application_Name}.cfg\";
|
||||
const std::string SAMPLECONFIG = R\"(${SAMPLECONFIG})\";
|
||||
}"
|
||||
)
|
||||
|
||||
#define libraries with sources here
|
||||
add_library(api ${LIB_METHOD}
|
||||
src/api/API.cpp
|
||||
src/api/TelegramAPI.cpp
|
||||
src/api/DynuAPI.cpp
|
||||
src/api/IPAPI.cpp)
|
||||
|
||||
add_library(dynuiprefresher ${LIB_METHOD}
|
||||
add_library(libdynuiprefresher ${LIB_METHOD}
|
||||
src/IPRefresher.cpp
|
||||
src/Config.cpp
|
||||
src/IpHelper.cpp
|
||||
src/FileLogger.cpp
|
||||
src/Logger.cpp
|
||||
)
|
||||
src/Config.cpp
|
||||
src/CMDParser.cpp)
|
||||
|
||||
add_executable(iprefresher src/main.cpp)
|
||||
add_executable(${Application_Name} src/main.cpp)
|
||||
|
||||
# LINK generated LIBS #
|
||||
target_link_libraries(iprefresher dynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
|
||||
|
||||
if (${GUI})
|
||||
set(QT5_LIBRARIES Qt5::Widgets Qt5::PrintSupport Qt5::Sql)
|
||||
|
||||
set(UI_SOURCES
|
||||
src/gui/mainwindow.ui
|
||||
)
|
||||
|
||||
#
|
||||
# Generate necessary headers from .ui files. (qmake lets `uic` do this job.)
|
||||
# hint from [Cross-platform Qt5 project using cmake](http://stackoverflow.com/questions/21174586/cross-platform-qt5-project-using-cmake)
|
||||
#
|
||||
qt5_wrap_ui(UI_GENERATED_HEADERS ${UI_SOURCES})
|
||||
|
||||
add_executable(iprefresher-gui
|
||||
src/maingui.cpp
|
||||
src/gui/MainWindow.cpp
|
||||
src/gui/MainWindow.h ${UI_GENERATED_HEADERS})
|
||||
|
||||
# LINK generated LIBS #
|
||||
target_link_libraries(iprefresher-gui -lpthread dynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES} ${QT5_LIBRARIES})
|
||||
endif ()
|
||||
target_link_libraries(${Application_Name} libdynuiprefresher api CONAN_PKG::libcurl)
|
||||
|
||||
# setting install targets
|
||||
IF (NOT ${WinBuild})
|
||||
# INSTALL to Linux SYSTEM #
|
||||
|
||||
# install binaries
|
||||
install(TARGETS iprefresher DESTINATION usr/bin)
|
||||
install(
|
||||
TARGETS ${Application_Name}
|
||||
DESTINATION usr/bin
|
||||
COMPONENT ${Application_Name})
|
||||
# install systemd service and enable it
|
||||
install(FILES service/iprefresher.service DESTINATION lib/systemd/system)
|
||||
install(
|
||||
FILES service/${Application_Name}.service
|
||||
DESTINATION lib/systemd/system
|
||||
COMPONENT ${Application_Name})
|
||||
ELSE ()
|
||||
# INSTALL to Windows SYSTEM #
|
||||
|
||||
# install binary to current folder
|
||||
set_target_properties(iprefresher PROPERTIES SUFFIX ".exe")
|
||||
install(TARGETS iprefresher DESTINATION .)
|
||||
|
||||
# install .dll dependencies
|
||||
# todo check if files exist...
|
||||
install(FILES /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcurl-4.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssh2-1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libstdc++-6.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libgcc_s_seh-1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcrypto-1_1-x64.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssl-1_1-x64.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libwinpthread-1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/zlib1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libidn2-0.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libconfig++-11.dll
|
||||
DESTINATION .)
|
||||
set_target_properties(${Application_Name} PROPERTIES SUFFIX ".exe")
|
||||
install(
|
||||
TARGETS ${Application_Name}
|
||||
DESTINATION .
|
||||
COMPONENT ${Application_Name})
|
||||
ENDIF ()
|
||||
|
||||
if (${PACKAGING})
|
||||
@ -262,8 +170,10 @@ if (${PACKAGING})
|
||||
if [ ! -f ${CONFIG_PATH} ]; then
|
||||
cat > ${CONFIG_PATH} <<- EOM
|
||||
${SAMPLECONFIG}EOM
|
||||
fi\n"
|
||||
)
|
||||
fi
|
||||
|
||||
systemctl enable ${Application_Name}.service
|
||||
systemctl start ${Application_Name}.service")
|
||||
|
||||
|
||||
SET(CPACK_DEB_COMPONENT_INSTALL 1)
|
||||
@ -280,8 +190,19 @@ fi\n"
|
||||
message(STATUS "found rpm build executeable --> able to build rpm")
|
||||
SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
|
||||
SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
|
||||
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system" "/lib/systemd" "/lib" "/usr/local/bin" "/usr/local") # --> needed to not override existing folders
|
||||
SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
|
||||
"/lib/systemd/system"
|
||||
"/lib/systemd"
|
||||
"/lib"
|
||||
"/usr/local/bin"
|
||||
"/usr/local") # --> not override existing folders
|
||||
|
||||
# dependency management tested with fedora!
|
||||
set(CPACK_RPM_PACKAGE_REQUIRES "libcurl,libconfig")
|
||||
if (${GUI})
|
||||
# append rpm GUI dependencies (qt5)
|
||||
set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qt5-qtbase")
|
||||
endif ()
|
||||
else (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
|
||||
message(STATUS "not found rpm build tools --> not building rpm")
|
||||
endif (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
|
||||
@ -291,7 +212,13 @@ fi\n"
|
||||
message(STATUS "found deb build tools --> able to build deb")
|
||||
SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB") # add deb generator
|
||||
set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst") # set post inst file
|
||||
|
||||
# dependency management tested with fedora!
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4,libconfig++9v5") # add debian dependencies
|
||||
if (${GUI})
|
||||
# append debian GUI dependencies (qt5)
|
||||
set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},qt5-default")
|
||||
endif ()
|
||||
else (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
|
||||
message(STATUS "not found deb build tools --> not building deb")
|
||||
endif (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
|
||||
@ -306,17 +233,45 @@ fi\n"
|
||||
set(CPACK_GENERATOR NSIS)
|
||||
message(STATUS "Using NSIS Package build.")
|
||||
|
||||
set(CPACK_NSIS_testcomp_INSTALL_DIRECTORY /)
|
||||
set(CPACK_NSIS_EXECUTABLES_DIRECTORY "DynuIpRefresher")
|
||||
set(CPACK_PACKAGE_INSTALL_DIRECTORY "DynuIpRefresher")
|
||||
SET(CPACK_NSIS_MODIFY_PATH ON)
|
||||
set(CPACK_NSIS_MENU_LINKS
|
||||
"${Application_Name}.exe" "DynuIpRefresher Console"
|
||||
"${Application_Name}-gui.exe" "DynuIpRefresher GUI")
|
||||
|
||||
# varnames need uppercase strings
|
||||
string(TOUPPER ${Application_Name} APPLICATION_NAME_UPPER)
|
||||
# Define components and their display names
|
||||
set (CPACK_COMPONENTS_ALL ${Application_Name} ${Application_Name}gui)
|
||||
set (CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_DISPLAY_NAME "Dynu IP Refresher Console")
|
||||
set (CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DISPLAY_NAME "Dynu IP Refresher GUI")
|
||||
|
||||
# Human readable component descriptions
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_DESCRIPTION "An extremely useful application that makes use of MyLib")
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DESCRIPTION "Static libraries used to build programs with MyLib")
|
||||
|
||||
# Define dependencies between components
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DEPENDS ${Application_Name})
|
||||
|
||||
# Define groups
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_GROUP "Runtime")
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_GROUP "Development")
|
||||
|
||||
set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "All of the tools you'll ever need to develop software")
|
||||
|
||||
# Define NSIS installation types
|
||||
set(CPACK_ALL_INSTALL_TYPES Full Developer)
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_INSTALL_TYPES Developer Full)
|
||||
set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_INSTALL_TYPES Full)
|
||||
ENDIF ()
|
||||
|
||||
INCLUDE(CPack)
|
||||
|
||||
add_custom_target(build-packages
|
||||
"${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package
|
||||
DEPENDS ${PROJECT_NAME}
|
||||
COMMENT "Packing ${PROJECT_NAME}")
|
||||
DEPENDS ${Application_Name}
|
||||
COMMENT "Packing ${Application_Name}")
|
||||
message("")
|
||||
ENDIF ()
|
||||
|
||||
@ -347,39 +302,40 @@ endif (BUILD_DOC)
|
||||
|
||||
# Test Cases
|
||||
if (TESTS)
|
||||
include(GoogleTest)
|
||||
# include(GoogleTest)
|
||||
message(STATUS "Configuring GTEST")
|
||||
find_package(GTest)
|
||||
if (GTEST_FOUND)
|
||||
|
||||
mark_as_advanced(
|
||||
BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS
|
||||
gmock_build_tests gtest_build_samples gtest_build_tests
|
||||
gtest_disable_pthreads gtest_force_shared_crt gtest_hide_internal_symbols
|
||||
)
|
||||
mark_as_advanced(
|
||||
BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS
|
||||
gmock_build_tests gtest_build_samples gtest_build_tests
|
||||
gtest_disable_pthreads gtest_force_shared_crt gtest_hide_internal_symbols
|
||||
)
|
||||
|
||||
enable_testing()
|
||||
enable_testing()
|
||||
|
||||
macro(package_add_test TESTNAME)
|
||||
# create an exectuable in which the tests will be stored
|
||||
add_executable(${TESTNAME} ${ARGN})
|
||||
# link the Google test infrastructure, mocking library, and a default main fuction to
|
||||
target_link_libraries(${TESTNAME} gtest gtest_main -lpthread -lm dynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
|
||||
# see https://cmake.org/cmake/help/v3.10/module/GoogleTest.html for more options to pass to it
|
||||
gtest_discover_tests(${TESTNAME}
|
||||
WORKING_DIRECTORY ${PROJECT_DIR}
|
||||
EXTRA_ARGS --gtest_output=xml:report.xml -VV
|
||||
PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_DIR}"
|
||||
)
|
||||
set_target_properties(${TESTNAME} PROPERTIES FOLDER tests)
|
||||
endmacro()
|
||||
macro(package_add_test TESTNAME)
|
||||
# create an exectuable in which the tests will be stored
|
||||
add_executable(${TESTNAME} ${ARGN})
|
||||
# link the Google test infrastructure, mocking library, and a default main fuction to
|
||||
target_link_libraries(${TESTNAME} gtest gtest_main -lpthread -lm libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
|
||||
# see https://cmake.org/cmake/help/v3.10/module/GoogleTest.html for more options to pass to it
|
||||
gtest_discover_tests(${TESTNAME})
|
||||
|
||||
package_add_test(test1 tests/UnitTest.cpp ${SOURCE})
|
||||
add_custom_command(TARGET build-test
|
||||
POST_BUILD
|
||||
COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target ${TESTNAME}
|
||||
COMMAND "bin/${TESTNAME}" --gtest_output=xml:${TESTNAME}-report.xml)
|
||||
endmacro()
|
||||
|
||||
add_custom_target(build-test
|
||||
"${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target test
|
||||
DEPENDS ${PROJECT_NAME}
|
||||
COMMENT "Packing ${PROJECT_NAME}")
|
||||
add_custom_target(build-test
|
||||
DEPENDS ${PROJECT_NAME}
|
||||
COMMENT "Testing ${PROJECT_NAME}")
|
||||
|
||||
add_custom_target(build-xml
|
||||
"bin/test1" --gtest_output="xml:report.xml"
|
||||
DEPENDS ${PROJECT_NAME}
|
||||
COMMENT "Packing ${PROJECT_NAME}")
|
||||
package_add_test(test1 tests/UnitTest.cpp ${SOURCE})
|
||||
|
||||
else ()
|
||||
message(STATUS "GTEST environment not found!")
|
||||
endif ()
|
||||
ENDIF ()
|
19
Docker/Linux/Dockerfile
Normal file
19
Docker/Linux/Dockerfile
Normal file
@ -0,0 +1,19 @@
|
||||
FROM gcc:latest
|
||||
MAINTAINER luki42
|
||||
|
||||
RUN \
|
||||
\
|
||||
# Install texlive
|
||||
echo "instaling cmake" && \
|
||||
apt-get update && \
|
||||
apt-get install -y --no-install-recommends cmake libgtest-dev && \
|
||||
echo "installing build dependencies" && \
|
||||
apt-get install -y --no-install-recommends libcurl4-openssl-dev libconfig++-dev && \
|
||||
echo "installing packaging tools" && \
|
||||
apt-get install -y --no-install-recommends dpkg rpm && \
|
||||
# clean up
|
||||
apt-get clean
|
||||
|
||||
# Expose /home as workin dir
|
||||
WORKDIR /home
|
||||
VOLUME ["/home"]
|
23
Docker/Linux_Conan/.gitlab-ci.yml
Normal file
23
Docker/Linux_Conan/.gitlab-ci.yml
Normal file
@ -0,0 +1,23 @@
|
||||
|
||||
# trigger docker rebuild if changes where made
|
||||
docker_linux:
|
||||
stage: docker
|
||||
image: docker:latest
|
||||
tags:
|
||||
- dind
|
||||
services:
|
||||
- name: docker:dind
|
||||
entrypoint: ["env", "-u", "DOCKER_HOST"]
|
||||
command: ["dockerd-entrypoint.sh"]
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_DRIVER: overlay2
|
||||
# See https://github.com/docker-library/docker/pull/166
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
script:
|
||||
- docker build -t luki42/dynuiprefresher_build:conanbuild Docker/Linux_Conan
|
||||
- docker login -p $DockerPWD -u luki42
|
||||
- docker push luki42/dynuiprefresher_build:conanbuild
|
||||
only:
|
||||
changes:
|
||||
- Docker/Linux_Conan/*
|
9
Docker/Linux_Conan/Dockerfile
Normal file
9
Docker/Linux_Conan/Dockerfile
Normal file
@ -0,0 +1,9 @@
|
||||
FROM mwaeckerlin/mingw:latest
|
||||
|
||||
COPY ./build.sh /tmp/
|
||||
|
||||
RUN bash /tmp/build.sh
|
||||
|
||||
# Expose /home as workin dir
|
||||
WORKDIR /home
|
||||
VOLUME ["/home"]
|
23
Docker/Linux_Conan/build.sh
Normal file
23
Docker/Linux_Conan/build.sh
Normal file
@ -0,0 +1,23 @@
|
||||
#!/bin/bash
|
||||
|
||||
apt-get update
|
||||
apt-get install cmake python3-pip -y -qq
|
||||
pip3 install conan
|
||||
|
||||
git clone https://gitlab.heili.eu/lukas/dynuiprefresher.git
|
||||
cd dynuiprefresher || exit
|
||||
git checkout conansupport
|
||||
|
||||
conan profile new default --detect --force # Generates default profile detecting GCC and sets old ABI
|
||||
conan profile update settings.compiler.libcxx=libstdc++11 default # Sets libcxx to C++11 ABI
|
||||
mkdir -p build # create build folder
|
||||
CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing
|
||||
|
||||
|
||||
# cleanup
|
||||
conan remove "*" -s -b -f
|
||||
|
||||
cd ..
|
||||
rm -Rf ./dynuiprefresher
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
rm /tmp/build.sh
|
20
Docker/Windows/Dockerfile
Normal file
20
Docker/Windows/Dockerfile
Normal file
@ -0,0 +1,20 @@
|
||||
FROM fedora:33
|
||||
MAINTAINER luki42
|
||||
|
||||
RUN \
|
||||
\
|
||||
# Install texlive
|
||||
echo "instaling cmake" && \
|
||||
dnf install -y mingw64-gcc-c++ mingw64-curl-static mingw64-qt5-qtbase wget cmake make tar xz mingw32-nsis gtest gtest-devel && \
|
||||
wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz && \
|
||||
tar -xf mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz && \
|
||||
mv ./mingw64/bin/* /usr/x86_64-w64-mingw32/sys-root/mingw/bin && \
|
||||
mv ./mingw64/include/* /usr/x86_64-w64-mingw32/sys-root/mingw/include && \
|
||||
mv ./mingw64/lib/*.a /usr/x86_64-w64-mingw32/sys-root/mingw/lib && \
|
||||
mv ./mingw64/lib/cmake/* /usr/x86_64-w64-mingw32/sys-root/mingw/lib/cmake && \
|
||||
rm -Rv mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz mingw64 && \
|
||||
#cleanup
|
||||
dnf clean dbcache && dnf clean packages
|
||||
# Expose /home as workin dir
|
||||
WORKDIR /home
|
||||
VOLUME ["/home"]
|
23
Docker/Windows_Conan/.gitlab-ci.yml
Normal file
23
Docker/Windows_Conan/.gitlab-ci.yml
Normal file
@ -0,0 +1,23 @@
|
||||
|
||||
# trigger docker rebuild if changes where made
|
||||
docker_linux:
|
||||
stage: docker
|
||||
image: docker:latest
|
||||
tags:
|
||||
- dind
|
||||
services:
|
||||
- name: docker:dind
|
||||
entrypoint: ["env", "-u", "DOCKER_HOST"]
|
||||
command: ["dockerd-entrypoint.sh"]
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_DRIVER: overlay2
|
||||
# See https://github.com/docker-library/docker/pull/166
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
script:
|
||||
- docker build -t luki42/dynuiprefresher_build:conanbuild Docker/Windows_Conan
|
||||
- docker login -p $DockerPWD -u luki42
|
||||
- docker push luki42/dynuiprefresher_build:conanbuild
|
||||
only:
|
||||
changes:
|
||||
- Docker/Windows_Conan/*
|
10
Docker/Windows_Conan/Dockerfile
Normal file
10
Docker/Windows_Conan/Dockerfile
Normal file
@ -0,0 +1,10 @@
|
||||
FROM fedora:33
|
||||
MAINTAINER luki42
|
||||
|
||||
COPY ./build.sh /tmp/
|
||||
|
||||
RUN bash /tmp/build.sh
|
||||
|
||||
# Expose /home as workin dir
|
||||
WORKDIR /home
|
||||
VOLUME ["/home"]
|
25
Docker/Windows_Conan/build.sh
Normal file
25
Docker/Windows_Conan/build.sh
Normal file
@ -0,0 +1,25 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Install texlive
|
||||
echo "instaling cmake" && \
|
||||
dnf install -y mingw64-gcc-c++ cmake make mingw32-nsis gtest gtest-devel python3 python3-pip git perl
|
||||
#cleanup
|
||||
dnf clean dbcache && dnf clean packages
|
||||
|
||||
# install conan
|
||||
pip3 install conan
|
||||
|
||||
git clone https://gitlab.heili.eu/lukas/dynuiprefresher.git
|
||||
cd dynuiprefresher || exit
|
||||
git checkout conansupport
|
||||
|
||||
mkdir -p build # create build folder
|
||||
CONAN_SYSREQUIRES_MODE=enabled CONAN_SYSREQUIRES_SUDO=0 conan install . --build=missing --profile mingw64.profile
|
||||
|
||||
|
||||
# cleanup
|
||||
conan remove "*" -s -b -f
|
||||
|
||||
cd ..
|
||||
rm -Rf ./dynuiprefresher
|
||||
rm /tmp/build.sh
|
40
README.md
40
README.md
@ -2,6 +2,7 @@
|
||||
# DynuIPRefresher
|
||||
A lightweight C++ application to setup a service for refreshing a dynamic IP to the Dynu servers.
|
||||
Dynu.com is a free DDns service and provides an API.
|
||||
There is also a GUI for Windows Users and beginners.
|
||||
|
||||
## Installation
|
||||
Download the latest Release at [Release_Page](https://github.com/Lukas-Heiligenbrunner/DynuIPRefresher/releases).
|
||||
@ -9,11 +10,38 @@ I'm providing executables for Debian/Ubuntu (.deb) and RHEL/Debian (.rpm).
|
||||
But you can still compile the code my your own (see build section).
|
||||
|
||||
## Configuration
|
||||
There is a configuration file `/etc/iprefresher.cfg` where you have to specify the DYNU API key (get it from their homepage), the domainid and your domain.
|
||||
There is a configuration file `/etc/dynuiprefresher.cfg` where you have to specify the DYNU API key (get it from their homepage), the domainid and your domain.
|
||||
Furthermore, you can optionally specify a Telegram API key and a Chat ID if you want to be notfied when your local ip changes.
|
||||
|
||||
To enable and start the service:
|
||||
`systemctl enable iprefresher.service` and `systemctl start iprefresher.service`
|
||||
`systemctl enable dynuiprefresher.service` and `systemctl start dynuiprefresher.service`
|
||||
|
||||
## Usage
|
||||
First of all configure the right keys in the `/etc/dynuiprefresher.cfg` or `%appdata%\DynuIpRefresher\dynuiprefresher.cfg` config file.
|
||||
|
||||
Afterwards use the following options:
|
||||
|
||||
```
|
||||
help page:
|
||||
[-h] [--help] print this help page
|
||||
[-v] [--version] print the software version
|
||||
[-f] [--force] force refresh of ip
|
||||
[-l] [--loop] infinite loop to refresh ip every five minutes
|
||||
[-c] [--checkconfig] validate configuration
|
||||
[-ip] [--currentip] get current global ip
|
||||
[no argument] normal ip check and refresh
|
||||
```
|
||||
|
||||
### GUI
|
||||
|
||||
You can also build the grapical user inteface if you want.
|
||||
There you can manually trigger a refresh in a gui and set all the config parameters.
|
||||
|
||||
Home Page:
|
||||

|
||||
|
||||
Config Page:
|
||||

|
||||
|
||||
|
||||
## Build
|
||||
@ -69,6 +97,10 @@ cd into downloaded files and Generate makefiles:
|
||||
|
||||
`make package`
|
||||
|
||||
### GUI Build
|
||||
|
||||
please use the predefined Docker-Image here:
|
||||
[DockerHub](https://hub.docker.com/repository/docker/luki42/dynuiprefresher_build)
|
||||
|
||||
|
||||
### Windows cross build
|
||||
@ -83,5 +115,7 @@ Optional dependencies
|
||||
* NSIS Pack tool (for creating installer)
|
||||
* doxygen (for generating html doc)
|
||||
|
||||
Some addition configuration of lib paths may be needed in CMakeList.txt.
|
||||
The Simplest way to install all dependencies is the preconfigured Docker-Image:
|
||||
[DockerHub](https://hub.docker.com/repository/docker/luki42/dynuiprefresher_build)
|
||||
|
||||
`make package` will pack it into a NSIS installer for Windows.
|
||||
|
6
conanfile.txt
Normal file
6
conanfile.txt
Normal file
@ -0,0 +1,6 @@
|
||||
[requires]
|
||||
libcurl/7.72.0
|
||||
|
||||
[generators]
|
||||
cmake
|
||||
|
@ -3,10 +3,10 @@
|
||||
# Lukas Heiligenbrunner
|
||||
|
||||
## DYNU API Config
|
||||
dynuapikey = ""
|
||||
domainid = ""
|
||||
domainname = ""
|
||||
dynuapikey=
|
||||
domainid=
|
||||
domainname=
|
||||
|
||||
## Telegram API Config (optional)
|
||||
#telegramApiKey = ""
|
||||
#chatId = ""
|
||||
#telegramApiKey=
|
||||
#chatId=
|
23
inc/CMDParser.h
Normal file
23
inc/CMDParser.h
Normal file
@ -0,0 +1,23 @@
|
||||
//
|
||||
// Created by lukas on 15.03.21.
|
||||
//
|
||||
|
||||
#pragma once
|
||||
|
||||
class CMDParser {
|
||||
public:
|
||||
class Arguments {
|
||||
public:
|
||||
// enable loop mode
|
||||
bool loop = false;
|
||||
bool force = false;
|
||||
// enable currentIP mode
|
||||
bool currentIP = false;
|
||||
};
|
||||
|
||||
Arguments* parseArguments(int argc, char *argv[]);
|
||||
private:
|
||||
Arguments args;
|
||||
|
||||
void processParameter(char *arg);
|
||||
};
|
32
inc/Config.h
32
inc/Config.h
@ -18,6 +18,13 @@ public:
|
||||
*/
|
||||
static bool readConfig();
|
||||
|
||||
/**
|
||||
* save back configuration to file
|
||||
*
|
||||
* @return success of config write
|
||||
*/
|
||||
static bool saveConfig();
|
||||
|
||||
/**
|
||||
* validate config file
|
||||
*
|
||||
@ -63,12 +70,35 @@ public:
|
||||
*/
|
||||
static const std::string &getChatId();
|
||||
|
||||
/**
|
||||
* set all parameters without telegram support
|
||||
*
|
||||
* @param domainname Dynu Domain name
|
||||
* @param dynuapikey Dynu api key
|
||||
* @param domainid Dynu domain id
|
||||
*/
|
||||
static void setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid);
|
||||
|
||||
/**
|
||||
* set all parameters with telegram support
|
||||
*
|
||||
* @param domainname Dynu Domain name
|
||||
* @param dynuapikey Dynu api key
|
||||
* @param domainid Dynu domain id
|
||||
* @param telegramApiKey Telegram api key
|
||||
* @param chatId Telegram chat id
|
||||
*/
|
||||
static void setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid,
|
||||
const std::string &telegramApiKey, const std::string &chatId);
|
||||
|
||||
private:
|
||||
/**
|
||||
* private constructor --> don't allow instance of this class
|
||||
*/
|
||||
Config();
|
||||
Config() = default;
|
||||
|
||||
static void writeDefaultConfig();
|
||||
static void setParam(const std::string key, const std::string value);
|
||||
|
||||
/**
|
||||
* helper variable for managing telegram Support
|
||||
|
@ -16,7 +16,7 @@ public:
|
||||
* @param ip ip address to test
|
||||
* @return validity
|
||||
*/
|
||||
static bool isIpValid(std::string ip);
|
||||
static bool isIpValid(const std::string& ip);
|
||||
|
||||
private:
|
||||
};
|
||||
|
28
mingw64.profile
Normal file
28
mingw64.profile
Normal file
@ -0,0 +1,28 @@
|
||||
toolchain=/usr/x86_64-w64-mingw32 # Adjust this path
|
||||
target_host=x86_64-w64-mingw32
|
||||
cc_compiler=gcc
|
||||
cxx_compiler=g++
|
||||
|
||||
[env]
|
||||
CONAN_CMAKE_FIND_ROOT_PATH=$toolchain # Optional, for CMake to find things in that folder
|
||||
CONAN_CMAKE_SYSROOT=$toolchain # Optional, if we want to define sysroot
|
||||
CHOST=$target_host
|
||||
AR=$target_host-ar
|
||||
AS=$target_host-as
|
||||
RANLIB=$target_host-ranlib
|
||||
CC=$target_host-$cc_compiler
|
||||
CXX=$target_host-$cxx_compiler
|
||||
STRIP=$target_host-strip
|
||||
RC=$target_host-windres
|
||||
|
||||
[settings]
|
||||
# We are cross-building to Windows
|
||||
os=Windows
|
||||
arch=x86_64
|
||||
compiler=gcc
|
||||
|
||||
# Adjust to the gcc version of your MinGW package
|
||||
compiler.version=10
|
||||
compiler.libcxx=libstdc++11
|
||||
compiler.threads=posix
|
||||
build_type=Release
|
42
src/CMDParser.cpp
Normal file
42
src/CMDParser.cpp
Normal file
@ -0,0 +1,42 @@
|
||||
//
|
||||
// Created by lukas on 15.03.21.
|
||||
//
|
||||
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <Logger.h>
|
||||
#include <StaticData.h>
|
||||
#include "CMDParser.h"
|
||||
|
||||
CMDParser::Arguments* CMDParser::parseArguments(int argc, char **argv) {
|
||||
for (int i = 1; i < argc; i++) {
|
||||
this->processParameter(argv[i]);
|
||||
}
|
||||
return &args;
|
||||
}
|
||||
|
||||
void CMDParser::processParameter(char *arg) {
|
||||
const std::string param = std::string(arg);
|
||||
|
||||
if (param == "-h" || param == "--help") {
|
||||
std::cout << "help page: " << std::endl << "[-h] [--help] print this help page" << std::endl
|
||||
<< "[-v] [--version] print the software version" << std::endl
|
||||
<< "[-f] [--force] force refresh of ip" << std::endl
|
||||
<< "[-l] [--loop] infinite loop to refresh ip every five minutes" << std::endl
|
||||
<< "[-c] [--checkconfig] validate configuration" << std::endl
|
||||
<< "[-ip] [--currentip] get current global ip" << std::endl
|
||||
<< "[no argument] normal ip check and refresh" << std::endl;
|
||||
exit(0);
|
||||
} else if (param == "-v" || param == "--version") {
|
||||
std::cout << "Version " << StaticData::VERSION << std::endl;
|
||||
exit(0);
|
||||
} else if (param == "-f" || param == "--force") {
|
||||
args.force = true;
|
||||
} else if (param == "-l" || param == "--loop") {
|
||||
args.loop = true;
|
||||
} else if (param == "-ip" || param == "--currentip") {
|
||||
args.currentIP = true;
|
||||
} else {
|
||||
Logger::message("unknown argument: " + param + "! -h for help");
|
||||
}
|
||||
}
|
231
src/Config.cpp
231
src/Config.cpp
@ -1,11 +1,12 @@
|
||||
#include "Config.h"
|
||||
#include "Logger.h"
|
||||
#include "Version.h"
|
||||
#include "StaticData.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
#include <fstream>
|
||||
#include <libconfig.h++>
|
||||
#include <sys/stat.h>
|
||||
#include <sstream>
|
||||
|
||||
std::string Config::dynuapikey;
|
||||
std::string Config::domainid; //id of the dynu domain
|
||||
@ -17,99 +18,89 @@ std::string Config::chatId;
|
||||
bool Config::telegramSupport;
|
||||
|
||||
bool Config::readConfig() {
|
||||
libconfig::Config cfg;
|
||||
try {
|
||||
cfg.readFile(Version::ConfigDir.c_str());
|
||||
}
|
||||
catch (const libconfig::FileIOException &fioex) {
|
||||
std::cout << "I/O error while reading config file." << std::endl << "creating new config file!" << std::endl;
|
||||
|
||||
std::ofstream myfile;
|
||||
myfile.open(Version::ConfigDir);
|
||||
if (myfile.is_open()) {
|
||||
myfile << Version::SAMPLECONFIG;
|
||||
myfile.close();
|
||||
} else {
|
||||
Logger::error("error creating file");
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
catch (const libconfig::ParseException &pex) {
|
||||
std::cerr << "Parse error at " << pex.getFile() << ":" << pex.getLine()
|
||||
<< " - " << pex.getError() << std::endl;
|
||||
// Read from the text file
|
||||
std::ifstream MyReadFile;
|
||||
MyReadFile.open(std::string(StaticData::ConfigDir + StaticData::ConfName));
|
||||
if (!MyReadFile) {
|
||||
// file does not exist
|
||||
writeDefaultConfig();
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
// needed parameters
|
||||
dynuapikey = (std::string) cfg.lookup("dynuapikey");
|
||||
domainid = (std::string) cfg.lookup("domainid");
|
||||
domainname = (std::string) cfg.lookup("domainname");
|
||||
// optional parameters
|
||||
telegramApiKey = (std::string) cfg.lookup("telegramApiKey");
|
||||
chatId = (std::string) cfg.lookup("chatId");
|
||||
telegramSupport = true;
|
||||
}
|
||||
catch (const libconfig::SettingNotFoundException &nfex) {
|
||||
// triggered if setting is missing in config
|
||||
if (!(std::strcmp("telegramApiKey", nfex.getPath()) == 0 || std::strcmp("chatId", nfex.getPath()) == 0)) {
|
||||
std::cerr << "No '" << nfex.getPath() << "' setting in configuration file." << std::endl;
|
||||
} else {
|
||||
Logger::message("no Telegram support - fields in config not set");
|
||||
telegramSupport = false;
|
||||
std::string line;
|
||||
while (getline(MyReadFile, line)) {
|
||||
// ignore line if it starts with #
|
||||
if(line.rfind('#', 0) == 0 || line.empty()){
|
||||
continue;
|
||||
}
|
||||
|
||||
std::istringstream is_line(line);
|
||||
std::string key;
|
||||
if (std::getline(is_line, key, '=')) {
|
||||
std::string value;
|
||||
if (std::getline(is_line, value))
|
||||
setParam(key, value);
|
||||
}
|
||||
}
|
||||
|
||||
// Close the file
|
||||
MyReadFile.close();
|
||||
|
||||
// check if needed values aren't empty
|
||||
return !(Config::dynuapikey.empty() || Config::domainid.empty() || Config::domainname.empty());
|
||||
}
|
||||
|
||||
bool Config::validateConfig() {
|
||||
libconfig::Config cfg;
|
||||
try {
|
||||
Logger::message("reading config file");
|
||||
cfg.readFile(Version::ConfigDir.c_str());
|
||||
}
|
||||
catch (const libconfig::FileIOException &fioex) {
|
||||
Logger::warning("config file doesn't exist or permission denied!");
|
||||
return false;
|
||||
}
|
||||
catch (const libconfig::ParseException &pex) {
|
||||
std::cerr << "Parse error at " << pex.getFile() << ":" << pex.getLine()
|
||||
<< " - " << pex.getError() << std::endl;
|
||||
return false;
|
||||
}
|
||||
Logger::message("Syntax and Permission is OK");
|
||||
bool Config::saveConfig() {
|
||||
// todo save config
|
||||
return false;
|
||||
}
|
||||
|
||||
try {
|
||||
// needed parameters
|
||||
if (((std::string) cfg.lookup("dynuapikey")).empty()) {
|
||||
Logger::warning("required parameter \"dynuapikey\" seems to be empty.");
|
||||
return false;
|
||||
}
|
||||
if (((std::string) cfg.lookup("domainid")).empty()) {
|
||||
Logger::warning("required parameter \"domainid\" seems to be empty.");
|
||||
return false;
|
||||
}
|
||||
if (((std::string) cfg.lookup("domainname")).empty()) {
|
||||
Logger::warning("required parameter \"domainname\" seems to be empty.");
|
||||
return false;
|
||||
}
|
||||
// optional parameters
|
||||
cfg.lookup("telegramApiKey");
|
||||
cfg.lookup("chatId");
|
||||
telegramSupport = true;
|
||||
}
|
||||
catch (const libconfig::SettingNotFoundException &nfex) {
|
||||
// triggered if setting is missing in config
|
||||
if (!(std::strcmp("telegramApiKey", nfex.getPath()) == 0 || std::strcmp("chatId", nfex.getPath()) == 0)) {
|
||||
std::cerr << "No '" << nfex.getPath() << "' setting in configuration file." << std::endl;
|
||||
return false;
|
||||
} else {
|
||||
Logger::message("no Telegram support - fields in config not set");
|
||||
telegramSupport = false;
|
||||
}
|
||||
}
|
||||
bool Config::validateConfig() {
|
||||
// libconfig::Config cfg;
|
||||
// try {
|
||||
// Logger::message("reading config file: " + std::string(StaticData::ConfigDir + StaticData::ConfName));
|
||||
// cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
|
||||
// }
|
||||
// catch (const libconfig::FileIOException &fioex) {
|
||||
// Logger::warning("config file doesn't exist or permission denied!");
|
||||
// return false;
|
||||
// }
|
||||
// catch (const libconfig::ParseException &pex) {
|
||||
// std::cerr << "Parse error at " << pex.getFile() << ":" << pex.getLine()
|
||||
// << " - " << pex.getError() << std::endl;
|
||||
// return false;
|
||||
// }
|
||||
// Logger::message("Syntax and Permission is OK");
|
||||
//
|
||||
// try {
|
||||
// // needed parameters
|
||||
// if (((std::string) cfg.lookup("dynuapikey")).empty()) {
|
||||
// Logger::warning("required parameter \"dynuapikey\" seems to be empty.");
|
||||
// return false;
|
||||
// }
|
||||
// if (((std::string) cfg.lookup("domainid")).empty()) {
|
||||
// Logger::warning("required parameter \"domainid\" seems to be empty.");
|
||||
// return false;
|
||||
// }
|
||||
// if (((std::string) cfg.lookup("domainname")).empty()) {
|
||||
// Logger::warning("required parameter \"domainname\" seems to be empty.");
|
||||
// return false;
|
||||
// }
|
||||
// // optional parameters
|
||||
// cfg.lookup("telegramApiKey");
|
||||
// cfg.lookup("chatId");
|
||||
// telegramSupport = true;
|
||||
// }
|
||||
// catch (const libconfig::SettingNotFoundException &nfex) {
|
||||
// // triggered if setting is missing in config
|
||||
// if (!(std::strcmp("telegramApiKey", nfex.getPath()) == 0 || std::strcmp("chatId", nfex.getPath()) == 0)) {
|
||||
// std::cerr << "No '" << nfex.getPath() << "' setting in configuration file." << std::endl;
|
||||
// return false;
|
||||
// } else {
|
||||
// Logger::message("no Telegram support - fields in config not set");
|
||||
// telegramSupport = false;
|
||||
// }
|
||||
// }
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -137,4 +128,72 @@ const std::string &Config::getChatId() {
|
||||
return chatId;
|
||||
}
|
||||
|
||||
Config::Config() = default;
|
||||
void Config::setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid) {
|
||||
Config::domainname = domainname;
|
||||
Config::dynuapikey = dynuapikey;
|
||||
Config::domainid = domainid;
|
||||
}
|
||||
|
||||
void Config::setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid,
|
||||
const std::string &telegramApiKey, const std::string &chatId) {
|
||||
setValues(domainname, dynuapikey, domainid);
|
||||
Config::telegramApiKey = telegramApiKey;
|
||||
Config::chatId = chatId;
|
||||
}
|
||||
|
||||
void Config::writeDefaultConfig() {
|
||||
std::cout << "I/O error while reading config file." << std::endl << "creating new config file!" << std::endl;
|
||||
|
||||
// check if config folder exists
|
||||
struct stat info{};
|
||||
|
||||
if (stat(StaticData::ConfigDir.c_str(), &info) != 0) {
|
||||
Logger::warning("The config folder doesn't exist. Trying to create it.");
|
||||
|
||||
// mkdir command is different defined for windows
|
||||
#ifdef __unix
|
||||
int check = mkdir(StaticData::ConfigDir.c_str(), 777);
|
||||
#else
|
||||
int check = mkdir(StaticData::ConfigDir.c_str());
|
||||
#endif
|
||||
|
||||
// check if directory is created or not
|
||||
if (!check)
|
||||
Logger::message("config directory successfully created. ");
|
||||
else
|
||||
Logger::error("unable to create config directory.");
|
||||
|
||||
} else if (info.st_mode & S_IFDIR) {
|
||||
Logger::debug("config directory exists already");
|
||||
} else {
|
||||
Logger::error("A file exists with the same name as the config dir should be");
|
||||
}
|
||||
|
||||
|
||||
std::ofstream myfile;
|
||||
myfile.open(StaticData::ConfigDir + StaticData::ConfName);
|
||||
if (myfile.is_open()) {
|
||||
myfile << StaticData::SAMPLECONFIG;
|
||||
myfile.close();
|
||||
} else {
|
||||
Logger::error("error creating file");
|
||||
}
|
||||
}
|
||||
|
||||
void Config::setParam(const std::string key, const std::string value) {
|
||||
if (key == "dynuapikey")
|
||||
dynuapikey = value;
|
||||
else if (key == "domainid")
|
||||
domainid = value;
|
||||
else if (key == "domainname")
|
||||
domainname = value;
|
||||
else if (key == "telegramApiKey")
|
||||
telegramApiKey = value;
|
||||
else if (key == "chatId")
|
||||
chatId = value;
|
||||
else
|
||||
Logger::warning("unkown key in config file: " + key);
|
||||
|
||||
if (!telegramApiKey.empty())
|
||||
telegramSupport = true;
|
||||
}
|
||||
|
@ -1,12 +1,13 @@
|
||||
#include "FileLogger.h"
|
||||
#include "IpHelper.h"
|
||||
#include "StaticData.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
|
||||
void FileLogger::safeip(std::string ip) {
|
||||
std::ofstream out;
|
||||
out.open("ip.txt", std::ios::out);
|
||||
out.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::out);
|
||||
|
||||
out << ip;
|
||||
|
||||
@ -15,7 +16,7 @@ void FileLogger::safeip(std::string ip) {
|
||||
|
||||
std::string FileLogger::readip() {
|
||||
std::ifstream in;
|
||||
in.open("ip.txt", std::ios::in);
|
||||
in.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::in);
|
||||
|
||||
std::string ip;
|
||||
|
||||
|
@ -4,15 +4,13 @@
|
||||
#include "api/DynuAPI.h"
|
||||
#include "api/TelegramAPI.h"
|
||||
#include "Config.h"
|
||||
#include "Version.h"
|
||||
#include "StaticData.h"
|
||||
#include "IpHelper.h"
|
||||
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include <Logger.h>
|
||||
|
||||
using namespace IPRefresher;
|
||||
|
||||
bool IPRefresher::checkIPAdress(bool force) {
|
||||
FileLogger logger;
|
||||
|
||||
@ -59,15 +57,15 @@ bool IPRefresher::checkIPAdress(bool force) {
|
||||
|
||||
void IPRefresher::startUpService(int interval) {
|
||||
Logger::message("startup of service");
|
||||
Logger::message("Version: " + Version::VERSION);
|
||||
if (Config::readConfig()) {
|
||||
while (true) {
|
||||
Logger::message("starting check");
|
||||
checkIPAdress(false);
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
|
||||
}
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
Logger::message("Version: " + StaticData::VERSION);
|
||||
|
||||
while (true) {
|
||||
Logger::message("starting check");
|
||||
if (Config::readConfig()) {
|
||||
checkIPAdress(false);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <regex>
|
||||
#include "IpHelper.h"
|
||||
|
||||
#include <climits>
|
||||
|
||||
bool IpHelper::isIpValid(std::string ip) {
|
||||
return (ip.find('.') != ULONG_MAX);
|
||||
bool IpHelper::isIpValid(const std::string& ip) {
|
||||
const std::regex rgx(R"(^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$)");
|
||||
return (std::regex_match(ip, rgx));
|
||||
}
|
||||
|
@ -1,5 +1,11 @@
|
||||
#include <IpHelper.h>
|
||||
#include <Logger.h>
|
||||
#include "api/IPAPI.h"
|
||||
|
||||
std::string IPAPI::getGlobalIp() {
|
||||
return request("https://api.ipify.org");
|
||||
const std::string ip = request("https://api.ipify.org");
|
||||
if(!IpHelper::isIpValid(ip))
|
||||
Logger::warning("no valid ip returned from ipapi");
|
||||
|
||||
return ip;
|
||||
}
|
@ -1,8 +1,6 @@
|
||||
#include "api/TelegramAPI.h"
|
||||
#include "Logger.h"
|
||||
|
||||
#include <climits>
|
||||
|
||||
int TelegramAPI::sendMessage(const std::string &text) {
|
||||
Hashmap<std::string, std::string> args;
|
||||
args.add("chat_id", chatid);
|
||||
@ -12,8 +10,8 @@ int TelegramAPI::sendMessage(const std::string &text) {
|
||||
|
||||
std::string reply = request("https://api.telegram.org/bot" + apikey + "/sendmessage", false, args, headers);
|
||||
|
||||
if (reply.find("\"error_code\"") != ULONG_MAX) {
|
||||
Logger::error("failed to refresh the ip (Dynu API)");
|
||||
if (reply.find("\"error_code\"") != SIZE_MAX) {
|
||||
Logger::error("failed to send the Telegram Message");
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
|
@ -1,84 +0,0 @@
|
||||
#include "MainWindow.h"
|
||||
#include "ui_mainwindow.h"
|
||||
|
||||
#include "api/IPAPI.h"
|
||||
#include "IPRefresher.h"
|
||||
#include "Config.h"
|
||||
#include "Logger.h"
|
||||
|
||||
#include <thread>
|
||||
|
||||
MainWindow::MainWindow() : QMainWindow(), ui(new Ui::MainWindow) {
|
||||
ui->setupUi(this);
|
||||
|
||||
// needs to be defined with new -- would be termintated after this constructor.
|
||||
new std::thread([this]() {
|
||||
IPAPI ipapi;
|
||||
std::string ip = ipapi.getGlobalIp();
|
||||
Logger::message("Current global IP: " + ip);
|
||||
std::string msg = "Your current global IP: " + ip;
|
||||
this->ui->labelCurrentIP->setText(msg.c_str());
|
||||
});
|
||||
|
||||
// set config info label and initial check if config is valid
|
||||
ui->labelConfig->setText(Config::validateConfig() ? "Config is: OK" : "Config is: NOT OK");
|
||||
|
||||
connect(ui->buttonCheckConfig, SIGNAL(clicked()), this, SLOT(checkConfigBtn()));
|
||||
connect(ui->buttonRefreshIP, SIGNAL(clicked()), this, SLOT(refreshIPBtn()));
|
||||
|
||||
connect(this, SIGNAL(appendLogField(QString)), ui->textLog, SLOT(appendPlainText(QString)));
|
||||
}
|
||||
|
||||
MainWindow::~MainWindow() {
|
||||
// todo check if disconnects are really necessary
|
||||
disconnect(ui->buttonCheckConfig);
|
||||
disconnect(ui->buttonRefreshIP);
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void MainWindow::checkConfigBtn() {
|
||||
Logger::message("checking config!");
|
||||
appendLogField("checking config!");
|
||||
|
||||
if (Config::validateConfig()) {
|
||||
Logger::message("Config file is OK");
|
||||
appendLogField("Config file is OK");
|
||||
ui->labelConfig->setText("Config is: OK");
|
||||
} else {
|
||||
Logger::error("There are errors in config file!");
|
||||
appendLogField("There are errors in config file!");
|
||||
}
|
||||
appendLogField("");
|
||||
}
|
||||
|
||||
void MainWindow::refreshIPBtn() {
|
||||
Logger::message("start refreshing Dynu IP.");
|
||||
appendLogField("");
|
||||
appendLogField("start refreshing Dynu IP.");
|
||||
new std::thread([this]() {
|
||||
if (Config::readConfig()) {
|
||||
int code = IPRefresher::checkIPAdress(false);
|
||||
switch (code) {
|
||||
case IPRefresher::Status_Code::SUCCESS:
|
||||
appendLogField("successfully refreshed IP!");
|
||||
break;
|
||||
case IPRefresher::Status_Code::NOREFRESH:
|
||||
appendLogField("IP is already correct.");
|
||||
break;
|
||||
case IPRefresher::Status_Code::ERROR_NO_INTERNET:
|
||||
appendLogField("Error: No Internet connection");
|
||||
break;
|
||||
case IPRefresher::Status_Code::ERROR:
|
||||
appendLogField("An error occured while refreshing.");
|
||||
break;
|
||||
default:
|
||||
appendLogField("An unknown error code occured");
|
||||
}
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
|
||||
Logger::message("Finished refreshing Dynu IP.");
|
||||
this->appendLogField("Finished refreshing Dynu IP.");
|
||||
});
|
||||
}
|
@ -1,50 +0,0 @@
|
||||
/**
|
||||
* Main GUI controller - User IO handlings
|
||||
*
|
||||
* @author Lukas Heiligenbrunner
|
||||
* @date 09.05.2020
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QtWidgets/QMainWindow>
|
||||
|
||||
namespace Ui {
|
||||
class MainWindow;
|
||||
}
|
||||
|
||||
class MainWindow : public QMainWindow {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
/**
|
||||
* constructor with basic initializations
|
||||
*/
|
||||
explicit MainWindow();
|
||||
|
||||
/**
|
||||
* destruct all gui elements
|
||||
*/
|
||||
~MainWindow();
|
||||
|
||||
private:
|
||||
Ui::MainWindow *ui;
|
||||
private slots:
|
||||
/**
|
||||
* executed click handler for config button
|
||||
*/
|
||||
void checkConfigBtn();
|
||||
|
||||
/**
|
||||
* executed click handler for refresh btn
|
||||
*/
|
||||
void refreshIPBtn();
|
||||
|
||||
signals:
|
||||
/**
|
||||
* append a String line to the Log field
|
||||
*
|
||||
* @param QString string to be appended
|
||||
*/
|
||||
void appendLogField(QString);
|
||||
};
|
@ -1,103 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>MainWindow</class>
|
||||
<widget class="QMainWindow" name="MainWindow">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>823</width>
|
||||
<height>618</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>MainWindow</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<widget class="QPushButton" name="buttonRefreshIP">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>290</x>
|
||||
<y>300</y>
|
||||
<width>91</width>
|
||||
<height>33</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Refresh IP</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="labelCurrentIP">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>40</x>
|
||||
<y>60</y>
|
||||
<width>301</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Your current global IP:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPlainTextEdit" name="textLog">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>40</x>
|
||||
<y>410</y>
|
||||
<width>691</width>
|
||||
<height>191</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="cursor" stdset="0">
|
||||
<cursorShape>IBeamCursor</cursorShape>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>40</x>
|
||||
<y>380</y>
|
||||
<width>64</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Log:</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QPushButton" name="buttonCheckConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>270</x>
|
||||
<y>140</y>
|
||||
<width>91</width>
|
||||
<height>33</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Check Config</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QLabel" name="labelConfig">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>270</x>
|
||||
<y>180</y>
|
||||
<width>141</width>
|
||||
<height>17</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Config is: undefined</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QStatusBar" name="statusbar"/>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
61
src/main.cpp
61
src/main.cpp
@ -1,6 +1,6 @@
|
||||
#include "Version.h"
|
||||
#include <CMDParser.h>
|
||||
#include <Logger.h>
|
||||
#include "IPRefresher.h"
|
||||
#include "Logger.h"
|
||||
#include "Config.h"
|
||||
#include "api/IPAPI.h"
|
||||
|
||||
@ -8,47 +8,26 @@
|
||||
* application entry point
|
||||
*/
|
||||
int main(int argc, char *argv[]) {
|
||||
if (argc > 1) {
|
||||
std::string firstarg(argv[1]);
|
||||
if (firstarg == "-h" || firstarg == "--help") {
|
||||
std::cout << "help page: " << std::endl << "[-h] [--help] print this help page" << std::endl
|
||||
<< "[-v] [--version] print the software version" << std::endl
|
||||
<< "[-f] [--force] force refresh of ip" << std::endl
|
||||
<< "[-l] [--loop] infinite loop to refresh ip every five minutes" << std::endl
|
||||
<< "[-c] [--checkconfig] validate configuration" << std::endl
|
||||
<< "[-ip] [--currentip] get current global ip" << std::endl
|
||||
<< "[no argument] normal ip check and refresh" << std::endl;
|
||||
} else if (firstarg == "-v" || firstarg == "--version") {
|
||||
std::cout << "Version " << Version::VERSION << std::endl;
|
||||
} else if (firstarg == "-f" || firstarg == "--force") {
|
||||
if (Config::readConfig()) {
|
||||
IPRefresher::checkIPAdress(true);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
CMDParser parser;
|
||||
CMDParser::Arguments *args = parser.parseArguments(argc, argv);
|
||||
|
||||
} else if (firstarg == "-l" || firstarg == "--loop") {
|
||||
IPRefresher::startUpService(true);
|
||||
} else if (firstarg == "-c" || firstarg == "--checkconfig") {
|
||||
if (Config::validateConfig()) {
|
||||
Logger::message("Config file is OK");
|
||||
} else {
|
||||
Logger::error("There are errors in config file!");
|
||||
return -1;
|
||||
}
|
||||
} else if (firstarg == "-ip" || firstarg == "--currentip") {
|
||||
IPAPI ipapi;
|
||||
std::cout << "Current global IP: " << ipapi.getGlobalIp() << std::endl;
|
||||
} else {
|
||||
Logger::message("wrong arguments! -h for help");
|
||||
}
|
||||
if (args->currentIP) {
|
||||
IPAPI ipapi;
|
||||
const std::string ip = ipapi.getGlobalIp();
|
||||
|
||||
std::cout << "Current global IP: " << ip << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
// loop mode
|
||||
if (args->loop)
|
||||
IPRefresher::startUpService(true);
|
||||
|
||||
// default mode
|
||||
if (Config::readConfig()) {
|
||||
IPRefresher::checkIPAdress(args->force);
|
||||
} else {
|
||||
Logger::message("starting check");
|
||||
if (Config::readConfig()) {
|
||||
IPRefresher::checkIPAdress(false);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
Logger::error("incorrect credentials!");
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -1,14 +0,0 @@
|
||||
#include <QApplication>
|
||||
#include "gui/MainWindow.h"
|
||||
|
||||
/**
|
||||
* application entry point
|
||||
*/
|
||||
int main(int argc, char *argv[]) {
|
||||
QApplication a(argc, argv);
|
||||
MainWindow w;
|
||||
w.setWindowTitle("startUpService");
|
||||
w.show();
|
||||
|
||||
return QApplication::exec();
|
||||
}
|
@ -4,7 +4,6 @@
|
||||
|
||||
#include <FileLogger.h>
|
||||
#include <api/IPAPI.h>
|
||||
#include <climits>
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
/**
|
||||
@ -21,7 +20,7 @@ TEST(ReadIp, testzeroIpIfNotExists) {
|
||||
TEST(IPAPI, testIpAPIcheckIPSyntax) {
|
||||
IPAPI ipapi;
|
||||
std::string ip = ipapi.getGlobalIp();
|
||||
if (ip.find('.') == ULONG_MAX) {
|
||||
if (ip.find('.') == SIZE_MAX) {
|
||||
// error when ip doesn't contain a .
|
||||
ASSERT_TRUE(false);
|
||||
} else {
|
||||
|
Reference in New Issue
Block a user