cleanup

CMakeLists.txt

@@ -1,12 +1,15 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.12)
 project(cannelloni)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 # Options
 option(SCTP_SUPPORT "SCTP_SUPPORT" ON)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
 
 if(SCTP_SUPPORT)
   include(FindSCTP)
@@ -20,19 +23,6 @@ if(NOT SCTP_FOUND AND SCTP_SUPPORT)
   message(STATUS "Install lksctp-tools for SCTP.")
 endif(NOT SCTP_FOUND AND SCTP_SUPPORT)
 
-find_file(LINUX_VERSION_H "linux/version.h")
-if(LINUX_VERSION_H)
-  execute_process(
-    COMMAND sed -n "s/#define\\s\\+LINUX_VERSION_CODE\\s\\+\\([0-9]\\+\\)/\\1/p" ${LINUX_VERSION_H}
-    OUTPUT_VARIABLE LINUX_VERSION_CODE
-  )
-  if(LINUX_VERSION_CODE LESS 198144)
-    # The Linux Kernel headers are older than version 3.6
-    # We need to use the ones shipped with cannelloni
-    include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/include)
-  endif()
-endif()
-
 CONFIGURE_FILE(
   ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
   ${CMAKE_CURRENT_BINARY_DIR}/config.h

canthread.cpp

@@ -61,7 +61,8 @@ int CANThread::start() {
     return -1;
   }
   /* Determine the index of m_canInterfaceName */
-  strncpy(canInterface.ifr_name, m_canInterfaceName.c_str(), IFNAMSIZ);
+  strncpy(canInterface.ifr_name, m_canInterfaceName.c_str(), IFNAMSIZ-1);
+  canInterface.ifr_name[IF_NAMESIZE-1] = '\0';
   if (ioctl(m_canSocket, SIOCGIFINDEX, &canInterface) < 0) {
     lerror << "Could get index of interface >" << m_canInterfaceName << "<" << std::endl;
     return -1;