Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Projects / Webserver / Lib / uip / uip.c

diff --git a/Projects/Webserver/Lib/uip/uip.c b/Projects/Webserver/Lib/uip/uip.c
index 3605302..94171ad 100644 (file)
--- a/Projects/Webserver/Lib/uip/uip.c
+++ b/Projects/Webserver/Lib/uip/uip.c
@@ -245,15 +245,15 @@ uip_add32(u8_t *op32, u16_t op16)
   uip_acc32[2] = op32[2] + (op16 >> 8);
   uip_acc32[1] = op32[1];
   uip_acc32[0] = op32[0];
   uip_acc32[2] = op32[2] + (op16 >> 8);
   uip_acc32[1] = op32[1];
   uip_acc32[0] = op32[0];

-  
+

   if(uip_acc32[2] < (op16 >> 8)) {
     ++uip_acc32[1];
     if(uip_acc32[1] == 0) {
       ++uip_acc32[0];
     }
   }
   if(uip_acc32[2] < (op16 >> 8)) {
     ++uip_acc32[1];
     if(uip_acc32[1] == 0) {
       ++uip_acc32[0];
     }
   }

-  
-  
+
+

   if(uip_acc32[3] < (op16 & 0xff)) {
     ++uip_acc32[2];
     if(uip_acc32[2] == 0) {
   if(uip_acc32[3] < (op16 & 0xff)) {
     ++uip_acc32[2];
     if(uip_acc32[2] == 0) {


@@ -278,7 +278,7 @@ chksum(u16_t sum, const u8_t *data, u16_t len)
 
   dataptr = data;
   last_byte = data + len - 1;
 
   dataptr = data;
   last_byte = data + len - 1;

-  
+

   while(dataptr < last_byte) { /* At least two more bytes */
     t = (dataptr[0] << 8) + dataptr[1];
     sum += t;
   while(dataptr < last_byte) { /* At least two more bytes */
     t = (dataptr[0] << 8) + dataptr[1];
     sum += t;


@@ -287,7 +287,7 @@ chksum(u16_t sum, const u8_t *data, u16_t len)
     }
     dataptr += 2;
   }
     }
     dataptr += 2;
   }

-  
+

   if(dataptr == last_byte) {
     t = (dataptr[0] << 8) + 0;
     sum += t;
   if(dataptr == last_byte) {
     t = (dataptr[0] << 8) + 0;
     sum += t;


@@ -323,15 +323,15 @@ upper_layer_chksum(u8_t proto)
 {
   u16_t upper_layer_len;
   u16_t sum;
 {
   u16_t upper_layer_len;
   u16_t sum;

-  
+

 #if UIP_CONF_IPV6
   upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]);
 #else /* UIP_CONF_IPV6 */
   upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
 #endif /* UIP_CONF_IPV6 */
 #if UIP_CONF_IPV6
   upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]);
 #else /* UIP_CONF_IPV6 */
   upper_layer_len = (((u16_t)(BUF->len[0]) << 8) + BUF->len[1]) - UIP_IPH_LEN;
 #endif /* UIP_CONF_IPV6 */

-  
+

   /* First sum pseudoheader. */
   /* First sum pseudoheader. */

-  
+

   /* IP protocol and length fields. This addition cannot carry. */
   sum = upper_layer_len + proto;
   /* Sum IP source and destination addresses. */
   /* IP protocol and length fields. This addition cannot carry. */
   sum = upper_layer_len + proto;
   /* Sum IP source and destination addresses. */


@@ -340,7 +340,7 @@ upper_layer_chksum(u8_t proto)
   /* Sum TCP header and data. */
   sum = chksum(sum, &uip_buf[UIP_IPH_LEN + UIP_LLH_LEN],
               upper_layer_len);
   /* Sum TCP header and data. */
   sum = chksum(sum, &uip_buf[UIP_IPH_LEN + UIP_LLH_LEN],
               upper_layer_len);

-    
+

   return (sum == 0) ? 0xffff : htons(sum);
 }
 /*---------------------------------------------------------------------------*/
   return (sum == 0) ? 0xffff : htons(sum);
 }
 /*---------------------------------------------------------------------------*/


@@ -349,7 +349,7 @@ u16_t
 uip_icmp6chksum(void)
 {
   return upper_layer_chksum(UIP_PROTO_ICMP6);
 uip_icmp6chksum(void)
 {
   return upper_layer_chksum(UIP_PROTO_ICMP6);

-  
+

 }
 #endif /* UIP_CONF_IPV6 */
 /*---------------------------------------------------------------------------*/
 }
 #endif /* UIP_CONF_IPV6 */
 /*---------------------------------------------------------------------------*/


@@ -386,7 +386,7 @@ uip_init(void)
     uip_udp_conns[c].lport = 0;
   }
 #endif /* UIP_UDP */
     uip_udp_conns[c].lport = 0;
   }
 #endif /* UIP_UDP */

-  
+

 
   /* IPv4 initialization. */
 #if UIP_FIXEDADDR == 0
 
   /* IPv4 initialization. */
 #if UIP_FIXEDADDR == 0


