From cd65d3682261913df582f64cd7a3b2bce42de7a2 Mon Sep 17 00:00:00 2001 From: jani Date: Mon, 19 May 2003 14:41:54 +0000 Subject: [PATCH] patches 1492, 1493 and 1494 from Marc --- doc/sys_arch.txt | 7 ++++--- src/api/api_lib.c | 2 +- src/core/ipv6/ip6.c | 2 +- src/core/sys.c | 20 ++++++++++---------- src/core/tcp.c | 4 ++-- src/core/tcp_out.c | 4 ++-- src/include/lwip/tcp.h | 6 +++--- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/doc/sys_arch.txt b/doc/sys_arch.txt index 3a829991..95d0add7 100644 --- a/doc/sys_arch.txt +++ b/doc/sys_arch.txt @@ -63,8 +63,8 @@ The following functions must be implemented by the sys_arch: If the timeout argument is non-zero, the return value is the number of milliseconds spent waiting for the semaphore to be signaled. If the semaphore wasn't signaled within the specified time, the return value is - 0xffffffff. If the thread didn't have to wait for the semaphore (i.e., it - was already signaled), the function may return zero. + SYS_ARCH_TIMEOUT. If the thread didn't have to wait for the semaphore + (i.e., it was already signaled), the function may return zero. Notice that lwIP implements a function with a similar name, sys_sem_wait(), that uses the sys_arch_sem_wait() function. @@ -93,7 +93,8 @@ The following functions must be implemented by the sys_arch: should be dropped. The return values are the same as for the sys_arch_sem_wait() function: - Number of milliseconds spent waitng or 0xffffffff if there was a timeout. + Number of milliseconds spent waiting or SYS_ARCH_TIMEOUT if there was a + timeout. Note that a function with a similar name, sys_mbox_fetch(), is implemented by lwIP. diff --git a/src/api/api_lib.c b/src/api/api_lib.c index a73756ae..9c29ba2f 100644 --- a/src/api/api_lib.c +++ b/src/api/api_lib.c @@ -511,7 +511,7 @@ netconn_recv(struct netconn *conn) if (conn->callback) (*conn->callback)(conn, NETCONN_EVT_RCVMINUS, len); - /* If we are closed, we indicate that we no longer wish to recieve + /* If we are closed, we indicate that we no longer wish to receive data by setting conn->recvmbox to SYS_MBOX_NULL. */ if (p == NULL) { memp_freep(MEMP_NETBUF, buf); diff --git a/src/core/ipv6/ip6.c b/src/core/ipv6/ip6.c index 283ea5d0..e434b4d1 100644 --- a/src/core/ipv6/ip6.c +++ b/src/core/ipv6/ip6.c @@ -237,7 +237,7 @@ ip_input(struct pbuf *p, struct netif *inp) { /* send ICMP destination protocol unreachable */ icmp_dest_unreach(p, ICMP_DUR_PROTO); pbuf_free(p); - DEBUGF(IP_DEBUG, ("Unsupported transportation protocol %u\n", + DEBUGF(IP_DEBUG, ("Unsupported transport protocol %u\n", iphdr->nexthdr)); #ifdef IP_STATS diff --git a/src/core/sys.c b/src/core/sys.c index 8b2b4b09..f3d4d34c 100644 --- a/src/core/sys.c +++ b/src/core/sys.c @@ -64,12 +64,12 @@ sys_mbox_fetch(sys_mbox_t mbox, void **msg) if (timeouts->next->time > 0) { time = sys_arch_mbox_fetch(mbox, msg, timeouts->next->time); } else { - time = 0xffffffff; + time = SYS_ARCH_TIMEOUT; } - if (time == 0xffffffff) { - /* If time == 0xffffffff, a timeout occured before a message could be - fetched. We should now call the timeout handler and + if (time == SYS_ARCH_TIMEOUT) { + /* If time == SYS_ARCH_TIMEOUT, a timeout occured before a message + could be fetched. We should now call the timeout handler and deallocate the memory allocated for the timeout. */ tmptimeout = timeouts->next; timeouts->next = tmptimeout->next; @@ -84,7 +84,7 @@ sys_mbox_fetch(sys_mbox_t mbox, void **msg) /* We try again to fetch a message from the mbox. */ goto again; } else { - /* If time != 0xffffffff, a message was received before the timeout + /* If time != SYS_ARCH_TIMEOUT, a message was received before the timeout occured. The time variable is set to the number of milliseconds we waited for the message. */ if (time <= timeouts->next->time) { @@ -119,12 +119,12 @@ sys_sem_wait(sys_sem_t sem) if (timeouts->next->time > 0) { time = sys_arch_sem_wait(sem, timeouts->next->time); } else { - time = 0xffffffff; + time = SYS_ARCH_TIMEOUT; } - if (time == 0xffffffff) { - /* If time == 0xffffffff, a timeout occured before a message could be - fetched. We should now call the timeout handler and + if (time == SYS_ARCH_TIMEOUT) { + /* If time == SYS_ARCH_TIMEOUT, a timeout occured before a message + could be fetched. We should now call the timeout handler and deallocate the memory allocated for the timeout. */ tmptimeout = timeouts->next; timeouts->next = tmptimeout->next; @@ -140,7 +140,7 @@ sys_sem_wait(sys_sem_t sem) /* We try again to fetch a message from the mbox. */ goto again; } else { - /* If time != 0xffffffff, a message was received before the timeout + /* If time != SYS_ARCH_TIMEOUT, a message was received before the timeout occured. The time variable is set to the number of milliseconds we waited for the message. */ if (time <= timeouts->next->time) { diff --git a/src/core/tcp.c b/src/core/tcp.c index e1ae6867..ffc593af 100644 --- a/src/core/tcp.c +++ b/src/core/tcp.c @@ -70,7 +70,7 @@ struct tcp_pcb *tcp_tw_pcbs; /* List of all TCP PCBs in TIME-WAIT. */ struct tcp_pcb *tcp_tmp_pcb; -#define MIN(x,y) (x) < (y)? (x): (y) +#define LWIP_MIN(x,y) (x) < (y)? (x): (y) static u8_t tcp_timer; @@ -506,7 +506,7 @@ tcp_slowtmr(void) } tcp_rexmit(pcb); /* Reduce congestion window and ssthresh. */ - eff_wnd = MIN(pcb->cwnd, pcb->snd_wnd); + eff_wnd = LWIP_MIN(pcb->cwnd, pcb->snd_wnd); pcb->ssthresh = eff_wnd >> 1; if (pcb->ssthresh < pcb->mss) { pcb->ssthresh = pcb->mss * 2; diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c index 5664bd57..5c1b6340 100644 --- a/src/core/tcp_out.c +++ b/src/core/tcp_out.c @@ -59,7 +59,7 @@ #include "lwip/stats.h" #if LWIP_TCP -#define MIN(x,y) (x) < (y)? (x): (y) +#define LWIP_MIN(x,y) (x) < (y)? (x): (y) @@ -367,7 +367,7 @@ tcp_output(struct tcp_pcb *pcb) return ERR_OK; } - wnd = MIN(pcb->snd_wnd, pcb->cwnd); + wnd = LWIP_MIN(pcb->snd_wnd, pcb->cwnd); seg = pcb->unsent; diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h index 893b53b4..77f24d5e 100644 --- a/src/include/lwip/tcp.h +++ b/src/include/lwip/tcp.h @@ -252,8 +252,8 @@ struct tcp_pcb { u16_t acked; - u16_t snd_buf; /* Avaliable buffer space for sending (in bytes). */ - u8_t snd_queuelen; /* Avaliable buffer space for sending (in tcp_segs). */ + u16_t snd_buf; /* Available buffer space for sending (in bytes). */ + u8_t snd_queuelen; /* Available buffer space for sending (in tcp_segs). */ /* These are ordered by sequence number: */ @@ -424,7 +424,7 @@ extern struct tcp_pcb *tcp_tw_pcbs; /* List of all TCP PCBs in TIME-WAIT. * extern struct tcp_pcb *tcp_tmp_pcb; /* Only used for temporary storage. */ -/* Axoims about the above lists: +/* Axioms about the above lists: 1) Every TCP PCB that is not CLOSED is in one of the lists. 2) A PCB is only in one of the lists. 3) All PCBs in the tcp_listen_pcbs list is in LISTEN state.