mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-10-01 12:24:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove extra newlines in LWIP_ASSERT messages

Browse Source
This commit is contained in:
Erik Ekman 2020-07-01 20:51:19 +02:00
parent ec5f3a1563
commit 776e612872
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/ports/win32/pcapif.c
View File

@ -732,7 +732,7 @@ pcapif_low_level_init(struct netif *netif)
adapter_num = (LWIP_PTR_NUMERIC_CAST(int, netif->state)) - 1; adapter_num = (LWIP_PTR_NUMERIC_CAST(int, netif->state)) - 1;
if (adapter_num < 0) { if (adapter_num < 0) {
printf("ERROR: invalid adapter index \"%d\"!\n", adapter_num); printf("ERROR: invalid adapter index \"%d\"!\n", adapter_num);
LWIP_ASSERT("ERROR initializing network adapter!\n", 0); LWIP_ASSERT("ERROR initializing network adapter!", 0);
return; return;
} }
} }
@ -758,7 +758,7 @@ pcapif_low_level_init(struct netif *netif)
adapter_num = get_adapter_index(PACKET_LIB_ADAPTER_GUID); adapter_num = get_adapter_index(PACKET_LIB_ADAPTER_GUID);
if (adapter_num < 0) { if (adapter_num < 0) {
printf("ERROR finding network adapter with GUID \"%s\"!\n", PACKET_LIB_ADAPTER_GUID); printf("ERROR finding network adapter with GUID \"%s\"!\n", PACKET_LIB_ADAPTER_GUID);
LWIP_ASSERT("ERROR initializing network adapter!\n", 0); LWIP_ASSERT("ERROR initializing network adapter!", 0);
return; return;
} }
#endif /* PACKET_LIB_ADAPTER_GUID */ #endif /* PACKET_LIB_ADAPTER_GUID */

4
src/core/ipv4/icmp.c
View File

@ -179,7 +179,7 @@ icmp_input(struct pbuf *p, struct netif *inp)
MEMCPY(r->payload, iphdr_in, hlen); MEMCPY(r->payload, iphdr_in, hlen);
/* switch r->payload back to icmp header (cannot fail) */ /* switch r->payload back to icmp header (cannot fail) */
if (pbuf_remove_header(r, hlen)) { if (pbuf_remove_header(r, hlen)) {
LWIP_ASSERT("icmp_input: moving r->payload to icmp header failed\n", 0); LWIP_ASSERT("icmp_input: moving r->payload to icmp header failed", 0);
pbuf_free(r); pbuf_free(r);
goto icmperr; goto icmperr;
} }
@ -196,7 +196,7 @@ icmp_input(struct pbuf *p, struct netif *inp)
} else { } else {
/* restore p->payload to point to icmp header (cannot fail) */ /* restore p->payload to point to icmp header (cannot fail) */
if (pbuf_remove_header(p, hlen + PBUF_LINK_HLEN + PBUF_LINK_ENCAPSULATION_HLEN)) { if (pbuf_remove_header(p, hlen + PBUF_LINK_HLEN + PBUF_LINK_ENCAPSULATION_HLEN)) {
LWIP_ASSERT("icmp_input: restoring original p->payload failed\n", 0); LWIP_ASSERT("icmp_input: restoring original p->payload failed", 0);
goto icmperr; goto icmperr;
} }
} }

4
src/core/ipv6/ip6_frag.c
View File