@@ -400,7 +400,7 @@ struct uip_conn *
 uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
 {
   register struct uip_conn *conn, *cconn;
 uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
 {
   register struct uip_conn *conn, *cconn;

-  
+

   /* Find an unused local port. */
  again:
   ++lastport;
   /* Find an unused local port. */
  again:
   ++lastport;


@@ -437,7 +437,7 @@ uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
   if(conn == 0) {
     return 0;
   }
   if(conn == 0) {
     return 0;
   }

-  
+

   conn->tcpstateflags = UIP_SYN_SENT;
 
   conn->snd_nxt[0] = iss[0];
   conn->tcpstateflags = UIP_SYN_SENT;
 
   conn->snd_nxt[0] = iss[0];


@@ -446,7 +446,7 @@ uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
   conn->snd_nxt[3] = iss[3];
 
   conn->initialmss = conn->mss = UIP_TCP_MSS;
   conn->snd_nxt[3] = iss[3];
 
   conn->initialmss = conn->mss = UIP_TCP_MSS;

-  
+

   conn->len = 1;   /* TCP length of the SYN is one. */
   conn->nrtx = 0;
   conn->timer = 1; /* Send the SYN next time around. */
   conn->len = 1;   /* TCP length of the SYN is one. */
   conn->nrtx = 0;
   conn->timer = 1; /* Send the SYN next time around. */


@@ -456,7 +456,7 @@ uip_connect(uip_ipaddr_t *ripaddr, u16_t rport)
   conn->lport = htons(lastport);
   conn->rport = rport;
   uip_ipaddr_copy(&conn->ripaddr, ripaddr);
   conn->lport = htons(lastport);
   conn->rport = rport;
   uip_ipaddr_copy(&conn->ripaddr, ripaddr);

-  
+

   return conn;
 }
 #endif /* UIP_ACTIVE_OPEN */
   return conn;
 }
 #endif /* UIP_ACTIVE_OPEN */


@@ -466,7 +466,7 @@ struct uip_udp_conn *
 uip_udp_new(const uip_ipaddr_t *ripaddr, u16_t rport)
 {
   register struct uip_udp_conn *conn;
 uip_udp_new(const uip_ipaddr_t *ripaddr, u16_t rport)
 {
   register struct uip_udp_conn *conn;

-  
+

   /* Find an unused local port. */
  again:
   ++lastport;
   /* Find an unused local port. */
  again:
   ++lastport;


@@ -474,7 +474,7 @@ uip_udp_new(const uip_ipaddr_t *ripaddr, u16_t rport)
   if(lastport >= 32000) {
     lastport = 4096;
   }
   if(lastport >= 32000) {
     lastport = 4096;
   }

-  
+

   for(c = 0; c < UIP_UDP_CONNS; ++c) {
     if(uip_udp_conns[c].lport == htons(lastport)) {
       goto again;
   for(c = 0; c < UIP_UDP_CONNS; ++c) {
     if(uip_udp_conns[c].lport == htons(lastport)) {
       goto again;


@@ -493,7 +493,7 @@ uip_udp_new(const uip_ipaddr_t *ripaddr, u16_t rport)
   if(conn == 0) {
     return 0;
   }
   if(conn == 0) {
     return 0;
   }

-  
+

   conn->lport = HTONS(lastport);
   conn->rport = rport;
   if(ripaddr == NULL) {
   conn->lport = HTONS(lastport);
   conn->rport = rport;
   if(ripaddr == NULL) {


@@ -502,7 +502,7 @@ uip_udp_new(const uip_ipaddr_t *ripaddr, u16_t rport)
     uip_ipaddr_copy(&conn->ripaddr, ripaddr);
   }
   conn->ttl = UIP_TTL;
     uip_ipaddr_copy(&conn->ripaddr, ripaddr);
   }
   conn->ttl = UIP_TTL;

-  
+

   return conn;
 }
 #endif /* UIP_UDP */
   return conn;
 }
 #endif /* UIP_UDP */


@@ -587,12 +587,12 @@ uip_reass(void)
     memcpy(&uip_reassbuf[UIP_IPH_LEN + offset],
           (char *)BUF + (int)((BUF->vhl & 0x0f) * 4),
           len);
     memcpy(&uip_reassbuf[UIP_IPH_LEN + offset],
           (char *)BUF + (int)((BUF->vhl & 0x0f) * 4),
           len);

-      
+

     /* Update the bitmap. */
     if(offset / (8 * 8) == (offset + len) / (8 * 8)) {
       /* If the two endpoints are in the same byte, we only update
         that byte. */
     /* Update the bitmap. */
     if(offset / (8 * 8) == (offset + len) / (8 * 8)) {
       /* If the two endpoints are in the same byte, we only update
         that byte. */

-            
+

       uip_reassbitmap[offset / (8 * 8)] |=
             bitmap_bits[(offset / 8 ) & 7] &
             ~bitmap_bits[((offset + len) / 8 ) & 7];
       uip_reassbitmap[offset / (8 * 8)] |=
             bitmap_bits[(offset / 8 ) & 7] &
             ~bitmap_bits[((offset + len) / 8 ) & 7];


@@ -608,7 +608,7 @@ uip_reass(void)
       uip_reassbitmap[(offset + len) / (8 * 8)] |=
        ~bitmap_bits[((offset + len) / 8 ) & 7];
     }
       uip_reassbitmap[(offset + len) / (8 * 8)] |=
        ~bitmap_bits[((offset + len) / 8 ) & 7];
     }

-    
+

     /* If this fragment has the More Fragments flag set to zero, we
        know that this is the last fragment, so we can calculate the
        size of the entire packet. We also set the
     /* If this fragment has the More Fragments flag set to zero, we
        know that this is the last fragment, so we can calculate the
        size of the entire packet. We also set the


@@ -619,7 +619,7 @@ uip_reass(void)
       uip_reassflags |= UIP_REASS_FLAG_LASTFRAG;
       uip_reasslen = offset + len;
     }
       uip_reassflags |= UIP_REASS_FLAG_LASTFRAG;
       uip_reasslen = offset + len;
     }

-    
+

     /* Finally, we check if we have a full packet in the buffer. We do
        this by checking if we have the last fragment and if all bits
        in the bitmap are set. */
     /* Finally, we check if we have a full packet in the buffer. We do
        this by checking if we have the last fragment and if all bits
        in the bitmap are set. */


@@ -681,7 +681,7 @@ uip_process(u8_t flag)
     goto udp_send;
   }
 #endif /* UIP_UDP */
     goto udp_send;
   }
 #endif /* UIP_UDP */

-  
+

   uip_sappdata = uip_appdata = &uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN];
 
   /* Check if we were invoked because of a poll request for a
   uip_sappdata = uip_appdata = &uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN];
 
   /* Check if we were invoked because of a poll request for a


@@ -695,7 +695,7 @@ uip_process(u8_t flag)
        goto appsend;
     }
     goto drop;
        goto appsend;
     }
     goto drop;

-    
+

     /* Check if we were invoked because of the periodic timer firing. */
   } else if(flag == UIP_TIMER) {
 #if UIP_REASSEMBLY
     /* Check if we were invoked because of the periodic timer firing. */
   } else if(flag == UIP_TIMER) {
 #if UIP_REASSEMBLY


@@ -754,7 +754,7 @@ uip_process(u8_t flag)
                                         4:
                                         uip_connr->nrtx);
          ++(uip_connr->nrtx);
                                         4:
                                         uip_connr->nrtx);
          ++(uip_connr->nrtx);

