mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-12 21:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

lowpan6.c: fix building with LWIP_6LOWPAN_NUM_CONTEXTS==0

Browse Source
This commit is contained in:
goldsimon 2018-02-27 10:07:15 +01:00
parent 7db978ca03
commit 49acdae8d0
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/netif/lowpan6.c
View File

@ -150,6 +150,7 @@ dequeue_datagram(struct lowpan6_reass_helper *lrh)
static s8_t static s8_t
lowpan6_context_lookup(const ip6_addr_t *ip6addr) lowpan6_context_lookup(const ip6_addr_t *ip6addr)
{ {
#if LWIP_6LOWPAN_NUM_CONTEXTS > 0
s8_t i; s8_t i;
for (i = 0; i < LWIP_6LOWPAN_NUM_CONTEXTS; i++) { for (i = 0; i < LWIP_6LOWPAN_NUM_CONTEXTS; i++) {
@ -157,7 +158,9 @@ lowpan6_context_lookup(const ip6_addr_t *ip6addr)
return i; return i;
} }
} }
#else
LWIP_UNUSED_ARG(ip6addr);
#endif
return -1; return -1;
} }
#endif /* LWIP_6LOWPAN_IPHC */ #endif /* LWIP_6LOWPAN_IPHC */
@ -233,6 +236,8 @@ lowpan6_frag(struct netif *netif, struct pbuf *p, const struct ieee_802154_addr
u16_t datagram_offset; u16_t datagram_offset;
err_t err = ERR_IF; err_t err = ERR_IF;
LWIP_ASSERT("lowpan6_frag: netif->linkoutput not set", netif->linkoutput != NULL);
/* We'll use a dedicated pbuf for building 6LowPAN fragments. */ /* We'll use a dedicated pbuf for building 6LowPAN fragments. */
p_frag = pbuf_alloc(PBUF_RAW, 127, PBUF_RAM); p_frag = pbuf_alloc(PBUF_RAW, 127, PBUF_RAM);
if (p_frag == NULL) { if (p_frag == NULL) {
@ -591,6 +596,7 @@ lowpan6_frag(struct netif *netif, struct pbuf *p, const struct ieee_802154_addr
err_t err_t
lowpan6_set_context(u8_t idx, const ip6_addr_t *context) lowpan6_set_context(u8_t idx, const ip6_addr_t *context)
{ {
#if LWIP_6LOWPAN_NUM_CONTEXTS > 0
if (idx >= LWIP_6LOWPAN_NUM_CONTEXTS) { if (idx >= LWIP_6LOWPAN_NUM_CONTEXTS) {
return ERR_ARG; return ERR_ARG;
} }
@ -600,6 +606,11 @@ lowpan6_set_context(u8_t idx, const ip6_addr_t *context)
ip6_addr_set(&lowpan6_data.lowpan6_context[idx], context); ip6_addr_set(&lowpan6_data.lowpan6_context[idx], context);
return ERR_OK; return ERR_OK;
#else
LWIP_UNUSED_ARG(idx);
LWIP_UNUSED_ARG(context);
return ERR_ARG;
#endif
} }
#if LWIP_6LOWPAN_INFER_SHORT_ADDRESS #if LWIP_6LOWPAN_INFER_SHORT_ADDRESS
@ -832,9 +843,10 @@ lowpan6_decompress(struct pbuf *p, struct ieee_802154_addr *src, struct ieee_802
pbuf_free(q); pbuf_free(q);
return NULL; return NULL;
} }
#if LWIP_6LOWPAN_NUM_CONTEXTS > 0
ip6hdr->src.addr[0] = lowpan6_data.lowpan6_context[i].addr[0]; ip6hdr->src.addr[0] = lowpan6_data.lowpan6_context[i].addr[0];
ip6hdr->src.addr[1] = lowpan6_data.lowpan6_context[i].addr[1]; ip6hdr->src.addr[1] = lowpan6_data.lowpan6_context[i].addr[1];
#endif
} }
if ((lowpan6_buffer[1] & 0x30) == 0x10) { if ((lowpan6_buffer[1] & 0x30) == 0x10) {
@ -903,9 +915,10 @@ lowpan6_decompress(struct pbuf *p, struct ieee_802154_addr *src, struct ieee_802
pbuf_free(q); pbuf_free(q);
return NULL; return NULL;
} }
#if LWIP_6LOWPAN_NUM_CONTEXTS > 0
ip6hdr->dest.addr[0] = lowpan6_data.lowpan6_context[i].addr[0]; ip6hdr->dest.addr[0] = lowpan6_data.lowpan6_context[i].addr[0];
ip6hdr->dest.addr[1] = lowpan6_data.lowpan6_context[i].addr[1]; ip6hdr->dest.addr[1] = lowpan6_data.lowpan6_context[i].addr[1];
#endif
} else { } else {
/* Link local address compression */ /* Link local address compression */
ip6hdr->dest.addr[0] = PP_HTONL(0xfe800000UL); ip6hdr->dest.addr[0] = PP_HTONL(0xfe800000UL);