@ -166,7 +166,7 @@ ip6_reass_free_complete_datagram(struct ip6_reassdata *ipr)
/* Then, move back to the original ipv6 header (we are now pointing to Fragment header). /* Then, move back to the original ipv6 header (we are now pointing to Fragment header).
This cannot fail since we already checked when receiving this fragment. */ This cannot fail since we already checked when receiving this fragment. */
if (pbuf_header_force(p, (s16_t)((u8_t*)p->payload - (u8_t*)ipr->iphdr))) { if (pbuf_header_force(p, (s16_t)((u8_t*)p->payload - (u8_t*)ipr->iphdr))) {
LWIP_ASSERT("ip6_reass_free: moving p->payload to ip6 header failed\n", 0); LWIP_ASSERT("ip6_reass_free: moving p->payload to ip6 header failed", 0);
} }
else { else {
/* Reconstruct the zoned source and destination addresses, so that we do /* Reconstruct the zoned source and destination addresses, so that we do
@ -652,7 +652,7 @@ ip6_reass(struct pbuf *p)
/* Move pbuf back to IPv6 header. This should never fail. */ /* Move pbuf back to IPv6 header. This should never fail. */
if (pbuf_header_force(p, (s16_t)((u8_t*)p->payload - (u8_t*)iphdr_ptr))) { if (pbuf_header_force(p, (s16_t)((u8_t*)p->payload - (u8_t*)iphdr_ptr))) {
LWIP_ASSERT("ip6_reass: moving p->payload to ip6 header failed\n", 0); LWIP_ASSERT("ip6_reass: moving p->payload to ip6 header failed", 0);
pbuf_free(p); pbuf_free(p);
return NULL; return NULL;
} }

6
src/core/tcp.c
View File

@ -1215,9 +1215,9 @@ tcp_slowtmr_start:
} }
while (pcb != NULL) { while (pcb != NULL) {
LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: processing active pcb\n")); LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: processing active pcb\n"));
LWIP_ASSERT("tcp_slowtmr: active pcb->state != CLOSED\n", pcb->state != CLOSED); LWIP_ASSERT("tcp_slowtmr: active pcb->state != CLOSED", pcb->state != CLOSED);
LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN); LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN", pcb->state != LISTEN);
LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT); LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT);
if (pcb->last_timer == tcp_timer_ctr) { if (pcb->last_timer == tcp_timer_ctr) {
/* skip this pcb, we have already processed it */ /* skip this pcb, we have already processed it */
prev = pcb; prev = pcb;

10
src/core/tcp_in.c
View File

@ -1486,7 +1486,7 @@ tcp_receive(struct tcp_pcb *pcb)
} }
pbuf_realloc(inseg.p, inseg.len); pbuf_realloc(inseg.p, inseg.len);
tcplen = TCP_TCPLEN(&inseg); tcplen = TCP_TCPLEN(&inseg);
LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n", LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd",
(seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd)); (seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd));
} }
#if TCP_QUEUE_OOSEQ #if TCP_QUEUE_OOSEQ
@ -1535,7 +1535,7 @@ tcp_receive(struct tcp_pcb *pcb)
} }
pbuf_realloc(inseg.p, inseg.len); pbuf_realloc(inseg.p, inseg.len);
tcplen = TCP_TCPLEN(&inseg); tcplen = TCP_TCPLEN(&inseg);
LWIP_ASSERT("tcp_receive: segment not trimmed correctly to ooseq queue\n", LWIP_ASSERT("tcp_receive: segment not trimmed correctly to ooseq queue",
(seqno + tcplen) == next->tcphdr->seqno); (seqno + tcplen) == next->tcphdr->seqno);
} }
pcb->ooseq = next; pcb->ooseq = next;
@ -1546,7 +1546,7 @@ tcp_receive(struct tcp_pcb *pcb)
pcb->rcv_nxt = seqno + tcplen; pcb->rcv_nxt = seqno + tcplen;
/* Update the receiver's (our) window. */ /* Update the receiver's (our) window. */
LWIP_ASSERT("tcp_receive: tcplen > rcv_wnd\n", pcb->rcv_wnd >= tcplen); LWIP_ASSERT("tcp_receive: tcplen > rcv_wnd", pcb->rcv_wnd >= tcplen);
pcb->rcv_wnd -= tcplen; pcb->rcv_wnd -= tcplen;
tcp_update_rcv_ann_wnd(pcb); tcp_update_rcv_ann_wnd(pcb);
@ -1582,7 +1582,7 @@ tcp_receive(struct tcp_pcb *pcb)
seqno = pcb->ooseq->tcphdr->seqno; seqno = pcb->ooseq->tcphdr->seqno;
pcb->rcv_nxt += TCP_TCPLEN(cseg); pcb->rcv_nxt += TCP_TCPLEN(cseg);
LWIP_ASSERT("tcp_receive: ooseq tcplen > rcv_wnd\n", LWIP_ASSERT("tcp_receive: ooseq tcplen > rcv_wnd",
pcb->rcv_wnd >= TCP_TCPLEN(cseg)); pcb->rcv_wnd >= TCP_TCPLEN(cseg));
pcb->rcv_wnd -= TCP_TCPLEN(cseg); pcb->rcv_wnd -= TCP_TCPLEN(cseg);
@ -1787,7 +1787,7 @@ tcp_receive(struct tcp_pcb *pcb)
next->next->len = (u16_t)(pcb->rcv_nxt + pcb->rcv_wnd - seqno); next->next->len = (u16_t)(pcb->rcv_nxt + pcb->rcv_wnd - seqno);
pbuf_realloc(next->next->p, next->next->len); pbuf_realloc(next->next->p, next->next->len);
tcplen = TCP_TCPLEN(next->next); tcplen = TCP_TCPLEN(next->next);
LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd\n", LWIP_ASSERT("tcp_receive: segment not trimmed correctly to rcv_wnd",
(seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd)); (seqno + tcplen) == (pcb->rcv_nxt + pcb->rcv_wnd));
} }
} }

2
src/core/udp.c
View File

