Fixed missing logic in readahead buffer logic

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@409 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 16 insertions, 15 deletions

diff --git a/nuttx/netutils/dhcpc/dhcpc.c b/nuttx/netutils/dhcpc/dhcpc.c
index a84728013..bdb885ccc 100644
--- a/nuttx/netutils/dhcpc/dhcpc.c
+++ b/nuttx/netutils/dhcpc/dhcpc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * dhcpc.c
+ * netutils/dhcpc/dhcpc.c
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -103,10 +103,10 @@
 struct dhcpc_state_internal
 {
   struct uip_udp_conn *conn;
-  const void            *mac_addr;
-  int                    mac_len;
-  int                    sockfd;
-  char                   buffer[256];
+  const void          *mac_addr;
+  int                  mac_len;
+  int                  sockfd;
+  char                 buffer[256];
 };
 
 struct dhcp_msg
diff --git a/nuttx/netutils/resolv/resolv.c b/nuttx/netutils/resolv/resolv.c
index 741116bb7..4ac604fb6 100644
--- a/nuttx/netutils/resolv/resolv.c
+++ b/nuttx/netutils/resolv/resolv.c
@@ -1,4 +1,5 @@
-/* uip-resolv.c
+/****************************************************************************
+ * uip-resolv.c
  * DNS host name to IP address resolver.
  *
  * The uIP DNS resolver functions are used to lookup a hostname and
diff --git a/nuttx/netutils/webclient/webclient.c b/nuttx/netutils/webclient/webclient.c
index 8b5c66001..3521f6893 100644
--- a/nuttx/netutils/webclient/webclient.c
+++ b/nuttx/netutils/webclient/webclient.c
@@ -338,7 +338,7 @@ static void newdata(struct uip_driver_s *dev)
 {
   uint16 len;
 
-  len = uip_datalen(dev);
+  len = dev->d_len;
 
   if (s.state == WEBCLIENT_STATE_STATUSLINE) {
     len = parse_statusline(dev, len);
@@ -363,7 +363,7 @@ uint8 uip_interrupt_event(struct uip_driver_s *dev, struct uip_conn *conn, uint8
 #warning OBSOLETE -- needs to be redesigned
   g_return = flags;
 
-  if (uip_connected_event(flags))
+  if ((flags & UIP_CONNECTED) != 0)
     {
       s.timer = 0;
       s.state = WEBCLIENT_STATE_STATUSLINE;
@@ -378,33 +378,33 @@ uint8 uip_interrupt_event(struct uip_driver_s *dev, struct uip_conn *conn, uint8
       return UIP_ABORT;
     }
 
-  if (uip_abort_event(flags))
+  if ((flags & UIP_ABORT) != 0)
     {
       webclient_aborted();
     }
 
-  if (uip_timeout_event(flags))
+  if ((flags & UIP_TIMEDOUT) != 0)
     {
       webclient_timedout();
     }
 
-  if (uip_ack_event(flags))
+  if ((flags & UIP_ACKDATA) != 0)
     {
       s.timer = 0;
       acked(conn);
     }
 
-  if (uip_newdata_event(flags))
+  if ((flags & UIP_NEWDATA) != 0)
     {
       s.timer = 0;
       newdata(dev);
     }
 
-  if (uip_rexmit_event(flags) || uip_newdata_event(flags) || uip_ack_event(flags))
+  if ((flags & UIP_REXMIT) != 0 || (flags & UIP_NEWDATA) != 0 || (flags & UIP_ACKDATA) != 0)
     {
       senddata(dev, conn);
     }
-  else if (uip_poll_event(flags))
+  else if ((flags & UIP_POLL) != 0)
     {
       ++s.timer;
       if (s.timer == WEBCLIENT_TIMEOUT)
@@ -414,7 +414,7 @@ uint8 uip_interrupt_event(struct uip_driver_s *dev, struct uip_conn *conn, uint8
         }
     }
 
-  if (uip_close_event(flags))
+  if ((flags & UIP_CLOSE) != 0)
     {
       if (s.httpflag != HTTPFLAG_MOVED)
         {