Code modernization mega commit

- Run github actions on Ubuntu 22.04
- Build with gcc-12 and clang-15
- clang-tidy exclude list updated from scratch
- Using "-gdwarf-4" because of:
  llvm/llvm-project#56550
- Added (void) to ignore return values
- Added void if no function parameter is used
- Default version string updated
- valgrind suppression file added
- Timeouts raised in case of valgrind test:
  more important to run stable

Author: baranyaib90

.github/workflows/cmake.yml

@@ -8,26 +8,27 @@ jobs:
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
-        compiler: [gcc-10, clang-12]
+        compiler: [gcc-12, clang-15]
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@main
 
     - name: Update APT
       run: sudo apt-get update
 
     - name: Setup Dependencies
-      run: sudo apt-get install cmake libc-ares-dev libcurl4-openssl-dev libev-dev build-essential clang-tidy-12 ${{ matrix.compiler }} dnsutils python3-pip valgrind
+      run: sudo apt-get install cmake libc-ares-dev libcurl4-openssl-dev libev-dev build-essential clang-tidy-15 ${{ matrix.compiler }} dnsutils python3-pip valgrind
 
     - name: Setup Robot Framework
       run: sudo pip3 install robotframework
 
     - name: Set clang-tidy
-      run: sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-12 100
+      run: sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 100
 
     - name: Configure CMake
       env:
@@ -43,7 +44,7 @@ jobs:
     - name: Test
       run: make -C ${{github.workspace}}/ test ARGS="--verbose"
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       if: ${{ success() || failure() }}
       with:
         name: robot-logs-${{ matrix.compiler }}

CMakeLists.txt

@@ -1,5 +1,5 @@
-project(HttpsDnsProxy C)
 cmake_minimum_required(VERSION 3.7)
+project(HttpsDnsProxy C)
 
 # FUNCTIONS
 
