mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-03-19 16:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk: use constants for 'offset' based on pbuf_layer instead of calculating it using fall-through

Browse Source
This commit is contained in:
goldsimon 2011-12-14 21:48:51 +01:00
parent d3ee77e7b1
commit ef0a44c62d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/pbuf.c
View File

@ -212,21 +212,21 @@ pbuf_alloc(pbuf_layer layer, u16_t length, pbuf_type type)
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F")\n", length)); LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloc(length=%"U16_F")\n", length));
/* determine header offset */ /* determine header offset */
offset = 0;
switch (layer) { switch (layer) {
case PBUF_TRANSPORT: case PBUF_TRANSPORT:
/* add room for transport (often TCP) layer header */ /* add room for transport (often TCP) layer header */
offset += PBUF_TRANSPORT_HLEN; offset = PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN;
/* FALLTHROUGH */ break;
case PBUF_IP: case PBUF_IP:
/* add room for IP layer header */ /* add room for IP layer header */
offset += PBUF_IP_HLEN; offset = PBUF_LINK_HLEN + PBUF_IP_HLEN;
/* FALLTHROUGH */ break;
case PBUF_LINK: case PBUF_LINK:
/* add room for link layer header */ /* add room for link layer header */
offset += PBUF_LINK_HLEN; offset = PBUF_LINK_HLEN;
break; break;
case PBUF_RAW: case PBUF_RAW:
offset = 0;
break; break;
default: default:
LWIP_ASSERT("pbuf_alloc: bad pbuf layer", 0); LWIP_ASSERT("pbuf_alloc: bad pbuf layer", 0);
@ -371,21 +371,21 @@ pbuf_alloced_custom(pbuf_layer l, u16_t length, pbuf_type type, struct pbuf_cust
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloced_custom(length=%"U16_F")\n", length)); LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE, ("pbuf_alloced_custom(length=%"U16_F")\n", length));
/* determine header offset */ /* determine header offset */
offset = 0;
switch (l) { switch (l) {
case PBUF_TRANSPORT: case PBUF_TRANSPORT:
/* add room for transport (often TCP) layer header */ /* add room for transport (often TCP) layer header */
offset += PBUF_TRANSPORT_HLEN; offset = PBUF_LINK_HLEN + PBUF_IP_HLEN + PBUF_TRANSPORT_HLEN;
/* FALLTHROUGH */ break;
case PBUF_IP: case PBUF_IP:
/* add room for IP layer header */ /* add room for IP layer header */
offset += PBUF_IP_HLEN; offset = PBUF_LINK_HLEN + PBUF_IP_HLEN;
/* FALLTHROUGH */ break;
case PBUF_LINK: case PBUF_LINK:
/* add room for link layer header */ /* add room for link layer header */
offset += PBUF_LINK_HLEN; offset = PBUF_LINK_HLEN;
break; break;
case PBUF_RAW: case PBUF_RAW:
offset = 0;
break; break;
default: default:
LWIP_ASSERT("pbuf_alloced_custom: bad pbuf layer", 0); LWIP_ASSERT("pbuf_alloced_custom: bad pbuf layer", 0);