From 19d82f46d029f3e9f1d8b5ae3e11501a5a6cc7b0 Mon Sep 17 00:00:00 2001 From: Ralph Metzler Date: Wed, 13 Apr 2016 15:48:30 +0200 Subject: [PATCH] fix zcip arp error --- busybox-0001-Fix-zcip-arp-compare.patch | 12 ++++++++++++ mk.patch | 1 + 2 files changed, 13 insertions(+) create mode 100644 busybox-0001-Fix-zcip-arp-compare.patch diff --git a/busybox-0001-Fix-zcip-arp-compare.patch b/busybox-0001-Fix-zcip-arp-compare.patch new file mode 100644 index 0000000..6822bf8 --- /dev/null +++ b/busybox-0001-Fix-zcip-arp-compare.patch @@ -0,0 +1,12 @@ +diff -rup busybox-1.23.1.orig/networking/zcip.c busybox-1.23.1/networking/zcip.c +--- busybox-1.23.1.orig/networking/zcip.c 2015-01-27 09:48:58.000000000 +0100 ++++ busybox-1.23.1/networking/zcip.c 2016-04-13 15:36:12.255391459 +0200 +@@ -521,7 +521,7 @@ int zcip_main(int argc UNUSED_PARAM, cha + target_ip_conflict = 0; + + if (memcmp(&p.arp.arp_sha, ð_addr, ETH_ALEN) != 0) { +- if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr))) { ++ if (memcmp(p.arp.arp_spa, &ip.s_addr, sizeof(struct in_addr)) == 0) { + /* A probe or reply with source_ip == chosen ip */ + source_ip_conflict = 1; + } diff --git a/mk.patch b/mk.patch index 172778f..02823e2 100755 --- a/mk.patch +++ b/mk.patch @@ -14,6 +14,7 @@ if [ ! -e buildroot ]; then tar xf buildroot-2015.02-rc2.tar.bz2 mv buildroot-2015.02-rc2 buildroot cp dvb-apps-0002-Fix-broken-bitops-on-arm.patch buildroot/package/dvb-apps/ + cp busybox-0001-Fix-zcip-arp-compare.patch buildroot/package/busybox/ if [ -e dl ]; then ln -sf ../dl buildroot fi