-         
+

          /* Ok, so we need to retransmit. We do this differently
             depending on which state we are in. In ESTABLISHED, we
             call upon the application so that it may prepare the
          /* Ok, so we need to retransmit. We do this differently
             depending on which state we are in. In ESTABLISHED, we
             call upon the application so that it may prepare the


@@ -767,14 +767,14 @@ uip_process(u8_t flag)
            /* In the SYN_RCVD state, we should retransmit our
                SYNACK. */
            goto tcp_send_synack;
            /* In the SYN_RCVD state, we should retransmit our
                SYNACK. */
            goto tcp_send_synack;

-           
+

 #if UIP_ACTIVE_OPEN
          case UIP_SYN_SENT:
            /* In the SYN_SENT state, we retransmit out SYN. */
            BUF->flags = 0;
            goto tcp_send_syn;
 #endif /* UIP_ACTIVE_OPEN */
 #if UIP_ACTIVE_OPEN
          case UIP_SYN_SENT:
            /* In the SYN_SENT state, we retransmit out SYN. */
            BUF->flags = 0;
            goto tcp_send_syn;
 #endif /* UIP_ACTIVE_OPEN */

-           
+

          case UIP_ESTABLISHED:
            /* In the ESTABLISHED state, we call upon the application
                to do the actual retransmit after which we jump into
          case UIP_ESTABLISHED:
            /* In the ESTABLISHED state, we call upon the application
                to do the actual retransmit after which we jump into


@@ -783,19 +783,19 @@ uip_process(u8_t flag)
            uip_flags = UIP_REXMIT;
            UIP_APPCALL();
            goto apprexmit;
            uip_flags = UIP_REXMIT;
            UIP_APPCALL();
            goto apprexmit;

-           
+

          case UIP_FIN_WAIT_1:
          case UIP_CLOSING:
          case UIP_LAST_ACK:
            /* In all these states we should retransmit a FINACK. */
            goto tcp_send_finack;
          case UIP_FIN_WAIT_1:
          case UIP_CLOSING:
          case UIP_LAST_ACK:
            /* In all these states we should retransmit a FINACK. */
            goto tcp_send_finack;

