projects
/
oweals
/
nmrpflash.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
705d4d4
)
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 90fd71fd864dcd5b5961aca862709112aebe85e9..5798d1cdf5f391ad1eb0ccb1e47bc2dd70421455 100644
(file)
--- a/
ethsock.c
+++ b/
ethsock.c
@@
-171,11
+171,17
@@
static bool get_intf_info(const char *intf, uint8_t *hwaddr, bool *bridge)
found = false;
*bridge = false;
+ if (bridge) {
+ *bridge = false;
+ }
+
for (ifa = ifas; ifa; ifa = ifa->ifa_next) {
if (!strcmp(ifa->ifa_name, intf)) {
if (sockaddr_get_hwaddr(ifa->ifa_addr, hwaddr)) {
#ifdef NMRPFLASH_BSD
- *bridge = ((struct if_data*) ifa->ifa_data)->ifi_type == IFT_BRIDGE;
+ if (bridge) {
+ *bridge = ((struct if_data*) ifa->ifa_data)->ifi_type == IFT_BRIDGE;
+ }
#endif
found = true;
break;