add INI config file support via libinih #153

- introduce --conf option to load runtime settings from INI
- enforce precedence: defaults < config file < CLI arguments

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>

Author: zhaojh329

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
           name: ${{ matrix.name }}
           pkg: ${{ matrix.pkg }}
         run: |
-          sudo apt install -y libev-dev
+          sudo apt install -y libev-dev libinih-dev
           [ -n "$pkg" ] && sudo apt install -y $pkg
           [ "$name" = "none" ] && cmake . -DSSL_SUPPORT=OFF || cmake . -DUSE_$name=ON
           make

README.md

@@ -128,6 +128,7 @@ Trusted by leading technology companies:
 ### C Client Dependencies
 - **Required:**
   - [libev] - High-performance event loop library
+  - [inih](https://github.com/benhoyt/inih) - Lightweight INI parser for loading rtty config file
 - **Optional (for SSL support):**
   - [mbedtls(polarssl)] - Lightweight SSL/TLS library
   - [CyaSSl(wolfssl)] - Embedded SSL/TLS library

README_ZH.md

@@ -126,6 +126,7 @@ rtty 非常适合远程维护和管理大规模分布式Linux设备，是企业
 ### C 语言客户端依赖
 - **必需组件**
   - [libev] - 高性能事件循环库
+  - [inih](https://github.com/benhoyt/inih) - 轻量级 INI 解析库，用于加载 rtty 配置文件
 - **可选组件（SSL支持）**
   - [mbedtls(polarssl)] - 轻量级SSL/TLS库
   - [CyaSSl(wolfssl)] - 嵌入式SSL/TLS库

rtty.ini

@@ -0,0 +1,23 @@
+; rtty configuration example
+; Priority: defaults < config file < command line
+
+[rtty]
+id = device-001
+group = default
+host = 127.0.0.1
+port = 5912
+heartbeat = 30
+http-timeout = 30
+description = edge gateway in room A
+token = your-token
+username = root
+reconnect = true
+verbose = false
+background = false
+
+[ssl]
+enabled = false
+insecure = false
+; cacert = /etc/ssl/certs/ca-certificates.crt
+; cert = /etc/rtty/client.crt
+; key = /etc/rtty/client.key

src/CMakeLists.txt

@@ -3,18 +3,30 @@ set(RTTY_VERSION_MAJOR 9)
 set(RTTY_VERSION_MINOR 0)
 set(RTTY_VERSION_PATCH 4)
 
+include(FindPkgConfig)
+
 # Check the third party Libraries
 find_package(Libev REQUIRED)
 
+pkg_search_module(LIBINIH inih)
+if (NOT LIBINIH_FOUND)
+    message(FATAL_ERROR "libinih is required.")
+endif()
+
 aux_source_directory(. SRCS)
 aux_source_directory(log SRCS)
 aux_source_directory(buffer SRCS)
 
 add_executable(rtty ${SRCS})
 target_compile_definitions(rtty PRIVATE _GNU_SOURCE)
 target_compile_options(rtty PRIVATE -O -Wall -Werror --std=gnu99)
-target_include_directories(rtty PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/buffer ${LIBEV_INCLUDE_DIR})
-target_link_libraries(rtty PRIVATE ${LIBEV_LIBRARY} util crypt m)
+target_include_directories(rtty PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/buffer
+    ${LIBEV_INCLUDE_DIR}
+    ${LIBINIH_INCLUDE_DIRS}
+)
+target_link_libraries(rtty PRIVATE ${LIBEV_LIBRARY} ${LIBINIH_LIBRARIES} util crypt m)
 
 add_subdirectory(ssl)