-           
+

          }
        }
       } else if((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED) {
        /* If there was no need for a retransmission, we poll the
            application for new data. */
          }
        }
       } else if((uip_connr->tcpstateflags & UIP_TS_MASK) == UIP_ESTABLISHED) {
        /* If there was no need for a retransmission, we poll the
            application for new data. */

-       uip_len = uip_slen = 0;            
+       uip_len = uip_slen = 0;

        uip_flags = UIP_POLL;
        UIP_APPCALL();
        goto appsend;
        uip_flags = UIP_POLL;
        UIP_APPCALL();
        goto appsend;


@@ -822,7 +822,7 @@ uip_process(u8_t flag)
   UIP_STAT(++uip_stat.ip.recv);
 
   /* Start of IP input header processing code. */
   UIP_STAT(++uip_stat.ip.recv);
 
   /* Start of IP input header processing code. */

-  
+

 #if UIP_CONF_IPV6
   /* Check validity of the IP header. */
   if((BUF->vtc & 0xf0) != 0x60)  { /* IP version and header length. */
 #if UIP_CONF_IPV6
   /* Check validity of the IP header. */
   if((BUF->vtc & 0xf0) != 0x60)  { /* IP version and header length. */


@@ -840,7 +840,7 @@ uip_process(u8_t flag)
     goto drop;
   }
 #endif /* UIP_CONF_IPV6 */
     goto drop;
   }
 #endif /* UIP_CONF_IPV6 */

-  
+

   /* Check the size of the packet. If the size reported to us in
      uip_len is smaller the size reported in the IP header, we assume
      that the packet has been corrupted in transit. If the size of
   /* Check the size of the packet. If the size reported to us in
      uip_len is smaller the size reported in the IP header, we assume
      that the packet has been corrupted in transit. If the size of


@@ -904,13 +904,15 @@ uip_process(u8_t flag)
 #if UIP_BROADCAST
     DEBUG_PRINTF("UDP IP checksum 0x%04x\n", uip_ipchksum());
     if(BUF->proto == UIP_PROTO_UDP &&
 #if UIP_BROADCAST
     DEBUG_PRINTF("UDP IP checksum 0x%04x\n", uip_ipchksum());
     if(BUF->proto == UIP_PROTO_UDP &&

-       uip_ipaddr_cmp(&BUF->destipaddr, &uip_broadcast_addr)
-       /*&&
-        uip_ipchksum() == 0xffff*/) {
-      goto udp_input;
+       uip_ipaddr_cmp(&BUF->destipaddr, &uip_broadcast_addr))
+       {
+               if (uip_ipaddr_cmp(&BUF->srcipaddr, &uip_all_zeroes_addr))
+                 uip_ipaddr_copy(&BUF->srcipaddr, &uip_broadcast_addr);
+
+               goto udp_input;

     }
 #endif /* UIP_BROADCAST */
     }
 #endif /* UIP_BROADCAST */

-    
+

     /* Check if the packet is destined for our IP address. */
 #if !UIP_CONF_IPV6
     if(!uip_ipaddr_cmp(&BUF->destipaddr, &uip_hostaddr)) {
     /* Check if the packet is destined for our IP address. */
 #if !UIP_CONF_IPV6
     if(!uip_ipaddr_cmp(&BUF->destipaddr, &uip_hostaddr)) {


@@ -1028,14 +1030,14 @@ uip_process(u8_t flag)
        /* Save the sender's address in our neighbor list. */
        uip_neighbor_add(&ICMPBUF->srcipaddr, &(ICMPBUF->options[2]));
       }
        /* Save the sender's address in our neighbor list. */
        uip_neighbor_add(&ICMPBUF->srcipaddr, &(ICMPBUF->options[2]));
       }

-      
+

       /* We should now send a neighbor advertisement back to where the
         neighbor solicitation came from. */
       ICMPBUF->type = ICMP6_NEIGHBOR_ADVERTISEMENT;
       ICMPBUF->flags = ICMP6_FLAG_S; /* Solicited flag. */
       /* We should now send a neighbor advertisement back to where the
         neighbor solicitation came from. */
       ICMPBUF->type = ICMP6_NEIGHBOR_ADVERTISEMENT;
       ICMPBUF->flags = ICMP6_FLAG_S; /* Solicited flag. */

-      
+

       ICMPBUF->reserved1 = ICMPBUF->reserved2 = ICMPBUF->reserved3 = 0;
       ICMPBUF->reserved1 = ICMPBUF->reserved2 = ICMPBUF->reserved3 = 0;

-      
+

       uip_ipaddr_copy(&ICMPBUF->destipaddr, &ICMPBUF->srcipaddr);
       uip_ipaddr_copy(&ICMPBUF->srcipaddr, &uip_hostaddr);
       ICMPBUF->options[0] = ICMP6_OPTION_TARGET_LINK_ADDRESS;
       uip_ipaddr_copy(&ICMPBUF->destipaddr, &ICMPBUF->srcipaddr);
       uip_ipaddr_copy(&ICMPBUF->srcipaddr, &uip_hostaddr);
       ICMPBUF->options[0] = ICMP6_OPTION_TARGET_LINK_ADDRESS;


