projects
/
oweals
/
nmrpflash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
a71b48b
)
Merge branch 'master' of github.com:jclehner/nmrpflash
author
Joseph C. Lehner
<joseph.c.lehner@gmail.com>
Mon, 13 Feb 2017 14:12:22 +0000
(16:12 +0200)
committer
Joseph C. Lehner
<joseph.c.lehner@gmail.com>
Mon, 13 Feb 2017 14:12:22 +0000
(16:12 +0200)
ethsock.c
patch
|
blob
|
history
diff --git
a/ethsock.c
b/ethsock.c
index 1cbc5da9befb77e268aedf40077e067e10154424..5798d1cdf5f391ad1eb0ccb1e47bc2dd70421455 100644
(file)
--- a/
ethsock.c
+++ b/
ethsock.c
@@
-169,6
+169,7
@@
static bool get_intf_info(const char *intf, uint8_t *hwaddr, bool *bridge)
}
found = false;
+ *bridge = false;
if (bridge) {
*bridge = false;
@@
-624,6
+625,7
@@
int ethsock_arp_del(struct ethsock *sock, struct ethsock_arp_undo **undo)
static bool get_hwaddr_from_pcap(const pcap_if_t *dev, uint8_t *hwaddr)
{
+ bool is_bridge;
#ifndef NMRPFLASH_WINDOWS
pcap_addr_t *addr;
int i;
@@
-644,7
+646,7
@@
static bool get_hwaddr_from_pcap(const pcap_if_t *dev, uint8_t *hwaddr)
}
#endif
- return get_intf_info(dev->name, hwaddr,
NULL
);
+ return get_intf_info(dev->name, hwaddr,
&is_bridge
);
}
int ethsock_list_all(void)