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

Changed the expression of LWIP_ERROR to the same as for LWIP_ASSERT

Browse Source
This commit is contained in:
goldsimon
2007-06-22 20:50:21 +00:00
parent 786a7fbaf4
commit bb9e9e5480
10 changed files with 97 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/dhcp.c
View File

@@ -539,7 +539,7 @@ err_t dhcp_start(struct netif *netif)
struct dhcp *dhcp;
err_t result = ERR_OK;
LWIP_ERROR("netif == NULL", (netif == NULL), return ERR_ARG;);
LWIP_ERROR("netif != NULL", (netif != NULL), return ERR_ARG;);
dhcp = netif->dhcp;
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | LWIP_DBG_STATE, ("dhcp_start(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
netif->flags &= ~NETIF_FLAG_DHCP;
@@ -656,7 +656,7 @@ void dhcp_inform(struct netif *netif)
*/
void dhcp_arp_reply(struct netif *netif, struct ip_addr *addr)
{
LWIP_ERROR("netif == NULL", (netif == NULL), return;);
LWIP_ERROR("netif != NULL", (netif != NULL), return;);
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | 3, ("dhcp_arp_reply()\n"));
/* is a DHCP client doing an ARP check? */
if ((netif->dhcp != NULL) && (netif->dhcp->state == DHCP_CHECKING)) {
@@ -792,9 +792,9 @@ static void dhcp_bind(struct netif *netif)
u32_t timeout;
struct dhcp *dhcp;
struct ip_addr sn_mask, gw_addr;
LWIP_ERROR("dhcp_bind: netif == NULL", (netif == NULL), return;);
LWIP_ERROR("dhcp_bind: netif != NULL", (netif != NULL), return;);
dhcp = netif->dhcp;
LWIP_ERROR("dhcp_bind: dhcp == NULL", (dhcp == NULL), return;);
LWIP_ERROR("dhcp_bind: dhcp != NULL", (dhcp != NULL), return;);
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | 3, ("dhcp_bind(netif=%p) %c%c%"U16_F"\n", (void*)netif, netif->name[0], netif->name[1], (u16_t)netif->num));
/* temporary DHCP lease? */
@@ -1026,7 +1026,7 @@ err_t dhcp_release(struct netif *netif)
void dhcp_stop(struct netif *netif)
{
struct dhcp *dhcp = netif->dhcp;
LWIP_ERROR("dhcp_stop: netif == NULL", (netif == NULL), return;);
LWIP_ERROR("dhcp_stop: netif != NULL", (netif != NULL), return;);
LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_TRACE | 3, ("dhcp_stop()\n"));
/* netif is DHCP configured? */
@@ -1116,9 +1116,9 @@ static err_t dhcp_unfold_reply(struct dhcp *dhcp)
u8_t *ptr;
u16_t i;
u16_t j = 0;
LWIP_ERROR("dhcp == NULL", (dhcp == NULL), return ERR_ARG;);
LWIP_ERROR("dhcp != NULL", (dhcp != NULL), return ERR_ARG;);
p = dhcp->p;
LWIP_ERROR("dhcp->p == NULL", (dhcp->p == NULL), return ERR_VAL;);
LWIP_ERROR("dhcp->p != NULL", (dhcp->p != NULL), return ERR_VAL;);
/* free any left-overs from previous unfolds */
dhcp_free_reply(dhcp);
/* options present? */
@@ -1302,9 +1302,9 @@ static err_t dhcp_create_request(struct netif *netif)
{
struct dhcp *dhcp;
u16_t i;
LWIP_ERROR("dhcp_create_request: netif == NULL", (netif == NULL), return ERR_ARG;);
LWIP_ERROR("dhcp_create_request: netif != NULL", (netif != NULL), return ERR_ARG;);
dhcp = netif->dhcp;
LWIP_ERROR("dhcp_create_request: dhcp == NULL", (dhcp == NULL), return ERR_VAL;);
LWIP_ERROR("dhcp_create_request: dhcp != NULL", (dhcp != NULL), return ERR_VAL;);
LWIP_ASSERT("dhcp_create_request: dhcp->p_out == NULL", dhcp->p_out == NULL);
LWIP_ASSERT("dhcp_create_request: dhcp->msg_out == NULL", dhcp->msg_out == NULL);
dhcp->p_out = pbuf_alloc(PBUF_TRANSPORT, sizeof(struct dhcp_msg), PBUF_RAM);
@@ -1348,9 +1348,9 @@ static err_t dhcp_create_request(struct netif *netif)
static void dhcp_delete_request(struct netif *netif)
{
struct dhcp *dhcp;
LWIP_ERROR("dhcp_create_request: netif == NULL", (netif == NULL), return;);
LWIP_ERROR("dhcp_create_request: netif != NULL", (netif != NULL), return;);
dhcp = netif->dhcp;
LWIP_ERROR("dhcp_create_request: dhcp == NULL", (dhcp == NULL), return;);
LWIP_ERROR("dhcp_create_request: dhcp != NULL", (dhcp != NULL), return;);
LWIP_ASSERT("dhcp_free_msg: dhcp->p_out != NULL", dhcp->p_out != NULL);
LWIP_ASSERT("dhcp_free_msg: dhcp->msg_out != NULL", dhcp->msg_out != NULL);
if (dhcp->p_out != NULL) {
@@ -1369,7 +1369,7 @@ static void dhcp_delete_request(struct netif *netif)
static void dhcp_option_trailer(struct dhcp *dhcp)
{
LWIP_ERROR("dhcp_create_request: dhcp == NULL", (dhcp == NULL), return;);
LWIP_ERROR("dhcp_create_request: dhcp != NULL", (dhcp != NULL), return;);
LWIP_ASSERT("dhcp_option_trailer: dhcp->msg_out != NULL\n", dhcp->msg_out != NULL);
LWIP_ASSERT("dhcp_option_trailer: dhcp->options_out_len < DHCP_OPTIONS_LEN\n", dhcp->options_out_len < DHCP_OPTIONS_LEN);
dhcp->msg_out->options[dhcp->options_out_len++] = DHCP_OPTION_END;

2
src/core/memp.c
View File

@@ -326,7 +326,7 @@ memp_malloc(memp_t type)
struct memp *memp;
SYS_ARCH_DECL_PROTECT(old_level);
LWIP_ERROR("memp_malloc: type >= MEMP_MAX", (type >= MEMP_MAX), return NULL;);
LWIP_ERROR("memp_malloc: type < MEMP_MAX", (type < MEMP_MAX), return NULL;);
SYS_ARCH_PROTECT(old_level);
#if MEMP_OVERFLOW_CHECK >= 2

48
src/core/pbuf.c
View File

@@ -72,6 +72,11 @@
#include "lwip/sys.h"
#include "arch/perf.h"
#define PBUF_MEM_USES_PBUF_POOL 1
#define PBUF_POOL_RX_LOW_WATER_MARK 25
static u32_t pbuf_pool_count = PBUF_POOL_SIZE;
#define SIZEOF_STRUCT_PBUF LWIP_MEM_ALIGN_SIZE(sizeof(struct pbuf))
/* Since the pool is created in memp, PBUF_POOL_BUFSIZE will be automatically
aligned there. Therefore, PBUF_POOL_BUFSIZE_ALIGNED can be used here. */
@@ -126,6 +131,9 @@ pbuf_alloc(pbuf_layer l, u16_t length, pbuf_flag flag)
struct pbuf *p, *q, *r;
u16_t offset;
s32_t rem_len; /* remaining length */
#if PBUF_MEM_USES_PBUF_POOL
unsigned int is_mem = 0;
#endif
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_alloc(length=%"U16_F")\n", length));
/* determine header offset */
@@ -151,13 +159,23 @@ pbuf_alloc(pbuf_layer l, u16_t length, pbuf_flag flag)
}
switch (flag) {
case PBUF_RAM:
is_mem = 1;
/* fall through */
case PBUF_POOL:
/* allocate head of pbuf chain into p */
p = memp_malloc(MEMP_PBUF_POOL);
if(is_mem && (pbuf_pool_count <= PBUF_POOL_RX_LOW_WATER_MARK)) {
p = NULL;
} else {
p = memp_malloc(MEMP_PBUF_POOL);
}
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_alloc: allocated pbuf %p\n", (void *)p));
if (p == NULL) {
return NULL;
}
#if PBUF_MEM_USES_PBUF_POOL
pbuf_pool_count--;
#endif
p->flags = PBUF_FLAG_POOL;
p->next = NULL;
@@ -184,13 +202,20 @@ pbuf_alloc(pbuf_layer l, u16_t length, pbuf_flag flag)
rem_len = length - p->len;
/* any remaining pbufs to be allocated? */
while (rem_len > 0) {
q = memp_malloc(MEMP_PBUF_POOL);
if(is_mem && (pbuf_pool_count <= PBUF_POOL_RX_LOW_WATER_MARK)) {
q = NULL;
} else {
q = memp_malloc(MEMP_PBUF_POOL);
}
if (q == NULL) {
/* free chain so far allocated */
pbuf_free(p);
/* bail out unsuccesfully */
return NULL;
}
#if PBUF_MEM_USES_PBUF_POOL
pbuf_pool_count--;
#endif
q->flags = PBUF_FLAG_POOL;
q->next = NULL;
/* make previous pbuf point to this pbuf */
@@ -216,6 +241,7 @@ pbuf_alloc(pbuf_layer l, u16_t length, pbuf_flag flag)
/*r->next = NULL;*/
break;
#if !PBUF_MEM_USES_PBUF_POOL
case PBUF_RAM:
/* If pbuf is to be allocated in RAM, allocate memory for it. */
p = mem_malloc(LWIP_MEM_ALIGN_SIZE(SIZEOF_STRUCT_PBUF + offset) + LWIP_MEM_ALIGN_SIZE(length));
@@ -231,6 +257,7 @@ pbuf_alloc(pbuf_layer l, u16_t length, pbuf_flag flag)
LWIP_ASSERT("pbuf_alloc: pbuf->payload properly aligned",
((mem_ptr_t)p->payload % MEM_ALIGNMENT) == 0);
break;
#endif /* !PBUF_MEM_USES_PBUF_POOL */
/* pbuf references existing (non-volatile static constant) ROM payload? */
case PBUF_ROM:
/* pbuf references existing (externally allocated) RAM payload? */
@@ -366,7 +393,7 @@ pbuf_header(struct pbuf *p, s16_t header_size_increment)
if (header_size_increment < 0){
increment_magnitude = -header_size_increment;
/* Check that we aren't going to move off the end of the pbuf */
LWIP_ERROR("increment_magnitude > p->len", (increment_magnitude > p->len), return 1;);
LWIP_ERROR("increment_magnitude <= p->len", (increment_magnitude <= p->len), return 1;);
} else {
increment_magnitude = header_size_increment;
#if 0
@@ -504,6 +531,9 @@ pbuf_free(struct pbuf *p)
/* is this a pbuf from the pool? */
if (flags == PBUF_FLAG_POOL) {
memp_free(MEMP_PBUF_POOL, p);
#if PBUF_MEM_USES_PBUF_POOL
pbuf_pool_count++;
#endif
/* is this a ROM or RAM referencing pbuf? */
} else if (flags == PBUF_FLAG_ROM || flags == PBUF_FLAG_REF) {
memp_free(MEMP_PBUF, p);
@@ -580,8 +610,8 @@ pbuf_cat(struct pbuf *h, struct pbuf *t)
{
struct pbuf *p;
LWIP_ERROR("(h == NULL) || (t == NULL) (programmer violates API)",
((h == NULL) || (t == NULL)), return;);
LWIP_ERROR("(h != NULL) && (t != NULL) (programmer violates API)",
((h != NULL) && (t != NULL)), return;);
/* proceed to last pbuf of chain */
for (p = h; p->next != NULL; p = p->next) {
@@ -693,8 +723,8 @@ pbuf_copy(struct pbuf *p_to, struct pbuf *p_from)
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 3, ("pbuf_copy(%p, %p)\n", p_to, p_from));
/* is the target big enough to hold the source? */
LWIP_ERROR("pbuf_copy: target not big enough to hold source", ((p_to == NULL) ||
(p_from == NULL) || (p_to->tot_len < p_from->tot_len)), return ERR_ARG;);
LWIP_ERROR("pbuf_copy: target not big enough to hold source", ((p_to != NULL) &&
(p_from != NULL) && (p_to->tot_len >= p_from->tot_len)), return ERR_ARG;);
#ifdef LWIP_DEBUG
shouldbe = p_from->tot_len;
#endif
@@ -733,12 +763,12 @@ pbuf_copy(struct pbuf *p_to, struct pbuf *p_from)
if((p_from != NULL) && (p_from->len == p_from->tot_len)) {
/* don't copy more than one packet! */
LWIP_ERROR("pbuf_copy() does not allow packet queues!\n",
(p_from->next != NULL), return ERR_VAL;);
(p_from->next == NULL), return ERR_VAL;);
}
if((p_to != NULL) && (p_to->len == p_to->tot_len)) {
/* don't copy more than one packet! */
LWIP_ERROR("pbuf_copy() does not allow packet queues!\n",
(p_to->next != NULL), return ERR_VAL;);
(p_to->next == NULL), return ERR_VAL;);
}
} while (p_from);
LWIP_DEBUGF(PBUF_DEBUG | LWIP_DBG_TRACE | 1, ("pbuf_copy: end of chain reached.\n"));

8
src/core/tcp_out.c
View File

@@ -137,10 +137,10 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len,
LWIP_DEBUGF(TCP_OUTPUT_DEBUG, ("tcp_enqueue(pcb=%p, arg=%p, len=%"U16_F", flags=%"X16_F", copy=%"U16_F")\n",
(void *)pcb, arg, len, (u16_t)flags, (u16_t)copy));
LWIP_ERROR("tcp_enqueue: len != 0 && optlen != 0 (programmer violates API)",
(len != 0 && optlen != 0), return ERR_ARG;);
LWIP_ERROR("tcp_enqueue: arg != NULL && optdata != NULL (programmer violates API)",
(arg != NULL && optdata != NULL), return ERR_ARG;);
LWIP_ERROR("tcp_enqueue: len == 0 || optlen == 0 (programmer violates API)",
((len == 0) || (optlen == 0)), return ERR_ARG;);
LWIP_ERROR("tcp_enqueue: arg == NULL || optdata == NULL (programmer violates API)",
((arg == NULL) || (optdata == NULL)), return ERR_ARG;);
/* fail on too much data */
if (len > pcb->snd_buf) {
LWIP_DEBUGF(TCP_OUTPUT_DEBUG | 3, ("tcp_enqueue: too much data (len=%"U16_F" > snd_buf=%"U16_F")\n", len, pcb->snd_buf));