@@ -1043,9 +1045,9 @@ uip_process(u8_t flag)
       memcpy(&(ICMPBUF->options[2]), &uip_ethaddr, sizeof(uip_ethaddr));
       ICMPBUF->icmpchksum = 0;
       ICMPBUF->icmpchksum = ~uip_icmp6chksum();
       memcpy(&(ICMPBUF->options[2]), &uip_ethaddr, sizeof(uip_ethaddr));
       ICMPBUF->icmpchksum = 0;
       ICMPBUF->icmpchksum = ~uip_icmp6chksum();

-      
+

       goto send;
       goto send;

-      
+

     }
     goto drop;
   } else if(ICMPBUF->type == ICMP6_ECHO) {
     }
     goto drop;
   } else if(ICMPBUF->type == ICMP6_ECHO) {


@@ -1054,12 +1056,12 @@ uip_process(u8_t flag)
        ICMP checksum before we return the packet. */
 
     ICMPBUF->type = ICMP6_ECHO_REPLY;
        ICMP checksum before we return the packet. */
 
     ICMPBUF->type = ICMP6_ECHO_REPLY;

-    
+

     uip_ipaddr_copy(&BUF->destipaddr, &BUF->srcipaddr);
     uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);
     ICMPBUF->icmpchksum = 0;
     ICMPBUF->icmpchksum = ~uip_icmp6chksum();
     uip_ipaddr_copy(&BUF->destipaddr, &BUF->srcipaddr);
     uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);
     ICMPBUF->icmpchksum = 0;
     ICMPBUF->icmpchksum = ~uip_icmp6chksum();

-    
+

     UIP_STAT(++uip_stat.icmp.sent);
     goto send;
   } else {
     UIP_STAT(++uip_stat.icmp.sent);
     goto send;
   } else {


@@ -1071,7 +1073,7 @@ uip_process(u8_t flag)
   }
 
   /* End of IPv6 ICMP processing. */
   }
 
   /* End of IPv6 ICMP processing. */

-  
+

 #endif /* !UIP_CONF_IPV6 */
 
 #if UIP_UDP
 #endif /* !UIP_CONF_IPV6 */
 
 #if UIP_UDP


@@ -1147,7 +1149,7 @@ uip_process(u8_t flag)
 #else /* UIP_CONF_ICMP_DEST_UNREACH */
   goto drop;
 #endif /* UIP_CONF_ICMP_DEST_UNREACH */
 #else /* UIP_CONF_ICMP_DEST_UNREACH */
   goto drop;
 #endif /* UIP_CONF_ICMP_DEST_UNREACH */

-  
+

  udp_found:
   uip_conn = NULL;
   uip_flags = UIP_NEWDATA;
  udp_found:
   uip_conn = NULL;
   uip_flags = UIP_NEWDATA;


@@ -1182,7 +1184,7 @@ uip_process(u8_t flag)
 
   uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);
   uip_ipaddr_copy(&BUF->destipaddr, &uip_udp_conn->ripaddr);
 
   uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);
   uip_ipaddr_copy(&BUF->destipaddr, &uip_udp_conn->ripaddr);

-   
+

   uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPTCPH_LEN];
 
 #if UIP_UDP_CHECKSUMS
   uip_appdata = &uip_buf[UIP_LLH_LEN + UIP_IPTCPH_LEN];
 
 #if UIP_UDP_CHECKSUMS


@@ -1192,16 +1194,16 @@ uip_process(u8_t flag)
     UDPBUF->udpchksum = 0xffff;
   }
 #endif /* UIP_UDP_CHECKSUMS */
     UDPBUF->udpchksum = 0xffff;
   }
 #endif /* UIP_UDP_CHECKSUMS */

-  
+

   goto ip_send_nolen;
 #endif /* UIP_UDP */
   goto ip_send_nolen;
 #endif /* UIP_UDP */

-  
+

   /* TCP input processing. */
  tcp_input:
   UIP_STAT(++uip_stat.tcp.recv);
 
   /* Start of TCP input header processing code. */
   /* TCP input processing. */
  tcp_input:
   UIP_STAT(++uip_stat.tcp.recv);
 
   /* Start of TCP input header processing code. */

-  
+

   if(uip_tcpchksum() != 0xffff) {   /* Compute and check the TCP
                                       checksum. */
     UIP_STAT(++uip_stat.tcp.drop);
   if(uip_tcpchksum() != 0xffff) {   /* Compute and check the TCP
                                       checksum. */
     UIP_STAT(++uip_stat.tcp.drop);


@@ -1209,7 +1211,7 @@ uip_process(u8_t flag)
     UIP_LOG("tcp: bad checksum.");
     goto drop;
   }
     UIP_LOG("tcp: bad checksum.");
     goto drop;
   }

