kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-27 07:21:18 +01:00
Code Releases Activity

pkg/lwip: Use NETIF_FOREACH macro in sock implementation

Browse Source 
Decreases dependency on lwIP internals, and will handle LWIP_SINGLE_NETIF.
This commit is contained in:
Erik Ekman 2021-03-05 00:02:38 +01:00
parent e8cc3c6194
commit d3ba3117f2
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/lwip/contrib/sock/ip/lwip_sock_ip.c
View File

@ -25,6 +25,7 @@
#include "lwip/api.h"
#include "lwip/ip4.h"
#include "lwip/ip6.h"
#include "lwip/netif.h"
#include "lwip/opt.h"
#include "lwip/sys.h"
#include "lwip/sock_internal.h"
@ -79,7 +80,9 @@ static uint16_t _ip4_addr_to_netif(const ip4_addr_p_t *addr)
assert(addr != NULL);
if (!ip4_addr_isany(addr)) {
for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
struct netif *netif;
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (netif_ip4_addr(netif)->addr == addr->addr) {
return (int)netif->num + 1;
}
@ -97,7 +100,9 @@ static uint16_t _ip6_addr_to_netif(const ip6_addr_p_t *_addr)
assert(_addr != NULL);
ip6_addr_copy_from_packed(addr, *_addr);
if (!ip6_addr_isany_val(addr)) {
for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
struct netif *netif;
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (netif_get_ip6_addr_match(netif, &addr) >= 0) {
return (int)netif->num + 1;
}

13
pkg/lwip/contrib/sock/lwip_sock.c
View File

@ -23,6 +23,7 @@
#include "lwip/err.h"
#include "lwip/ip.h"
#include "lwip/netif.h"
#include "lwip/tcp.h"
#include "lwip/netif.h"
#include "lwip/opt.h"
@ -97,10 +98,12 @@ static bool _ep_isany(const struct _sock_tl_ep *ep)
static const ip_addr_t *_netif_to_bind_addr(int family, uint16_t netif_num)
{
struct netif *netif;
if (netif_num > UINT8_MAX) {
return NULL;
}
for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (netif->num == (netif_num - 1)) {
switch (family) {
#if LWIP_IPV4
@ -122,9 +125,11 @@ static const ip_addr_t *_netif_to_bind_addr(int family, uint16_t netif_num)
static bool _addr_on_netif(int family, int netif_num, const ip_addr_t *addr)
{
struct netif *netif;
assert(addr != NULL);
assert((netif_num >= 0) && (netif_num <= UINT8_MAX));
for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (netif->num == (netif_num - 1)) {
switch (family) {
#if LWIP_IPV4
@ -439,7 +444,9 @@ uint16_t lwip_sock_bind_addr_to_netif(const ip_addr_t *bind_addr)
assert(bind_addr != NULL);
if (!ip_addr_isany(bind_addr)) {
for (struct netif *netif = netif_list; netif != NULL; netif = netif->next) {
struct netif *netif;
/* cppcheck-suppress uninitvar ; assigned by macro */
NETIF_FOREACH(netif) {
if (IP_IS_V6(bind_addr)) { /* XXX crappy API yields crappy code */
#if LWIP_IPV6
if (netif_get_ip6_addr_match(netif, ip_2_ip6(bind_addr)) >= 0) {