commit a05e0b276243b03caaf3eae8e84e9b52c764a8c1
author oliverschmidt <oliverschmidt> jeu. févr. 24 22:05:24 2005 +0000
committer oliverschmidt <oliverschmidt> jeu. févr. 24 22:05:24 2005 +0000
tree 234a615cfbb9860d879a6ce649b4372901d12455
parent f2cb747724228cc165309f94ea2c460819c43d20

Make use of the UIP_IPH_LEN, UIP_TCPH_LEN and UIP_IPTCPH_LEN defines where they apply.

contiki-gb/uip/uip_arch.c

diff --git a/contiki-gb/uip/uip_arch.c b/contiki-gb/uip/uip_arch.c
index 46f5a8e..50cd7f7 100644
--- a/contiki-gb/uip/uip_arch.c
+++ b/contiki-gb/uip/uip_arch.c
@@ -31,7 +31,7 @@
  *
  * This file is part of the uIP TCP/IP stack.
  *
- * $Id: uip_arch.c,v 1.2 2005/01/26 23:36:29 oliverschmidt Exp $
+ * $Id: uip_arch.c,v 1.3 2005/02/24 22:05:24 oliverschmidt Exp $
  *
  */
 
@@ -125,7 +125,7 @@
 u16_t
 uip_ipchksum(void)
 {
-  return uip_chksum((u16_t *)&uip_buf[UIP_LLH_LEN], 20);
+  return uip_chksum((u16_t *)&uip_buf[UIP_LLH_LEN], UIP_IPH_LEN);
 }
 /*-----------------------------------------------------------------------------------*/
 u16_t
@@ -135,12 +135,13 @@
 
   
   /* Compute the checksum of the TCP header. */
-  hsum = uip_chksum((u16_t *)&uip_buf[20 + UIP_LLH_LEN], 20);
+  hsum = uip_chksum((u16_t *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN], UIP_TCPH_LEN);
 
   /* Compute the checksum of the data in the TCP packet and add it to
      the TCP header checksum. */
   sum = uip_chksum((u16_t *)uip_appdata,
-	       (u16_t)(((((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - 40)));
+		   (u16_t)(((((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) -
+		   UIP_IPTCPH_LEN)));
 
   if((sum += hsum) < hsum) {
     ++sum;
@@ -162,7 +163,7 @@
     ++sum;
   }
 
-  hsum = (u16_t)htons((((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - 20);
+  hsum = (u16_t)HTONS((((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN);
   
   if((sum += hsum) < hsum) {
     ++sum;