abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-13 19:13:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

let ip4/6_input_accept return int instead of netif*

Browse Source
This commit is contained in:
goldsimon
2017-03-01 14:16:27 +01:00
parent 18c7c5d81c
commit f978a7ed31
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/ipv6/ip6.c
View File

@@ -458,7 +458,7 @@ ip6_forward(struct pbuf *p, struct ip6_hdr *iphdr, struct netif *inp)
#endif /* LWIP_IPV6_FORWARD */
/** Return true if the current input packet should be accepted on this netif */
static struct netif*
static int
ip6_input_accept(struct netif *netif)
{
/* interface is up? */
@@ -477,11 +477,11 @@ ip6_input_accept(struct netif *netif)
#endif /* IPV6_CUSTOM_SCOPES */
) {
/* accept on this netif */
return netif;
return 1;
}
}
}
return NULL;
return 0;
}
/**
@@ -612,8 +612,9 @@ ip6_input(struct pbuf *p, struct netif *inp)
} else {
/* start trying with inp. if that's not acceptable, start walking the
list of configured netifs. */
netif = ip6_input_accept(inp);
if (netif == NULL) {
if (ip6_input_accept(inp)) {
netif = inp;
} else {
#if !IPV6_CUSTOM_SCOPES
/* Shortcut: stop looking for other interfaces if either the source or
* the destination has a scope constrained to this interface. Custom