abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-08 00:23:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Done some work on task #6933: converted some LWIP_ASSERTs to LWIP_ERROR to give back an error return value for LWIP_NOASSERT=1

Browse Source
This commit is contained in:
goldsimon
2007-06-17 15:20:21 +00:00
parent ced2543be0
commit 6784fd64f3
7 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/netif/etharp.c
View File

@@ -403,7 +403,7 @@ update_arp_entry(struct netif *netif, struct ip_addr *ipaddr, struct eth_addr *e
s8_t i;
u8_t k;
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE | 3, ("update_arp_entry()\n"));
LWIP_ASSERT("netif->hwaddr_len != 0", netif->hwaddr_len != 0);
LWIP_ASSERT("netif->hwaddr_len == 6", netif->hwaddr_len == 6);
LWIP_DEBUGF(ETHARP_DEBUG | LWIP_DBG_TRACE, ("update_arp_entry: %"U16_F".%"U16_F".%"U16_F".%"U16_F" - %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F"\n",
ip4_addr1(ipaddr), ip4_addr2(ipaddr), ip4_addr3(ipaddr), ip4_addr4(ipaddr),
ethaddr->addr[0], ethaddr->addr[1], ethaddr->addr[2],
@@ -516,7 +516,7 @@ void
etharp_ip_input(struct netif *netif, struct pbuf *p)
{
struct ethip_hdr *hdr;
LWIP_ASSERT("netif != NULL", netif != NULL);
LWIP_ERROR("netif == NULL", (netif == NULL), return;);
/* Only insert an entry if the source IP address of the
incoming IP packet comes from a host on the local network. */
hdr = p->payload;
@@ -558,7 +558,7 @@ etharp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p)
u8_t i;
u8_t for_us;
LWIP_ASSERT("netif != NULL", netif != NULL);
LWIP_ERROR("netif == NULL", (netif == NULL), return;);
/* drop short ARP packets */
if (p->tot_len < sizeof(struct etharp_hdr)) {
@@ -858,8 +858,8 @@ etharp_query(struct netif *netif, struct ip_addr *ipaddr, struct pbuf *q)
* PBUF_ROMs can be left as they are, since ROM must not get changed. */
p = q;
while(p) {
LWIP_ASSERT("no packet queues allowed!", (p->len == p->tot_len) || (p->next == 0));
if(p->len == p->tot_len) {
LWIP_ASSERT("no packet queues allowed!", p->next == 0);
}
if(p->flags != PBUF_FLAG_ROM) {
copy_needed = 1;

7
src/netif/loopif.c
View File

@@ -64,10 +64,7 @@ loopif_poll(struct netif *netif)
struct pbuf *in = NULL;
struct loopif_private *priv = (struct loopif_private*)netif->state;
LWIP_ASSERT("priv != NULL", priv != NULL);
if(priv == NULL) {
return;
}
LWIP_ERROR("priv == NULL", (priv == NULL), return;);
do {
/* Get a packet from the list. With SYS_LIGHTWEIGHT_PROT=1, this is protected */
@@ -161,7 +158,7 @@ loopif_output(struct netif *netif, struct pbuf *p,
SYS_ARCH_PROTECT(lev);
if(priv->first != NULL) {
LWIP_ASSERT("if first!=NULL, last must also be != NULL", priv->last != NULL);
LWIP_ASSERT("if first != NULL, last must also be != NULL", priv->last != NULL);
priv->last->next = r;
priv->last = r;
} else {