byte-order handling functions are in inet.c now and the uperrcase counterparts are gone. opt.h has all the

configurable items debug does not need to be directly included.

src/core/dhcp.c

@@ -60,7 +60,6 @@
  * to remove the DHCP client.
  *
  */
-#include "lwip/debug.h"
 #include "lwip/stats.h"
 #include "lwip/mem.h"
 #include "lwip/udp.h"

src/core/inet.c

@@ -39,7 +39,7 @@
  */
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/arch.h"
 
@@ -168,5 +168,33 @@ inet_chksum_pbuf(struct pbuf *p)
   return ~(acc & 0xffffUL);
 }
 
-
+#if BYTE_ORDER == LITTLE_ENDIAN
 /*-----------------------------------------------------------------------------------*/
+u16_t
+htons(u16_t n)
+{
+  return ((n & 0xff) << 8) | ((n & 0xff00) >> 8);
+}
+/*-----------------------------------------------------------------------------------*/
+u16_t
+ntohs(u16_t n)
+{
+  return htons(n);
+}
+/*-----------------------------------------------------------------------------------*/
+u32_t
+htonl(u32_t n)
+{
+  return ((n & 0xff) << 24) |
+    ((n & 0xff00) << 8) |
+    ((n & 0xff0000) >> 8) |
+    ((n & 0xff000000) >> 24);
+}
+/*-----------------------------------------------------------------------------------*/
+u32_t
+ntohl(u32_t n)
+{
+  return htonl(n);
+}
+/*-----------------------------------------------------------------------------------*/
+#endif /* BYTE_ORDER == LITTLE_ENDIAN */

src/core/inet6.c

@@ -39,7 +39,7 @@
  */
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/def.h"
 #include "lwip/inet.h"

src/core/ipv4/icmp.c

@@ -33,7 +33,7 @@
 /* Some ICMP messages should be passed to the transport protocols. This
    is not implemented. */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/icmp.h"
 #include "lwip/inet.h"

src/core/ipv4/ip.c

@@ -39,7 +39,8 @@
  */   
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
+
 
 #include "lwip/def.h"
 #include "lwip/mem.h"

src/core/ipv4/ip_addr.c

@@ -30,7 +30,6 @@
  *
  */
 
-#include "lwip/debug.h"
 #include "lwip/ip_addr.h"
 #include "lwip/inet.h"
 

src/core/ipv4/ip_frag.c

@@ -39,7 +39,7 @@
  */
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 #include "lwip/sys.h"
 #include "lwip/ip.h"
 #include "lwip/ip_frag.h"

src/core/ipv6/icmp6.c

@@ -33,7 +33,7 @@
 /* Some ICMP messages should be passed to the transport protocols. This
    is not implemented. */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/icmp.h"
 #include "lwip/inet.h"

src/core/ipv6/ip6.c

@@ -39,7 +39,7 @@
  */   
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/def.h"
 #include "lwip/mem.h"

src/core/ipv6/ip6_addr.c

@@ -30,7 +30,6 @@
  *
  */
 
-#include "lwip/debug.h"
 #include "lwip/ip_addr.h"
 #include "lwip/inet.h"
 

src/core/mem.c

@@ -37,7 +37,6 @@
  *
  */
 /*-----------------------------------------------------------------------------------*/
-#include "lwip/debug.h"
 
 #include "lwip/arch.h"
 #include "lwip/opt.h"

src/core/netif.c

@@ -30,7 +30,7 @@
  *
  */
 
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/def.h"
 #include "lwip/mem.h"

src/core/pbuf.c

@@ -38,7 +38,7 @@
  *
  */
 /*-----------------------------------------------------------------------------------*/
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/stats.h"
 

src/core/stats.c

@@ -31,7 +31,6 @@
  */
 
 
-#include "lwip/debug.h"
 #include "lwip/opt.h"
 
 #include "lwip/def.h"

src/core/sys.c

@@ -30,8 +30,6 @@
  *
  */
 
-#include "lwip/debug.h"
-
 #include "lwip/sys.h"
 #include "lwip/opt.h"
 #include "lwip/def.h"

src/core/tcp.c

@@ -40,15 +40,14 @@
  */
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
 
+#include "lwip/opt.h"
 #include "lwip/def.h"
 #include "lwip/mem.h"
 #include "lwip/memp.h"
 
 #include "lwip/tcp.h"
 
-#include "lwip/opt.h"
 
 /* Incremented every coarse grained timer shot
    (typically every 500 ms, determined by TCP_COARSE_TIMEOUT). */