-  
+

   /* Demultiplex this segment. */
   /* First check any active connections. */
   for(uip_connr = &uip_conns[0]; uip_connr <= &uip_conns[UIP_CONNS - 1];
   /* Demultiplex this segment. */
   /* First check any active connections. */
   for(uip_connr = &uip_conns[0]; uip_connr <= &uip_conns[UIP_CONNS - 1];


@@ -1229,7 +1231,7 @@ uip_process(u8_t flag)
   if((BUF->flags & TCP_CTL) != TCP_SYN) {
     goto reset;
   }
   if((BUF->flags & TCP_CTL) != TCP_SYN) {
     goto reset;
   }

-  
+

   tmp16 = BUF->destport;
   /* Next, check listening connections. */
   for(c = 0; c < UIP_LISTENPORTS; ++c) {
   tmp16 = BUF->destport;
   /* Next, check listening connections. */
   for(c = 0; c < UIP_LISTENPORTS; ++c) {


@@ -1237,7 +1239,7 @@ uip_process(u8_t flag)
       goto found_listen;
     }
   }
       goto found_listen;
     }
   }

-  
+

   /* No matching connection found, so we send a RST packet. */
   UIP_STAT(++uip_stat.tcp.synrst);
 
   /* No matching connection found, so we send a RST packet. */
   UIP_STAT(++uip_stat.tcp.synrst);
 


@@ -1248,7 +1250,7 @@ uip_process(u8_t flag)
   }
 
   UIP_STAT(++uip_stat.tcp.rst);
   }
 
   UIP_STAT(++uip_stat.tcp.rst);

-  
+

   BUF->flags = TCP_RST | TCP_ACK;
   uip_len = UIP_IPTCPH_LEN;
   BUF->tcpoffset = 5 << 4;
   BUF->flags = TCP_RST | TCP_ACK;
   uip_len = UIP_IPTCPH_LEN;
   BUF->tcpoffset = 5 << 4;


@@ -1257,15 +1259,15 @@ uip_process(u8_t flag)
   c = BUF->seqno[3];
   BUF->seqno[3] = BUF->ackno[3];
   BUF->ackno[3] = c;
   c = BUF->seqno[3];
   BUF->seqno[3] = BUF->ackno[3];
   BUF->ackno[3] = c;

-  
+

   c = BUF->seqno[2];
   BUF->seqno[2] = BUF->ackno[2];
   BUF->ackno[2] = c;
   c = BUF->seqno[2];
   BUF->seqno[2] = BUF->ackno[2];
   BUF->ackno[2] = c;

-  
+

   c = BUF->seqno[1];
   BUF->seqno[1] = BUF->ackno[1];
   BUF->ackno[1] = c;
   c = BUF->seqno[1];
   BUF->seqno[1] = BUF->ackno[1];
   BUF->ackno[1] = c;

-  
+

   c = BUF->seqno[0];
   BUF->seqno[0] = BUF->ackno[0];
   BUF->ackno[0] = c;
   c = BUF->seqno[0];
   BUF->seqno[0] = BUF->ackno[0];
   BUF->ackno[0] = c;


@@ -1280,16 +1282,16 @@ uip_process(u8_t flag)
       }
     }
   }
       }
     }
   }

- 
+

   /* Swap port numbers. */
   tmp16 = BUF->srcport;
   BUF->srcport = BUF->destport;
   BUF->destport = tmp16;
   /* Swap port numbers. */
   tmp16 = BUF->srcport;
   BUF->srcport = BUF->destport;
   BUF->destport = tmp16;

-  
+

   /* Swap IP addresses. */
   uip_ipaddr_copy(&BUF->destipaddr, &BUF->srcipaddr);
   uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);
   /* Swap IP addresses. */
   uip_ipaddr_copy(&BUF->destipaddr, &BUF->srcipaddr);
   uip_ipaddr_copy(&BUF->srcipaddr, &uip_hostaddr);

-  
+

   /* And send out the RST packet! */
   goto tcp_send_noconn;
 
   /* And send out the RST packet! */
   goto tcp_send_noconn;
 


@@ -1326,7 +1328,7 @@ uip_process(u8_t flag)
     goto drop;
   }
   uip_conn = uip_connr;
     goto drop;
   }
   uip_conn = uip_connr;

-  
+

   /* Fill in the necessary fields for the new connection. */
   uip_connr->rto = uip_connr->timer = UIP_RTO;
   uip_connr->sa = 0;
   /* Fill in the necessary fields for the new connection. */
   uip_connr->rto = uip_connr->timer = UIP_RTO;
   uip_connr->sa = 0;


@@ -1367,7 +1369,7 @@ uip_process(u8_t flag)
          (u16_t)uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + 3 + c];
        uip_connr->initialmss = uip_connr->mss =
          tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;
          (u16_t)uip_buf[UIP_IPTCPH_LEN + UIP_LLH_LEN + 3 + c];
        uip_connr->initialmss = uip_connr->mss =
          tmp16 > UIP_TCP_MSS? UIP_TCP_MSS: tmp16;

-       
+

        /* And we are done processing options. */
        break;
       } else {
        /* And we are done processing options. */
        break;
       } else {


@@ -1382,19 +1384,19 @@ uip_process(u8_t flag)
       }
     }
   }
       }
     }
   }

