mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-04-16 08:43:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

lowpan6.c: handle 6-byte MAC addresses on netif, too

Browse Source
This commit is contained in:
goldsimon 2018-02-28 22:46:55 +01:00
parent 2a5b66c9b1
commit 3a8af612b3
2 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/netif/lowpan6.h
View File

@ -55,7 +55,7 @@
extern "C" { extern "C" {
#endif #endif
/** 1 second period */ /** 1 second period for reassembly */
#define LOWPAN6_TMR_INTERVAL 1000 #define LOWPAN6_TMR_INTERVAL 1000
void lowpan6_tmr(void); void lowpan6_tmr(void);

39
src/netif/lowpan6.c
View File

@ -65,10 +65,6 @@
#include <string.h> #include <string.h>
#if NETIF_MAX_HWADDR_LEN < 8
#error "6LoWPAN netif needs a 64-bit hwaddr"
#endif
#if LWIP_6LOWPAN_HW_CRC #if LWIP_6LOWPAN_HW_CRC
#define LWIP_6LOWPAN_DO_CALC_CRC(buf, len) 0 #define LWIP_6LOWPAN_DO_CALC_CRC(buf, len) 0
#else #else
@ -782,6 +778,25 @@ lowpan4_output(struct netif *netif, struct pbuf *q, const ip4_addr_t *ipaddr)
} }
#endif /* LWIP_IPV4 */ #endif /* LWIP_IPV4 */
/* Create IEEE 802.15.4 address from netif address */
static err_t
lowpan6_hwaddr_to_addr(struct netif *netif, struct ieee_802154_addr *addr)
{
addr->addr_len = 8;
if (netif->hwaddr_len == 8) {
SMEMCPY(addr->addr, netif->hwaddr, 8);
} else if (netif->hwaddr_len == 6) {
/* Copy from MAC-48 */
SMEMCPY(addr->addr, netif->hwaddr, 3);
addr->addr[3] = addr->addr[4] = 0xff;
SMEMCPY(&addr->addr[5], &netif->hwaddr[3], 3);
} else {
/* Invalid address length, don't know how to convert this */
return ERR_VAL;
}
return ERR_OK;
}
/** /**
* @ingroup sixlowpan * @ingroup sixlowpan
* Resolve and fill-in IEEE 802.15.4 address header for outgoing IPv6 packet. * Resolve and fill-in IEEE 802.15.4 address header for outgoing IPv6 packet.
@ -817,9 +832,11 @@ lowpan6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr)
} else } else
#endif /* LWIP_6LOWPAN_INFER_SHORT_ADDRESS */ #endif /* LWIP_6LOWPAN_INFER_SHORT_ADDRESS */
{ {
LWIP_ASSERT("6LowPAN needs netif->hwaddr_len == 8", netif->hwaddr_len == 8); result = lowpan6_hwaddr_to_addr(netif, &src);
src.addr_len = netif->hwaddr_len; if (result != ERR_OK) {
SMEMCPY(src.addr, netif->hwaddr, netif->hwaddr_len); MIB2_STATS_NETIF_INC(netif, ifoutdiscards);
return result;
}
} }
/* multicast destination IP address? */ /* multicast destination IP address? */
@ -860,9 +877,11 @@ lowpan6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr)
} }
/* Send out the packet using the returned hardware address. */ /* Send out the packet using the returned hardware address. */
LWIP_ASSERT("6LowPAN needs netif->hwaddr_len == 8", netif->hwaddr_len == 8); result = lowpan6_hwaddr_to_addr(netif, &dest);
dest.addr_len = netif->hwaddr_len; if (result != ERR_OK) {
SMEMCPY(dest.addr, hwaddr, netif->hwaddr_len); MIB2_STATS_NETIF_INC(netif, ifoutdiscards);
return result;
}
MIB2_STATS_NETIF_INC(netif, ifoutucastpkts); MIB2_STATS_NETIF_INC(netif, ifoutucastpkts);
return lowpan6_frag(netif, q, &src, &dest); return lowpan6_frag(netif, q, &src, &dest);
} }