From e18aed70c85d778c66412c01d5d1fc2a06708aed Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Wed, 23 Aug 2017 12:38:47 +0200 Subject: lib: Remove bad assertion Timeout was asserted not to be NULL, but sometimes timeout can be NULL and is a valid parameter when NULL. --- src/lib/dev.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/lib/dev.c b/src/lib/dev.c index c21e621a..b6c6087f 100644 --- a/src/lib/dev.c +++ b/src/lib/dev.c @@ -478,7 +478,6 @@ static int frcti_event_wait(struct flow_set * set, assert(set); assert(fq); - assert(timeout); timerwheel_move(ai.tw); -- cgit v1.2.3 From 3c1f1088bdfc369a91f3b52d5a69552acc5e268d Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Wed, 23 Aug 2017 12:39:40 +0200 Subject: ipcpd: shim-eth-llc: Fix building LLC shim The LLC shim was not being built even though it should be build. This is due to CMake behaviour that when you set a var in the parent scope, it is not set in the local scope. It also adds back THIS_TYPE to the shim-eth-llc. --- src/ipcpd/shim-eth-llc/CMakeLists.txt | 5 ++++- src/ipcpd/shim-eth-llc/main.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/ipcpd/shim-eth-llc/CMakeLists.txt b/src/ipcpd/shim-eth-llc/CMakeLists.txt index 6474eb8d..e10a715f 100644 --- a/src/ipcpd/shim-eth-llc/CMakeLists.txt +++ b/src/ipcpd/shim-eth-llc/CMakeLists.txt @@ -25,6 +25,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux") if (NOT DISABLE_RAW_SOCKETS) message(STATUS "Raw socket support for shim-eth-llc enabled") set(HAVE_RAW_SOCKETS TRUE PARENT_SCOPE) + set(HAVE_LLC TRUE) else () message(STATUS "Raw socket support for shim-eth-llc disabled by user") endif () @@ -45,6 +46,7 @@ if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") message(STATUS "Berkeley Packet Filter support " "for shim-eth-llc enabled") set(HAVE_BPF TRUE PARENT_SCOPE) + set(HAVE_LLC TRUE) else () message(STATUS "Berkeley Packet Filter support " "for shim-eth-llc disabled by user") @@ -59,12 +61,13 @@ if (NETMAP_C_INCLUDE_DIR) message(STATUS "Netmap support for shim-eth-llc enabled") set(HAVE_NETMAP TRUE PARENT_SCOPE) test_and_set_c_compiler_flag_global(-std=c99) + set(HAVE_LLC TRUE) else () message(STATUS "Netmap support for shim-eth-llc disabled by user") endif () endif () -if (HAVE_NETMAP OR HAVE_BPF OR HAVE_RAW_SOCKETS) +if (HAVE_LLC) message(STATUS "Supported raw Ethernet API found, building shim-eth-llc") protobuf_generate_c(SHIM_ETH_LLC_PROTO_SRCS SHIM_ETH_LLC_PROTO_HDRS shim_eth_llc_messages.proto) diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c index 37df964b..bcf5abe2 100644 --- a/src/ipcpd/shim-eth-llc/main.c +++ b/src/ipcpd/shim-eth-llc/main.c @@ -20,8 +20,6 @@ * Foundation, Inc., http://www.fsf.org/about/contact/. */ - - #ifdef __APPLE__ #define _BSD_SOURCE #define _DARWIN_C_SOURCE @@ -89,6 +87,8 @@ #include #endif +#define THIS_TYPE IPCP_SHIM_ETH_LLC + #define MGMT_SAP 0x01 #define MAC_SIZE 6 #define LLC_HEADER_SIZE 3 -- cgit v1.2.3