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

Allow to overrid the check for p->ref==1 in TX packets (there *are* netif drivers that can handle this)

Browse Source
This commit is contained in:
goldsimon 2015-01-16 17:58:07 +01:00
parent c0d9e3231b
commit 1cbd2121e2
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/ipv4/ip4.c
View File

@ -710,9 +710,7 @@ err_t ip_output_if_opt_src(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
u32_t chk_sum = 0; u32_t chk_sum = 0;
#endif /* CHECKSUM_GEN_IP_INLINE */ #endif /* CHECKSUM_GEN_IP_INLINE */
/* pbufs passed to IP must have a ref-count of 1 as their payload pointer LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1);
snmp_inc_ipoutrequests(); snmp_inc_ipoutrequests();
@ -867,9 +865,7 @@ ip_output(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
{ {
struct netif *netif; struct netif *netif;
/* pbufs passed to IP must have a ref-count of 1 as their payload pointer LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1);
if ((netif = ip_route(dest)) == NULL) { if ((netif = ip_route(dest)) == NULL) {
LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n", LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",
@ -907,9 +903,7 @@ ip_output_hinted(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest,
struct netif *netif; struct netif *netif;
err_t err; err_t err;
/* pbufs passed to IP must have a ref-count of 1 as their payload pointer LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1);
if ((netif = ip_route(dest)) == NULL) { if ((netif = ip_route(dest)) == NULL) {
LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n", LWIP_DEBUGF(IP_DEBUG, ("ip_output: No route to %"U16_F".%"U16_F".%"U16_F".%"U16_F"\n",

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

@ -773,9 +773,7 @@ ip6_output_if_src(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
struct ip6_hdr *ip6hdr; struct ip6_hdr *ip6hdr;
ip6_addr_t dest_addr; ip6_addr_t dest_addr;
/* pbufs passed to IP must have a ref-count of 1 as their payload pointer LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1);
/* Should the IPv6 header be generated or is it already included in p? */ /* Should the IPv6 header be generated or is it already included in p? */
if (dest != IP_HDRINCL) { if (dest != IP_HDRINCL) {
@ -867,9 +865,7 @@ ip6_output(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
struct ip6_hdr *ip6hdr; struct ip6_hdr *ip6hdr;
ip6_addr_t src_addr, dest_addr; ip6_addr_t src_addr, dest_addr;
/* pbufs passed to IPv6 must have a ref-count of 1 as their payload pointer LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1);
if (dest != IP_HDRINCL) { if (dest != IP_HDRINCL) {
netif = ip6_route(src, dest); netif = ip6_route(src, dest);
@ -928,9 +924,7 @@ ip6_output_hinted(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
ip6_addr_t src_addr, dest_addr; ip6_addr_t src_addr, dest_addr;
err_t err; err_t err;
/* pbufs passed to IP must have a ref-count of 1 as their payload pointer LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p);
gets altered as the packet is passed down the stack */
LWIP_ASSERT("p->ref == 1", p->ref == 1);
if (dest != IP_HDRINCL) { if (dest != IP_HDRINCL) {
netif = ip6_route(src, dest); netif = ip6_route(src, dest);

6
src/include/lwip/ip.h
View File

@ -54,6 +54,12 @@ extern "C" {
#endif /* IP_HDRINCL */ #endif /* IP_HDRINCL */
#define IP_HDRINCL NULL #define IP_HDRINCL NULL
/** pbufs passed to IP must have a ref-count of 1 as their payload pointer
gets altered as the packet is passed down the stack */
#ifndef LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX
#define LWIP_IP_CHECK_PBUF_REF_COUNT_FOR_TX(p) LWIP_ASSERT("p->ref == 1", (p)->ref == 1)
#endif
#if LWIP_NETIF_HWADDRHINT #if LWIP_NETIF_HWADDRHINT
#define IP_PCB_ADDRHINT ;u8_t addr_hint #define IP_PCB_ADDRHINT ;u8_t addr_hint
#else #else