Revision 155:a70f34550c34, committed 2016-01-28

Comitter:

tass

Date:

Thu Jan 28 15:12:00 2016 +0100

Parent:

154:6c0e92a80c4a

Commit message:

Adding TCP flag for FIN.

Changed in this revision

--- a/Socket/bsd/stack_endpoint.cpp	Mon Sep 28 14:14:17 2015 +0200
+++ b/Socket/bsd/stack_endpoint.cpp	Thu Jan 28 15:12:00 2016 +0100
@@ -11,6 +11,7 @@
 #include "mbed.h"
 #include "Socket.h"
 #include "Mutex.h"
+//#include "PicoTerm.h"
 
 extern "C"
 {
@@ -19,7 +20,7 @@
     #include "pico_dhcp_server.h"
 }
 
-//#define ptsock_dbg mbed_dbg
+//#define ptsock_dbg ptm_dbg
 #define ptsock_dbg(...)
 #define SCHEDULER_BASE  4u
 #define SCHEDULER_MAX   10
@@ -44,17 +45,20 @@
 static inline int __critical_select(struct stack_endpoint *ep, uint32_t time, uint8_t lock)
 {
   uint32_t in_time = PICO_TIME_MS();
-  
+  ptsock_dbg("Critical_select on endpoint.\n");
   if(lock) PicoTcpLock->unlock();
   while ((ep->events & ep->revents) == 0) {
     ep->queue->get(time);
+    ptsock_dbg("In while loop.\n");
     if ((time != osWaitForever) && (PICO_TIME_MS() > in_time + time)) {
         ptsock_dbg("TIMEOUT in critical select... (ev:%04x rev:%04x \n", ep->events, ep->revents);
         if(lock) PicoTcpLock->lock();
         return 0;
     }
   }
+  ptsock_dbg("After while loop.\n");
   if(lock) PicoTcpLock->lock();
+  ptsock_dbg("After while loop, returning now.\n");
   return 1;
 }
 
@@ -73,6 +77,8 @@
     return;
   }
 
+  ptsock_dbg("RECEIVED EVENT: %d\n",ev);
+
   ep->revents |= ev;
     
   if(ev & PICO_SOCK_EV_ERR)
@@ -86,6 +92,7 @@
     }
   }
   if ((ev & PICO_SOCK_EV_CLOSE) || (ev & PICO_SOCK_EV_FIN)) {
+    ptsock_dbg("GOT FIN or CLOSE event.\n");
     ep->connected = 0;
     pico_socket_close(ep->s);
     ep->s->priv = NULL;
@@ -160,7 +167,8 @@
   srv_addr = (struct sockaddr_in *)_srv_addr;
   PicoTcpLock->lock();
   pico_socket_connect(ep->s, (struct pico_ip4 *)(&srv_addr->sin_addr.s_addr), srv_addr->sin_port);
-  ep->events = PICO_SOCK_EV_CONN | PICO_SOCK_EV_ERR;
+  ep->events = PICO_SOCK_EV_CONN | PICO_SOCK_EV_ERR | PICO_SOCK_EV_FIN;
+  ptsock_dbg("Going to perform cirital_select on endpoint.\n");
   __critical_select(ep, osWaitForever, 1);
   if ((ep->revents & PICO_SOCK_EV_CONN) && ep->connected) {
     ep->revents &= (~PICO_SOCK_EV_CONN);
@@ -171,6 +179,7 @@
   } else {
     retval = -1;
   }
+  ptsock_dbg("Returning %d from picotcp_connect.\n", retval);
   PicoTcpLock->unlock();
   return retval;
 }