@@ -26,7 +26,7 @@ if (NOT CMAKE_INSTALL_BINDIR)
 endif()
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra --pedantic -Wno-strict-aliasing -Wno-variadic-macros")
-set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG")
+set(CMAKE_C_FLAGS_DEBUG "-gdwarf-4 -DDEBUG")
 set(CMAKE_C_FLAGS_RELEASE "-O2")
 
 if ((CMAKE_C_COMPILER_ID MATCHES GNU   AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 9) OR
@@ -92,7 +92,7 @@ if(NOT CLANG_TIDY_EXE)
   message(STATUS "clang-tidy not found.")
 else()
   message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
-  set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-fix" "-checks=*,-clang-analyzer-alpha.*,-misc-unused-parameters,-cert-err34-c,-google-readability-todo,-hicpp-signed-bitwise,-cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers,-gnu-folding-constant,-gnu-zero-variadic-macro-arguments,-readability-function-cognitive-complexity,-concurrency-mt-unsafe")
+  set(DO_CLANG_TIDY "${CLANG_TIDY_EXE}" "-fix" "-checks=*,-cert-err34-c,-readability-identifier-length,-altera-unroll-loops,-bugprone-easily-swappable-parameters,-concurrency-mt-unsafe,-*magic-numbers,-hicpp-signed-bitwise,-readability-function-cognitive-complexity,-altera-id-dependent-backward-branch,-google-readability-todo")
 endif()
 
 # BUILD

src/logging.c

@@ -26,7 +26,7 @@ static void logging_timer_cb(struct ev_loop __attribute__((unused)) *loop,
                              ev_timer __attribute__((unused)) *w,
                              int __attribute__((unused)) revents) {
   if (logf) {
-    fflush(logf);
+    (void)fflush(logf);
   }
 }
 
@@ -47,20 +47,20 @@ void logging_flush_cleanup(struct ev_loop *loop) {
 
 void logging_init(int fd, int level) {
   if (logf) {
-    fclose(logf);
+    (void)fclose(logf);
   }
   logf = fdopen(fd, "a");
   loglevel = level;
 }
 
-void logging_cleanup() {
+void logging_cleanup(void) {
   if (logf) {
-    fclose(logf);
+    (void)fclose(logf);
   }
   logf = NULL;
 }
 
-int logging_debug_enabled() {
+int logging_debug_enabled(void) {
   return loglevel <= LOG_DEBUG;
 }
 
@@ -78,18 +78,18 @@ void _log(const char *file, int line, int severity, const char *fmt, ...) {
 
   struct timeval tv;
   gettimeofday(&tv, NULL);
-  fprintf(logf, "%s %8lu.%06lu %s:%d ", SeverityStr[severity],
+  (void)fprintf(logf, "%s %8lu.%06lu %s:%d ", SeverityStr[severity],
           (uint64_t)tv.tv_sec,
           (uint64_t)tv.tv_usec, file, line);
 
   va_list args;
   va_start(args, fmt);
-  vfprintf(logf, fmt, args);
+  (void)vfprintf(logf, fmt, args);
   va_end(args);
-  fprintf(logf, "\n");
+  (void)fprintf(logf, "\n");
 
   if (severity >= LOG_FLUSH_LEVEL) {
-    fflush(logf);
+    (void)fflush(logf);
   }
   if (severity == LOG_FATAL) {
 #ifdef DEBUG

src/logging.h

@@ -16,10 +16,10 @@ void logging_flush_init(struct ev_loop *loop);
 void logging_flush_cleanup(struct ev_loop *loop);
 
 // Cleans up and flushes open logs.
-void logging_cleanup();
+void logging_cleanup(void);
 
 // Returns 1 if debug logging is enabled.
-int logging_debug_enabled();
+int logging_debug_enabled(void);
 
 // Internal. Don't use.
 void _log(const char *file, int line, int severity, const char *fmt, ...);

src/main.c

@@ -169,7 +169,7 @@ static void dns_poll_cb(const char* hostname, void *data,
   memset(buf, 0, sizeof(buf)); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
   if (strlen(hostname) > 254) { FLOG("Hostname too long."); }
   int ip_start = snprintf(buf, sizeof(buf) - 1, "%s:443:", hostname);  // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
-  snprintf(buf + ip_start, sizeof(buf) - 1 - ip_start, "%s", addr_list); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
+  (void)snprintf(buf + ip_start, sizeof(buf) - 1 - ip_start, "%s", addr_list); // NOLINT(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
   if (app->resolv && app->resolv->data) {
     char * old_addr_list = strstr(app->resolv->data, ":443:");
     if (old_addr_list) {

src/options.c

@@ -20,11 +20,11 @@ DEFAULT_HTTP_VERSION = 2
 };
 
 
-const char * options_sw_version() {
+const char * options_sw_version(void) {
 #ifdef SW_VERSION
   return SW_VERSION;
 #else
-  return "2023.01.01-atLeast";  // update date sometimes, like 1-2 times a year
+  return "2023.10.10-atLeast";  // update date sometimes, like 1-2 times a year
 #endif
 }
 

src/options.h

@@ -57,7 +57,7 @@ typedef struct Options options_t;
 #ifdef __cplusplus
 extern "C" {
 #endif
-const char * options_sw_version();
+const char * options_sw_version(void);
 void options_init(struct Options *opt);
 int options_parse_args(struct Options *opt, int argc, char **argv);
 void options_show_usage(int argc, char **argv);

tests/robot/functional_tests.robot

@@ -33,17 +33,17 @@ Start Proxy
 
 Start Proxy With Valgrind
   [Arguments]  @{args}
-  @{default_args} =  Create List  --track-fds=yes  --time-stamp=yes  --log-file=valgrind-%p.log
+  @{default_args} =  Create List  --track-fds=yes  --time-stamp=yes  --log-file=valgrind-%p.log  --suppressions=valgrind.supp
   ...  --gen-suppressions=all  --tool=memcheck  --leak-check=full  --leak-resolution=high
   ...  --show-leak-kinds=all  --track-origins=yes  --keep-stacktraces=alloc-and-free
   ...  ${BINARY_PATH}  -v  -v  -v  -4  -p  ${PORT}
   @{proces_args} =  Combine Lists  ${default_args}  ${args}
   ${proxy} =  Start Process  valgrind  @{proces_args}
   ...  stderr=STDOUT  alias=proxy
   Set Test Variable  ${proxy}
-  Set Test Variable  ${dig_timeout}  4
+  Set Test Variable  ${dig_timeout}  10
   Set Test Variable  ${dig_retry}  2
-  Sleep  3  # wait for valgrind to fire up the proxy
+  Sleep  6  # wait for valgrind to fire up the proxy
   Common Test Setup
 
 Stop Proxy
@@ -68,7 +68,7 @@ Start Dig
 
 Stop Dig
   [Arguments]  ${handle}
-  ${result} =  Wait For Process  ${handle}  timeout=10 secs
+  ${result} =  Wait For Process  ${handle}  timeout=15 secs
   Log  ${result.stdout}
   Should Be Equal As Integers  ${result.rc}  0
   Should Contain  ${result.stdout}  ANSWER SECTION

tests/robot/valgrind.supp

@@ -0,0 +1,18 @@
+{
+   ignore dlopen
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:_dl_open
+}
+{
+   curl version ldap dependency
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   ...
+   fun:ldap_int_sasl_init
+   fun:ldap_int_initialize
+   fun:ldap_get_option
+   fun:curl_version
+   fun:main
+}