From 5aa009c7e617d607611316c71268cf44dff372f1 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 18 Jan 2017 01:57:17 +0100 Subject: [PATCH] ndppd: fix compilation with modern gcc Import upstream commit "f19fa4b Fix a cast so it can be compiled with gcc-6" in order to fix building ndppd with recent gcc versions. Fixes the following error spotted by the build bots: src/iface.cc: In static member function 'static ndppd::ptr ndppd::iface::open_pfd(const string&)': src/iface.cc:153:5: error: narrowing conversion of '-1' from 'int' to '__u32 {aka unsigned int}' inside { } [-Wnarrowing] Signed-off-by: Jo-Philipp Wich --- ndppd/patches/0002-upstream-cast-fix.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 ndppd/patches/0002-upstream-cast-fix.patch diff --git a/ndppd/patches/0002-upstream-cast-fix.patch b/ndppd/patches/0002-upstream-cast-fix.patch new file mode 100644 index 0000000..555a198 --- /dev/null +++ b/ndppd/patches/0002-upstream-cast-fix.patch @@ -0,0 +1,22 @@ +From f19fa4be6ac87032c01f2db57ccb484f83c62604 Mon Sep 17 00:00:00 2001 +From: Daniel Adolfsson +Date: Fri, 8 Apr 2016 13:32:22 +0200 +Subject: [PATCH] Fix a cast so it can be compiled with gcc-6 + +--- + src/iface.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/iface.cc b/src/iface.cc +index 3ce893f..5f165eb 100644 +--- a/src/iface.cc ++++ b/src/iface.cc +@@ -147,7 +147,7 @@ ptr iface::open_pfd(const std::string& name) + // Bail if it's* not* ND_NEIGHBOR_SOLICIT. + BPF_JUMP(BPF_JMP | BPF_JEQ | BPF_K, ND_NEIGHBOR_SOLICIT, 0, 1), + // Keep packet. +- BPF_STMT(BPF_RET | BPF_K, -1), ++ BPF_STMT(BPF_RET | BPF_K, (u_int32_t)-1), + // Drop packet. + BPF_STMT(BPF_RET | BPF_K, 0) + }; -- 2.30.2