From 4533e0ab1214f0bfd9194292ff2530130512e42a Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 21 Jan 2019 22:14:41 +0100 Subject: [PATCH] netem: fix defines and includes --- include/villas/node.h | 12 ++++++++---- include/villas/nodes/socket.h | 5 ----- lib/node.c | 7 +++++++ lib/nodes/rtp.c | 4 ++++ lib/nodes/socket.c | 5 +++++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/include/villas/node.h b/include/villas/node.h index 94e59d9de..4c34503b4 100644 --- a/include/villas/node.h +++ b/include/villas/node.h @@ -38,15 +38,19 @@ #include #include +#if defined(LIBNL3_ROUTE_FOUND) && defined(__linux__) + #define WITH_NETEM +#endif /* LIBNL3_ROUTE_FOUND */ + #ifdef __cplusplus extern "C" { #endif /* Forward declarations */ -#ifdef __linux__ +#ifdef WITH_NETEM struct rtnl_qdisc; struct rtnl_cls; -#endif /* __linux__ */ +#endif /* WITH_NETEM */ struct node_direction { int enabled; @@ -82,12 +86,12 @@ struct node struct vlist signals; /**< Signal meta data for data which is __received__ by node_read(). */ -#ifdef __linux__ +#ifdef WITH_NETEM int mark; /**< Socket mark for netem, routing and filtering */ struct rtnl_qdisc *tc_qdisc; /**< libnl3: Network emulator queuing discipline */ struct rtnl_cls *tc_classifier; /**< libnl3: Firewall mark classifier */ -#endif /* __linux__ */ +#endif /* WITH_NETEM */ struct node_type *_vt; /**< Virtual functions (C++ OOP style) */ void *_vd; /**< Virtual data (used by struct node::_vt functions) */ diff --git a/include/villas/nodes/socket.h b/include/villas/nodes/socket.h index 0df901731..81e2c4d30 100644 --- a/include/villas/nodes/socket.h +++ b/include/villas/nodes/socket.h @@ -38,11 +38,6 @@ #include #if defined(LIBNL3_ROUTE_FOUND) && defined(__linux__) - #include - #include - #include - - #define WITH_NETEM #define WITH_SOCKET_LAYER_ETH #include diff --git a/lib/node.c b/lib/node.c index e47649c1b..8728716a5 100644 --- a/lib/node.c +++ b/lib/node.c @@ -33,6 +33,13 @@ #include #include +#ifdef WITH_NETEM + #include + #include + #include + #include +#endif /* WITH_NETEM */ + static int node_direction_init2(struct node_direction *nd, struct node *n) { #ifdef WITH_HOOKS diff --git a/lib/nodes/rtp.c b/lib/nodes/rtp.c index e69b2ad12..6c09ed826 100644 --- a/lib/nodes/rtp.c +++ b/lib/nodes/rtp.c @@ -45,6 +45,10 @@ #include #include +#ifdef WITH_NETEM + #include +#endif /* WITH_NETEM */ + static pthread_t re_pthread; /* Forward declartions */ diff --git a/lib/nodes/socket.c b/lib/nodes/socket.c index 21e60bfab..b845eafc0 100644 --- a/lib/nodes/socket.c +++ b/lib/nodes/socket.c @@ -42,6 +42,11 @@ #include #endif /* WITH_SOCKET_LAYER_ETH */ +#ifdef WITH_NETEM + #include + #include +#endif /* WITH_NETEM */ + /* Forward declartions */ static struct plugin p;