From a348b4b4b7aa256d4d2807809bcc6de9926ef4cb Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Sun, 20 Sep 2020 17:17:11 -0700 Subject: [PATCH] fd-net-device: Handle case in which PACKET_QDISC_BYPASS is undefined --- src/fd-net-device/helper/emu-fd-net-device-helper.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/fd-net-device/helper/emu-fd-net-device-helper.cc b/src/fd-net-device/helper/emu-fd-net-device-helper.cc index ed9447feb..42ee7cc4b 100644 --- a/src/fd-net-device/helper/emu-fd-net-device-helper.cc +++ b/src/fd-net-device/helper/emu-fd-net-device-helper.cc @@ -180,6 +180,7 @@ EmuFdNetDeviceHelper::SetFileDescriptor (Ptr device) const if (m_hostQdiscBypass) { +#ifdef PACKET_QDISC_BYPASS static const int32_t sock_qdisc_bypass = 1; int32_t sock_qdisc_ret = setsockopt (fd, SOL_PACKET, PACKET_QDISC_BYPASS, &sock_qdisc_bypass, sizeof (sock_qdisc_bypass)); @@ -188,6 +189,10 @@ EmuFdNetDeviceHelper::SetFileDescriptor (Ptr device) const { NS_LOG_ERROR ("Cannot use the qdisc bypass option"); } +#else + // PACKET_QDISC_BYPASS is defined since Linux 3.14 + NS_LOG_ERROR ("PACKET_QDISC_BYPASS undefined; cannot use the qdisc bypass option"); +#endif } //