Fixed bugs as listed to date in the tracker for the SourceForge project.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@107 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/Common/ethernet/uIP/uip-1.0/uip/uip.c b/Demo/Common/ethernet/uIP/uip-1.0/uip/uip.c
index fd0b2ced132838e8a201f3ac31e53da84249e0d7..e5854e99411301dfc8abf3dfda4e81ef978fb268 100644 (file)
--- a/Demo/Common/ethernet/uIP/uip-1.0/uip/uip.c
+++ b/Demo/Common/ethernet/uIP/uip-1.0/uip/uip.c
@@ -742,7 +742,8 @@ uip_process(u8_t flag)
         connection's timer and see if it has reached the RTO value\r
         in which case we retransmit. */\r
       if(uip_outstanding(uip_connr)) {\r
-       if(uip_connr->timer-- == 0) {\r
+         uip_connr->timer = uip_connr->timer - 1;\r
+       if(uip_connr->timer == 0) {\r
          if(uip_connr->nrtx == UIP_MAXRTX ||\r
             ((uip_connr->tcpstateflags == UIP_SYN_SENT ||\r
               uip_connr->tcpstateflags == UIP_SYN_RCVD) &&\r
@@ -1128,6 +1129,7 @@ uip_process(u8_t flag)
   goto drop;\r
 \r
  udp_found:\r
+  UIP_STAT(++uip_stat.udp.recv);\r
   uip_conn = NULL;\r
   uip_flags = UIP_NEWDATA;\r
   uip_sappdata = uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];\r
@@ -1161,7 +1163,7 @@ uip_process(u8_t flag)
   uip_ipaddr_copy(BUF->srcipaddr, uip_hostaddr);\r
   uip_ipaddr_copy(BUF->destipaddr, uip_udp_conn->ripaddr);\r
 \r
-  uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPTCPH_LEN];\r
+  uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPUDPH_LEN];\r
 \r
 #if UIP_UDP_CHECKSUMS\r
   /* Calculate UDP checksum. */\r
@@ -1170,7 +1172,7 @@ uip_process(u8_t flag)
     UDPBUF->udpchksum = 0xffff;\r
   }\r
 #endif /* UIP_UDP_CHECKSUMS */\r
-\r
+  UIP_STAT(++uip_stat.udp.sent);\r
   goto ip_send_nolen;\r
 #endif /* UIP_UDP */\r
 \r