Merge pull request ARMmbed#64 from linlingao/socket_debug

Fixed socket handler bugs

Author: linlingao

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/CC3220SF_WiFiInterface.cpp

@@ -133,8 +133,15 @@ nsapi_error_t CC3220SFInterface::set_credentials(const char *ssid, const char *p
 nsapi_error_t CC3220SFInterface::set_channel(uint8_t channel)
 {
     _channel = channel;
-    _cc3200_simplelink.set_channel(channel);
-    return NSAPI_ERROR_OK;
+    int32_t status = _cc3200_simplelink.set_channel(channel);
+    if (status == 0)
+    {
+        return NSAPI_ERROR_OK;
+    }
+    else
+    {
+        return NSAPI_ERROR_DEVICE_ERROR;
+    }
 }
 
 nsapi_error_t CC3220SFInterface::disconnect()
@@ -212,7 +219,7 @@ nsapi_connection_status_t CC3220SFInterface::get_connection_status() const
 }
 
 struct cc3200_socket {
-    int id;
+    int sd;
     nsapi_protocol_t proto;
     bool connected;
 //    SocketAddress addr;
@@ -221,11 +228,23 @@ struct cc3200_socket {
 
 int CC3220SFInterface::socket_open(void **handle, nsapi_protocol_t proto)
 {
+    int32_t sd;
     if (handle)
     {
-        *(int32_t*)handle = _cc3200_simplelink.open_socket(proto);
-        if (*(int32_t*)handle >= 0)
+        struct cc3200_socket *socket = new struct cc3200_socket;
+        if (!socket)
         {
+            return NSAPI_ERROR_NO_SOCKET;
+        }
+
+        sd = _cc3200_simplelink.open_socket(proto);
+        if (sd >= 0) // socket open succeeded
+        {
+            socket->sd = sd;
+            socket->proto = proto;
+            socket->connected = false;
+            socket->keepalive = 0;
+            *handle = socket;
             return 0;
         }
     }
@@ -234,32 +253,93 @@ int CC3220SFInterface::socket_open(void **handle, nsapi_protocol_t proto)
 
 int CC3220SFInterface::socket_close(void *handle)
 {
-    return (_cc3200_simplelink.close_socket((uint32_t)handle));
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    int err = 0;
+
+    if (!socket) {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+
+    if (socket->connected && !_cc3200_simplelink.close_socket(socket->sd))
+    {
+        err = NSAPI_ERROR_DEVICE_ERROR;
+    }
+    socket->connected = false;
+    delete socket;
+    return err;
+}
+
+#if 0
+nsapi_error_t CC3220SFInterface::gethostbyname(const char *name, SocketAddress *address, nsapi_version_t version)
+{
+    nsapi_addr_t ip_address;
+    ip_address.version = NSAPI_IPv4;
+    if (_cc3200_simplelink.dns_lookup(name, (char*)ip_address.bytes, sizeof(ip_address.bytes), version) == NSAPI_ERROR_OK)
+    {
+         address->set_addr(ip_address);
+         return NSAPI_ERROR_OK;
+    }
+    else
+    {
+        return NSAPI_ERROR_DNS_FAILURE;
+    }
+}
+#endif
+
+nsapi_error_t CC3220SFInterface::get_dns_server(int index, SocketAddress *address)
+{
+    nsapi_addr_t dns_address;
+    dns_address.version = NSAPI_IPv4;
+    if (_cc3200_simplelink.getDNS(dns_address.bytes, sizeof(dns_address.bytes)) == NSAPI_ERROR_OK)
+    {
+        address->set_addr(dns_address);
+        return NSAPI_ERROR_OK;
+    }
+    else
+    {
+        return NSAPI_ERROR_DNS_FAILURE;
+    }
 }
 
 nsapi_error_t CC3220SFInterface::setsockopt(nsapi_socket_t handle, int level,
         int optname, const void *optval, unsigned optlen)
 {
-    nsapi_error_t retcode = _cc3200_simplelink.setsockopt((uint32_t)handle, level, optname, optval, optlen);
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+    nsapi_error_t retcode = _cc3200_simplelink.setsockopt(socket->sd, level, optname, optval, optlen);
     return retcode;
 }
 
 nsapi_error_t CC3220SFInterface::getsockopt(nsapi_socket_t handle, int level, int optname,
         void *optval, unsigned *optlen)
 {
-    nsapi_error_t retcode = _cc3200_simplelink.getsockopt((uint32_t)handle, level, optname, optval, optlen);
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+    nsapi_error_t retcode = _cc3200_simplelink.getsockopt(socket->sd, level, optname, optval, optlen);
     return retcode;
 }
 
 int CC3220SFInterface::socket_bind(void *handle, const SocketAddress &address)
 {
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+
     bool ipv6 = false;
     nsapi_addr_t nsapi_address = address.get_addr();
     if (nsapi_address.version == NSAPI_IPv6)
     {
         ipv6 = true;
     }
-    return _cc3200_simplelink.bind_socket((uint32_t)handle, ipv6, nsapi_address.bytes, address.get_port());
+    return _cc3200_simplelink.bind_socket(socket->sd, ipv6, nsapi_address.bytes, address.get_port());
 }
 
 int CC3220SFInterface::socket_listen(void *handle, int backlog)
@@ -269,14 +349,25 @@ int CC3220SFInterface::socket_listen(void *handle, int backlog)
 
 int CC3220SFInterface::socket_connect(void *handle, const SocketAddress &addr)
 {
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
     bool ipv6 = false;
     nsapi_addr_t nsapi_address = addr.get_addr();
     if (nsapi_address.version == NSAPI_IPv6)
     {
         ipv6 = true;
     }
 
-    return _cc3200_simplelink.connect_socket((uint32_t)handle, ipv6, nsapi_address.bytes, addr.get_port());
+    if (_cc3200_simplelink.connect_socket(socket->sd, ipv6, nsapi_address.bytes, addr.get_port()) == 0)
+    {
+        socket->connected= true;
+        return 0;
+    }
+    printf("socket_connect failed\n");
+    return NSAPI_ERROR_DEVICE_ERROR;
 }
 
 int CC3220SFInterface::socket_accept(void *handle, void **socket, SocketAddress *address)
@@ -286,27 +377,47 @@ int CC3220SFInterface::socket_accept(void *handle, void **socket, SocketAddress
 
 int CC3220SFInterface::socket_send(void *handle, const void *data, unsigned size)
 {
-    return _cc3200_simplelink.send((uint32_t)handle, data, size);
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+    return _cc3200_simplelink.send(socket->sd, data, size);
 }
 
 int CC3220SFInterface::socket_recv(void *handle, void *data, unsigned size)
 {
-    return _cc3200_simplelink.recv((uint32_t)handle, data, size);
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
+    return _cc3200_simplelink.recv(socket->sd, data, size);
 }
 
 int CC3220SFInterface::socket_sendto(void *handle, const SocketAddress &address, const void *data, unsigned size)
 {
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
     bool ipv6 = false;
     nsapi_addr_t nsapi_address = address.get_addr();
     if (nsapi_address.version == NSAPI_IPv6)
     {
         ipv6 = true;
     }
-    return _cc3200_simplelink.sendto_socket((uint32_t)handle, ipv6, data, size, nsapi_address.bytes, address.get_port());
+    return _cc3200_simplelink.sendto_socket(socket->sd, ipv6, data, size, nsapi_address.bytes, address.get_port());
 }
 
 int CC3220SFInterface::socket_recvfrom(void *handle, SocketAddress *address, void *buffer, unsigned size)
 {
+    struct cc3200_socket *socket = (struct cc3200_socket *)handle;
+    if (!socket)
+    {
+        return NSAPI_ERROR_NO_SOCKET;
+    }
     bool ipv6 = false;
     if (address)
     {
@@ -315,11 +426,11 @@ int CC3220SFInterface::socket_recvfrom(void *handle, SocketAddress *address, voi
         {
             ipv6 = true;
         }
-        return _cc3200_simplelink.recvfrom((uint32_t)handle, ipv6, buffer, size, nsapi_address.bytes, address->get_port());
+        return _cc3200_simplelink.recvfrom(socket->sd, ipv6, buffer, size, nsapi_address.bytes, address->get_port());
     }
     else
     {
-        return _cc3200_simplelink.recv((uint32_t)handle, buffer, size);
+        return 0;
     }
 }
 

targets/TARGET_TI/TARGET_CC32XX/TARGET_CC3220SF/device/CC3220SF_WiFiInterface.h

@@ -132,9 +132,8 @@ class CC3220SFInterface: public NetworkStack, public WiFiInterface
      *  If the network interface is set to non-blocking mode, scan will attempt to scan
      *  for WiFi networks asynchronously and return NSAPI_ERROR_WOULD_BLOCK. If a callback
      *  is attached, the callback will be called when the operation has completed.
-     *  @param  ap       Pointer to allocated array to store discovered AP
+     *  @param  res      Pointer to allocated array to store discovered AP
      *  @param  count    Size of allocated @a res array, or 0 to only count available AP
-     *  @param  timeout  Timeout in milliseconds; 0 for no timeout (Default: 0)
      *  @return          Number of entries in @a, or if @a count was 0 number of available networks, negative on error
      *  see @a nsapi_error
      */
@@ -156,6 +155,7 @@ class CC3220SFInterface: public NetworkStack, public WiFiInterface
      *  @return         0 on success, negative error code on failure
      */
     using NetworkInterface::gethostbyname;
+    //virtual nsapi_error_t gethostbyname(const char *name, SocketAddress *address, nsapi_version_t version);
 
     /** Add a domain name server to list of servers to query
      *
@@ -164,6 +164,8 @@ class CC3220SFInterface: public NetworkStack, public WiFiInterface
      */
     using NetworkInterface::add_dns_server;
 
+    virtual nsapi_error_t get_dns_server(int index, SocketAddress *address);
+
     /** Set socket options
      *
      *  The setsockopt allow an application to pass stack-specific hints