-  
+

   /* Our response will be a SYNACK. */
 #if UIP_ACTIVE_OPEN
  tcp_send_synack:
   BUF->flags = TCP_ACK;
   /* Our response will be a SYNACK. */
 #if UIP_ACTIVE_OPEN
  tcp_send_synack:
   BUF->flags = TCP_ACK;

-  
+

  tcp_send_syn:
   BUF->flags |= TCP_SYN;
 #else /* UIP_ACTIVE_OPEN */
  tcp_send_synack:
   BUF->flags = TCP_SYN | TCP_ACK;
 #endif /* UIP_ACTIVE_OPEN */
  tcp_send_syn:
   BUF->flags |= TCP_SYN;
 #else /* UIP_ACTIVE_OPEN */
  tcp_send_synack:
   BUF->flags = TCP_SYN | TCP_ACK;
 #endif /* UIP_ACTIVE_OPEN */

-  
+

   /* We send out the TCP Maximum Segment Size option with our
      SYNACK. */
   BUF->optdata[0] = TCP_OPT_MSS;
   /* We send out the TCP Maximum Segment Size option with our
      SYNACK. */
   BUF->optdata[0] = TCP_OPT_MSS;


@@ -1458,7 +1460,7 @@ uip_process(u8_t flag)
       uip_connr->snd_nxt[1] = uip_acc32[1];
       uip_connr->snd_nxt[2] = uip_acc32[2];
       uip_connr->snd_nxt[3] = uip_acc32[3];
       uip_connr->snd_nxt[1] = uip_acc32[1];
       uip_connr->snd_nxt[2] = uip_acc32[2];
       uip_connr->snd_nxt[3] = uip_acc32[3];

-       
+

       /* Do RTT estimation, unless we have done retransmissions. */
       if(uip_connr->nrtx == 0) {
        signed char m;
       /* Do RTT estimation, unless we have done retransmissions. */
       if(uip_connr->nrtx == 0) {
        signed char m;


@@ -1482,7 +1484,7 @@ uip_process(u8_t flag)
       /* Reset length of outstanding data. */
       uip_connr->len = 0;
     }
       /* Reset length of outstanding data. */
       uip_connr->len = 0;
     }

-    
+

   }
 
   /* Do different things depending on in what state the connection is. */
   }
 
   /* Do different things depending on in what state the connection is. */


@@ -1570,7 +1572,7 @@ uip_process(u8_t flag)
     uip_conn->tcpstateflags = UIP_CLOSED;
     goto reset;
 #endif /* UIP_ACTIVE_OPEN */
     uip_conn->tcpstateflags = UIP_CLOSED;
     goto reset;
 #endif /* UIP_ACTIVE_OPEN */

-    
+

   case UIP_ESTABLISHED:
     /* In the ESTABLISHED state, we call upon the application to feed
     data into the uip_buf. If the UIP_ACKDATA flag is set, the
   case UIP_ESTABLISHED:
     /* In the ESTABLISHED state, we call upon the application to feed
     data into the uip_buf. If the UIP_ACKDATA flag is set, the


@@ -1672,7 +1674,7 @@ uip_process(u8_t flag)
       UIP_APPCALL();
 
     appsend:
       UIP_APPCALL();
 
     appsend:

-      
+

       if(uip_flags & UIP_ABORT) {
        uip_slen = 0;
        uip_connr->tcpstateflags = UIP_CLOSED;
       if(uip_flags & UIP_ABORT) {
        uip_slen = 0;
        uip_connr->tcpstateflags = UIP_CLOSED;


@@ -1724,7 +1726,7 @@ uip_process(u8_t flag)
       uip_connr->nrtx = 0;
     apprexmit:
       uip_appdata = uip_sappdata;
       uip_connr->nrtx = 0;
     apprexmit:
       uip_appdata = uip_sappdata;

-      
+

       /* If the application has data to be sent, or if the incoming
          packet had new data in it, we must send out a packet. */
       if(uip_slen > 0 && uip_connr->len > 0) {
       /* If the application has data to be sent, or if the incoming
          packet had new data in it, we must send out a packet. */
       if(uip_slen > 0 && uip_connr->len > 0) {


@@ -1753,7 +1755,7 @@ uip_process(u8_t flag)
       UIP_APPCALL();
     }
     break;
       UIP_APPCALL();
     }
     break;