@@ -430,7 +429,7 @@ tcp_connect(struct tcp_pcb *pcb, struct ip_addr *ipaddr, u16_t port,
   TCP_REG(&tcp_active_pcbs, pcb);
   
   /* Build an MSS option */
-  optdata = HTONL(((u32_t)2 << 24) | 
+  optdata = htonl(((u32_t)2 << 24) | 
 		  ((u32_t)4 << 16) | 
 		  (((u32_t)pcb->mss / 256) << 8) |
 		  (pcb->mss & 255));

src/core/tcp_in.c

@@ -41,7 +41,6 @@
  */
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
 
 #include "lwip/def.h"
 #include "lwip/opt.h"
@@ -387,7 +386,7 @@ tcp_listen_input(struct tcp_pcb_listen *pcb)
     tcp_parseopt(npcb);
     
     /* Build an MSS option. */
-    optdata = HTONL(((u32_t)2 << 24) | 
+    optdata = htonl(((u32_t)2 << 24) | 
 		    ((u32_t)4 << 16) | 
 		    (((u32_t)npcb->mss / 256) << 8) |
 		    (npcb->mss & 255));
@@ -725,12 +724,10 @@ tcp_receive(struct tcp_pcb *pcb)
 	tcp_seg_free(next);
 	
 	DEBUGF(TCP_QLEN_DEBUG, ("%d (after freeing unacked)\n", pcb->snd_queuelen));
-#ifdef LWIP_DEBUG
 	if(pcb->snd_queuelen != 0) {
 	  LWIP_ASSERT("tcp_receive: valid queue length", pcb->unacked != NULL ||
 		 pcb->unsent != NULL);      
 	}
-#endif /* LWIP_DEBUG */
       }
       pcb->polltmr = 0;
     }
@@ -756,12 +753,10 @@ tcp_receive(struct tcp_pcb *pcb)
 	pcb->snd_queuelen -= pbuf_clen(next->p);
 	tcp_seg_free(next);
 	DEBUGF(TCP_QLEN_DEBUG, ("%d (after freeing unsent)\n", pcb->snd_queuelen));
-#ifdef LWIP_DEBUG
 	if(pcb->snd_queuelen != 0) {
 	  LWIP_ASSERT("tcp_receive: valid queue length", pcb->unacked != NULL ||
 		 pcb->unsent != NULL);      
 	}
-#endif /* LWIP_DEBUG */
 	
         if(pcb->unsent != NULL) {
           pcb->snd_nxt = htonl(pcb->unsent->tcphdr->seqno);

src/core/tcp_out.c

@@ -38,7 +38,6 @@
  */
 /*-----------------------------------------------------------------------------------*/
 
-#include "lwip/debug.h"
 
 #include "lwip/def.h"
 #include "lwip/opt.h"
@@ -125,12 +124,10 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len,
     goto memerr;
   }   
 
-#ifdef LWIP_DEBUG
   if(pcb->snd_queuelen != 0) {
     LWIP_ASSERT("tcp_enqueue: valid queue length", pcb->unacked != NULL ||
     pcb->unsent != NULL);      
   }
-#endif /* LWIP_DEBUG */
 
   seg = NULL;
   seglen = 0;
@@ -306,13 +303,11 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len,
   pcb->snd_buf -= len;
   pcb->snd_queuelen = queuelen;
   DEBUGF(TCP_QLEN_DEBUG, ("tcp_enqueue: %d (after enqueued)\n", pcb->snd_queuelen));
-#ifdef LWIP_DEBUG
   if(pcb->snd_queuelen != 0) {
     LWIP_ASSERT("tcp_enqueue: valid queue length", pcb->unacked != NULL ||
       pcb->unsent != NULL);
 
   }
-#endif /* LWIP_DEBUG */
 
   /* Set the PSH flag in the last segment that we enqueued, but only
   if the segment has data (indicated by seglen > 0). */
@@ -329,13 +324,11 @@ tcp_enqueue(struct tcp_pcb *pcb, void *arg, u16_t len,
   if(queue != NULL) {
     tcp_segs_free(queue);
   }
-#ifdef LWIP_DEBUG
   if(pcb->snd_queuelen != 0) {
     LWIP_ASSERT("tcp_enqueue: valid queue length", pcb->unacked != NULL ||
       pcb->unsent != NULL);
 
   }
-#endif /* LWIP_DEBUG */
   DEBUGF(TCP_QLEN_DEBUG, ("tcp_enqueue: %d (with mem err)\n", pcb->snd_queuelen));
   return ERR_MEM;
 }

src/core/udp.c

@@ -37,7 +37,7 @@
  *
  */
 /*-----------------------------------------------------------------------------------*/
-#include "lwip/debug.h"
+#include "lwip/opt.h"
 
 #include "lwip/def.h"
 #include "lwip/memp.h"
@@ -94,8 +94,8 @@ udp_lookup(struct ip_hdr *iphdr, struct netif *inp)
 
     udphdr = (struct udp_hdr *)(u8_t *)iphdr + IPH_HL(iphdr) * 4;
 
-  src = NTOHS(udphdr->src);
-  dest = NTOHS(udphdr->dest);
+  src = ntohs(udphdr->src);
+  dest = ntohs(udphdr->dest);
 
     pcb = pcb_cache;
   if(pcb != NULL &&
@@ -177,8 +177,8 @@ udp_input(struct pbuf *p, struct netif *inp)
   
   DEBUGF(UDP_DEBUG, ("udp_input: received datagram of length %u\n", p->tot_len));
 	
-  src = NTOHS(udphdr->src);
-  dest = NTOHS(udphdr->dest);
+  src = ntohs(udphdr->src);
+  dest = ntohs(udphdr->dest);
 
 #if UDP_DEBUG
   udp_debug_print(udphdr);