@ -365,7 +365,7 @@ udp_input(struct pbuf *p, struct netif *inp)
#endif /* CHECKSUM_CHECK_UDP */ #endif /* CHECKSUM_CHECK_UDP */
if (pbuf_remove_header(p, UDP_HLEN)) { if (pbuf_remove_header(p, UDP_HLEN)) {
/* Can we cope with this failing? Just assert for now */ /* Can we cope with this failing? Just assert for now */
LWIP_ASSERT("pbuf_remove_header failed\n", 0); LWIP_ASSERT("pbuf_remove_header failed", 0);
UDP_STATS_INC(udp.drop); UDP_STATS_INC(udp.drop);
MIB2_STATS_INC(mib2.udpinerrors); MIB2_STATS_INC(mib2.udpinerrors);
pbuf_free(p); pbuf_free(p);

2
src/include/lwip/priv/tcp_priv.h
View File

@ -358,7 +358,7 @@ extern struct tcp_pcb ** const tcp_pcb_lists[NUM_TCP_PCB_LISTS];
for (tcp_tmp_pcb = *(pcbs); \ for (tcp_tmp_pcb = *(pcbs); \
tcp_tmp_pcb != NULL; \ tcp_tmp_pcb != NULL; \
tcp_tmp_pcb = tcp_tmp_pcb->next) { \ tcp_tmp_pcb = tcp_tmp_pcb->next) { \
LWIP_ASSERT("TCP_REG: already registered\n", tcp_tmp_pcb != (npcb)); \ LWIP_ASSERT("TCP_REG: already registered", tcp_tmp_pcb != (npcb)); \
} \ } \
LWIP_ASSERT("TCP_REG: pcb->state != CLOSED", ((pcbs) == &tcp_bound_pcbs) || ((npcb)->state != CLOSED)); \ LWIP_ASSERT("TCP_REG: pcb->state != CLOSED", ((pcbs) == &tcp_bound_pcbs) || ((npcb)->state != CLOSED)); \
(npcb)->next = *(pcbs); \ (npcb)->next = *(pcbs); \

2
src/netif/ppp/pppos.c
View File

@ -719,7 +719,7 @@ static void pppos_input_callback(void *arg) {
ppp = ((struct pppos_input_header*)pb->payload)->ppp; ppp = ((struct pppos_input_header*)pb->payload)->ppp;
if(pbuf_remove_header(pb, sizeof(struct pppos_input_header))) { if(pbuf_remove_header(pb, sizeof(struct pppos_input_header))) {
LWIP_ASSERT("pbuf_remove_header failed\n", 0); LWIP_ASSERT("pbuf_remove_header failed", 0);
goto drop; goto drop;
} }

8
src/netif/ppp/vj.c
View File

@ -409,7 +409,7 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf **pb)
hlen -= deltaS + 4; hlen -= deltaS + 4;
if (pbuf_remove_header(np, hlen)){ if (pbuf_remove_header(np, hlen)){
/* Can we cope with this failing? Just assert for now */ /* Can we cope with this failing? Just assert for now */
LWIP_ASSERT("pbuf_remove_header failed\n", 0); LWIP_ASSERT("pbuf_remove_header failed", 0);
} }
cp = (u8_t*)np->payload; cp = (u8_t*)np->payload;
*cp++ = (u8_t)(changes | NEW_C); *cp++ = (u8_t)(changes | NEW_C);
@ -418,7 +418,7 @@ vj_compress_tcp(struct vjcompress *comp, struct pbuf **pb)
hlen -= deltaS + 3; hlen -= deltaS + 3;
if (pbuf_remove_header(np, hlen)) { if (pbuf_remove_header(np, hlen)) {
/* Can we cope with this failing? Just assert for now */ /* Can we cope with this failing? Just assert for now */
LWIP_ASSERT("pbuf_remove_header failed\n", 0); LWIP_ASSERT("pbuf_remove_header failed", 0);
} }
cp = (u8_t*)np->payload; cp = (u8_t*)np->payload;
*cp++ = (u8_t)changes; *cp++ = (u8_t)changes;
@ -621,7 +621,7 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp)
/* Remove the compressed header and prepend the uncompressed header. */ /* Remove the compressed header and prepend the uncompressed header. */
if (pbuf_remove_header(n0, vjlen)) { if (pbuf_remove_header(n0, vjlen)) {
/* Can we cope with this failing? Just assert for now */ /* Can we cope with this failing? Just assert for now */
LWIP_ASSERT("pbuf_remove_header failed\n", 0); LWIP_ASSERT("pbuf_remove_header failed", 0);
goto bad; goto bad;
} }
@ -644,7 +644,7 @@ vj_uncompress_tcp(struct pbuf **nb, struct vjcompress *comp)
if (pbuf_remove_header(np, cs->cs_hlen)) { if (pbuf_remove_header(np, cs->cs_hlen)) {
/* Can we cope with this failing? Just assert for now */ /* Can we cope with this failing? Just assert for now */
LWIP_ASSERT("pbuf_remove_header failed\n", 0); LWIP_ASSERT("pbuf_remove_header failed", 0);
goto bad; goto bad;
} }