Merge pull request #87 from microsoft/nl80211msgparse

Implement nl80211 message parsing.
microsoft · Jan 1, 2024 · e11f328 · e11f328
2 parents 073506e + e8f1b38
commit e11f328
Show file tree

Hide file tree

Showing 7 changed files with 571 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,12 +125,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GN
     endif()
   endif()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-  # TODO
+  # Nothing special needed for MSVC at the moment.
 endif()
 
-if (CMAKE_BUILD_TYPE MATCHES "(Release|RelWithDebInfo|MinSizeRel)")
-  add_compile_definitions(_FORTIFY_SOURCE=2)
-endif()
+# Add conditional compile definitions based on build type.
+add_compile_definitions("$<$<CONFIG:Debug>:DEBUG>")
+add_compile_definitions("$<$<CONFIG:Release,RelWithDebInfo,MinSizeRel>:_FORTIFY_SOURCE=2>")
 
 # Common source directories
 set(NETREMOTE_DIR_SRC ${CMAKE_CURRENT_LIST_DIR}/src)

diff --git a/src/linux/libnl-helpers/CMakeLists.txt b/src/linux/libnl-helpers/CMakeLists.txt
@@ -7,6 +7,7 @@ set(LIBNL_HELPERS_PUBLIC_INCLUDE_PREFIX ${LIBNL_HELPERS_PUBLIC_INCLUDE}/${LIBNL_
 
 target_sources(libnl-helpers
     PRIVATE
+        Netlink80211.cxx
         NetlinkSocket.cxx
         NetlinkMessage.cxx
     PUBLIC
@@ -15,6 +16,7 @@ target_sources(libnl-helpers
     FILES
         ${LIBNL_HELPERS_PUBLIC_INCLUDE_PREFIX}/NetlinkMessage.hxx
         ${LIBNL_HELPERS_PUBLIC_INCLUDE_PREFIX}/NetlinkSocket.hxx
+        ${LIBNL_HELPERS_PUBLIC_INCLUDE_PREFIX}/nl80211/Netlink80211.hxx
 )
 
 target_link_libraries(libnl-helpers