-    
+

   case UIP_FIN_WAIT_1:
     /* The application has closed the connection, but the remote host
        hasn't closed its end yet. Thus we do nothing but wait for a
   case UIP_FIN_WAIT_1:
     /* The application has closed the connection, but the remote host
        hasn't closed its end yet. Thus we do nothing but wait for a


@@ -1782,7 +1784,7 @@ uip_process(u8_t flag)
       goto tcp_send_ack;
     }
     goto drop;
       goto tcp_send_ack;
     }
     goto drop;

-      
+

   case UIP_FIN_WAIT_2:
     if(uip_len > 0) {
       uip_add_rcv_nxt(uip_len);
   case UIP_FIN_WAIT_2:
     if(uip_len > 0) {
       uip_add_rcv_nxt(uip_len);


@@ -1802,7 +1804,7 @@ uip_process(u8_t flag)
 
   case UIP_TIME_WAIT:
     goto tcp_send_ack;
 
   case UIP_TIME_WAIT:
     goto tcp_send_ack;

-    
+

   case UIP_CLOSING:
     if(uip_flags & UIP_ACKDATA) {
       uip_connr->tcpstateflags = UIP_TIME_WAIT;
   case UIP_CLOSING:
     if(uip_flags & UIP_ACKDATA) {
       uip_connr->tcpstateflags = UIP_TIME_WAIT;


@@ -1810,7 +1812,7 @@ uip_process(u8_t flag)
     }
   }
   goto drop;
     }
   }
   goto drop;

-  
+

   /* We jump here when we are ready to send the packet, and just want
      to set the appropriate TCP sequence numbers in the TCP header. */
  tcp_send_ack:
   /* We jump here when we are ready to send the packet, and just want
      to set the appropriate TCP sequence numbers in the TCP header. */
  tcp_send_ack:


@@ -1831,14 +1833,14 @@ uip_process(u8_t flag)
   BUF->ackno[1] = uip_connr->rcv_nxt[1];
   BUF->ackno[2] = uip_connr->rcv_nxt[2];
   BUF->ackno[3] = uip_connr->rcv_nxt[3];
   BUF->ackno[1] = uip_connr->rcv_nxt[1];
   BUF->ackno[2] = uip_connr->rcv_nxt[2];
   BUF->ackno[3] = uip_connr->rcv_nxt[3];

-  
+

   BUF->seqno[0] = uip_connr->snd_nxt[0];
   BUF->seqno[1] = uip_connr->snd_nxt[1];
   BUF->seqno[2] = uip_connr->snd_nxt[2];
   BUF->seqno[3] = uip_connr->snd_nxt[3];
 
   BUF->proto = UIP_PROTO_TCP;
   BUF->seqno[0] = uip_connr->snd_nxt[0];
   BUF->seqno[1] = uip_connr->snd_nxt[1];
   BUF->seqno[2] = uip_connr->snd_nxt[2];
   BUF->seqno[3] = uip_connr->snd_nxt[3];
 
   BUF->proto = UIP_PROTO_TCP;

-  
+

   BUF->srcport  = uip_connr->lport;
   BUF->destport = uip_connr->rport;
 
   BUF->srcport  = uip_connr->lport;
   BUF->destport = uip_connr->rport;
 


@@ -1867,7 +1869,7 @@ uip_process(u8_t flag)
 #endif /* UIP_CONF_IPV6 */
 
   BUF->urgp[0] = BUF->urgp[1] = 0;
 #endif /* UIP_CONF_IPV6 */
 
   BUF->urgp[0] = BUF->urgp[1] = 0;

-  
+

   /* Calculate TCP checksum. */
   BUF->tcpchksum = 0;
   BUF->tcpchksum = ~(uip_tcpchksum());
   /* Calculate TCP checksum. */
   BUF->tcpchksum = 0;
   BUF->tcpchksum = ~(uip_tcpchksum());


@@ -1888,14 +1890,14 @@ uip_process(u8_t flag)
   BUF->ipchksum = 0;
   BUF->ipchksum = ~(uip_ipchksum());
   DEBUG_PRINTF("uip ip_send_nolen: chkecum 0x%04x\n", uip_ipchksum());
   BUF->ipchksum = 0;
   BUF->ipchksum = ~(uip_ipchksum());
   DEBUG_PRINTF("uip ip_send_nolen: chkecum 0x%04x\n", uip_ipchksum());

-#endif /* UIP_CONF_IPV6 */   
+#endif /* UIP_CONF_IPV6 */

   UIP_STAT(++uip_stat.tcp.sent);
 #if UIP_CONF_IPV6
  send:
 #endif /* UIP_CONF_IPV6 */
   DEBUG_PRINTF("Sending packet with length %d (%d)\n", uip_len,
               (BUF->len[0] << 8) | BUF->len[1]);
   UIP_STAT(++uip_stat.tcp.sent);
 #if UIP_CONF_IPV6
  send:
 #endif /* UIP_CONF_IPV6 */
   DEBUG_PRINTF("Sending packet with length %d (%d)\n", uip_len,
               (BUF->len[0] << 8) | BUF->len[1]);

-  
+

   UIP_STAT(++uip_stat.ip.sent);
   /* Return and let the caller do the actual transmission. */
   uip_flags = 0;
   UIP_STAT(++uip_stat.ip.sent);
   /* Return and let the caller do the actual transmission. */
   uip_flags = 0;


@@ -1936,3 +1938,4 @@ uip_send(const void *data, int len)
 /*---------------------------------------------------------------------------*/
 /** @} */
 #endif /* UIP_CONF_IPV6 */
 /*---------------------------------------------------------------------------*/
 /** @} */
 #endif /* UIP_CONF_IPV6 */

+