36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
|
From 99e2651c08f6d4ac63fc9d8e4d11f680fa5cc274 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jan Synacek <jsynacek@redhat.com>
|
||
|
|
Date: Thu, 22 Nov 2012 09:42:51 +0100
|
||
|
|
Subject: [PATCH] arping: Fix find_device_by_ifaddrs()
|
||
|
|
|
||
|
|
Look for another device if the device name and the currently found one are the
|
||
|
|
same, not different.
|
||
|
|
|
||
|
|
Also, make checking for the device's flags nonfatal.
|
||
|
|
|
||
|
|
Signed-off-by: Jan Synacek <jsynacek@redhat.com>
|
||
|
|
---
|
||
|
|
arping.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arping.c b/arping.c
|
||
|
|
index ff77bec..d0edccf 100644
|
||
|
|
--- a/arping.c
|
||
|
|
+++ b/arping.c
|
||
|
|
@@ -550,10 +550,10 @@ static int find_device_by_ifaddrs(void)
|
||
|
|
continue;
|
||
|
|
if (ifa->ifa_addr->sa_family != AF_PACKET)
|
||
|
|
continue;
|
||
|
|
- if (device.name && ifa->ifa_name && strcmp(ifa->ifa_name, device.name))
|
||
|
|
+ if (device.name && ifa->ifa_name && !strcmp(ifa->ifa_name, device.name))
|
||
|
|
continue;
|
||
|
|
|
||
|
|
- if (check_ifflags(ifa->ifa_flags, device.name != NULL) < 0)
|
||
|
|
+ if (check_ifflags(ifa->ifa_flags, 0) < 0)
|
||
|
|
continue;
|
||
|
|
|
||
|
|
if (!((struct sockaddr_ll *)ifa->ifa_addr)->sll_halen)
|
||
|
|
--
|
||
|
|
1.7.11.7
|
||
|
|
|