Basic TCP send functional

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

2 files changed, 14 insertions, 13 deletions

diff --git a/nuttx/netutils/telnetd/telnetd.c b/nuttx/netutils/telnetd/telnetd.c
index 6d4ba2e7b..075393484 100644
--- a/nuttx/netutils/telnetd/telnetd.c
+++ b/nuttx/netutils/telnetd/telnetd.c
@@ -306,7 +306,7 @@ void uip_interrupt_event(struct uip_driver_s *dev, void *private)
 {
 #warning OBSOLETE -- needs to be redesigned
   unsigned int i;
-  if (uip_connected())
+  if (uip_connected_event())
     {
       for (i = 0; i < TELNETD_CONF_NUMLINES; ++i)
       {
@@ -325,22 +325,23 @@ void uip_interrupt_event(struct uip_driver_s *dev, void *private)
     return;
   }
 
-  if (uip_closed() || uip_aborted() || uip_timedout())
+  if (uip_close_event() || uip_abort_event() || uip_timeout_event())
   {
     closed();
   }
 
-  if (uip_acked())
+  if (uip_ack_event())
   {
     acked();
   }
 
-  if (uip_newdata())
+  if (uip_newdata_event())
   {
     newdata(dev);
   }
 
-  if (uip_rexmit() || uip_newdata() || uip_acked() || uip_connected() || uip_poll())
+  if (uip_rexmit_event() || uip_newdata_event() || uip_ack_event() ||
+      uip_connected_event() || uip_poll_event())
   {
     senddata(dev);
   }
diff --git a/nuttx/netutils/webclient/webclient.c b/nuttx/netutils/webclient/webclient.c
index 56c430881..f285c3f41 100644
--- a/nuttx/netutils/webclient/webclient.c
+++ b/nuttx/netutils/webclient/webclient.c
@@ -407,7 +407,7 @@ static void newdata(struct uip_driver_s *dev)
 void uip_interrupt_event(struct uip_driver_s *dev)
 {
 #warning OBSOLETE -- needs to be redesigned
-  if (uip_connected())
+  if (uip_connected_event())
     {
       s.timer = 0;
       s.state = WEBCLIENT_STATE_STATUSLINE;
@@ -423,33 +423,33 @@ void uip_interrupt_event(struct uip_driver_s *dev)
       return;
     }
 
-  if (uip_aborted())
+  if (uip_abort_event())
     {
       webclient_aborted();
     }
 
-  if (uip_timedout())
+  if (uip_timeout_event())
     {
       webclient_timedout();
     }
 
-  if (uip_acked())
+  if (uip_ack_event())
     {
       s.timer = 0;
       acked();
     }
 
-  if (uip_newdata())
+  if (uip_newdata_event())
     {
       s.timer = 0;
       newdata(dev);
     }
 
-  if (uip_rexmit() || uip_newdata() || uip_acked())
+  if (uip_rexmit_event() || uip_newdata_event() || uip_ack_event())
     {
       senddata(dev);
     }
-  else if (uip_poll())
+  else if (uip_poll_event())
     {
       ++s.timer;
       if (s.timer == WEBCLIENT_TIMEOUT)
@@ -460,7 +460,7 @@ void uip_interrupt_event(struct uip_driver_s *dev)
         }
     }
 
-  if (uip_closed())
+  if (uip_close_event())
     {
       if (s.httpflag != HTTPFLAG_MOVED)
         {