Move uip/uip_listen.c to tcp/tcp_listen.c

2 files changed, 290 insertions, 1 deletions

diff --git a/nuttx/net/tcp/Make.defs b/nuttx/net/tcp/Make.defs
index fa8d25e38..fa1b24e46 100644
--- a/nuttx/net/tcp/Make.defs
+++ b/nuttx/net/tcp/Make.defs
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_NET),y)
 ifeq ($(CONFIG_NET_TCP),y)
 
 NET_CSRCS += tcp_conn.c tcp_seqno.c tcp_poll.c tcp_timer.c tcp_send.c
-NET_CSRCS += tcp_input.c tcp_appsend.c uip_listen.c tcp_callback.c
+NET_CSRCS += tcp_input.c tcp_appsend.c tcp_listen.c tcp_callback.c
 NET_CSRCS += tcp_backlog.c
 
 # TCP Buffering
diff --git a/nuttx/net/tcp/tcp_listen.c b/nuttx/net/tcp/tcp_listen.c
new file mode 100644
index 000000000..4a5978091
--- /dev/null
+++ b/nuttx/net/tcp/tcp_listen.c
@@ -0,0 +1,289 @@
+/****************************************************************************
+ * net/tcp/tcp_listen.c
+ *
+ *   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * A direct leverage of logic from uIP which also has b BSD style license
+ *
+ *   Author: Adam Dunkels <adam@dunkels.com>
+ *   Copyright (c) 2001-2003, Adam Dunkels.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#ifdef CONFIG_NET
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <debug.h>
+
+#include <nuttx/net/uip/uipopt.h>
+
+#include "uip/uip_internal.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/* The uip_listenports list all currently listening ports. */
+
+static struct uip_conn *uip_listenports[CONFIG_NET_MAX_LISTENPORTS];
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: uip_findlistener
+ *
+ * Description:
+ *   Return the connection listener for connections on this port (if any)
+ *
+ * Assumptions:
+ *   Called at interrupt level
+ *
+ ****************************************************************************/
+
+struct uip_conn *uip_findlistener(uint16_t portno)
+{
+  int ndx;
+
+  /* Examine each connection structure in each slot of the listener list */
+
+  for (ndx = 0; ndx < CONFIG_NET_MAX_LISTENPORTS; ndx++)
+    {
+      /* Is this slot assigned?  If so, does the connection have the same
+       * local port number?
+       */
+
+      struct uip_conn *conn = uip_listenports[ndx];
+      if (conn && conn->lport == portno)
+        {
+          /* Yes.. we found a listener on this port */
+
+          return conn;
+        }
+    }
+
+  /* No listener for this port */
+
+  return NULL;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: uip_listeninit
+ *
+ * Description:
+ *   Setup the listening data structures
+ *
+ * Assumptions:
+ *   Called early in the initialization phase while the system is still
+ *   single-threaded.
+ *
+ ****************************************************************************/
+
+void uip_listeninit(void)
+{
+  int ndx;
+  for (ndx = 0; ndx < CONFIG_NET_MAX_LISTENPORTS; ndx++)
+    {
+      uip_listenports[ndx] = NULL;
+    }
+}
+
+/****************************************************************************
+ * Function: uip_unlisten
+ *
+ * Description:
+ *   Stop listening to the port bound to the specified TCP connection
+ *
+ * Assumptions:
+ *   Called from normal user code.
+ *
+ ****************************************************************************/
+
+int uip_unlisten(struct uip_conn *conn)
+{
+  uip_lock_t flags;
+  int ndx;
+  int ret = -EINVAL;
+
+  flags = uip_lock();
+  for (ndx = 0; ndx < CONFIG_NET_MAX_LISTENPORTS; ndx++)
+    {
+      if (uip_listenports[ndx] == conn)
+        {
+          uip_listenports[ndx] = NULL;
+          ret = OK;
+          break;
+        }
+    }
+
+  uip_unlock(flags);
+  return ret;
+}
+
+/****************************************************************************
+ * Function: uip_listen
+ *
+ * Description:
+ *   Start listening to the port bound to the specified TCP connection
+ *
+ * Assumptions:
+ *   Called from normal user code.
+ *
+ ****************************************************************************/
+
+int uip_listen(struct uip_conn *conn)
+{
+  uip_lock_t flags;
+  int ndx;
+  int ret;
+
+  /* This must be done with interrupts disabled because the listener table
+   * is accessed from interrupt level as well.
+   */
+
+  flags = uip_lock();
+
+  /* First, check if there is already a socket listening on this port */
+
+  if (uip_islistener(conn->lport))
+    {
+      /* Yes, then we must refuse this request */
+
+      ret = -EADDRINUSE;
+    }
+  else
+    {
+      /* Otherwise, save a reference to the connection structure in the
+       * "listener" list.
+       */
+
+      ret = -ENOBUFS; /* Assume failure */
+
+      /* Search all slots until an available slot is found */
+
+      for (ndx = 0; ndx < CONFIG_NET_MAX_LISTENPORTS; ndx++)
+        {
+          /* Is the next slot available? */
+
+          if (!uip_listenports[ndx])
+            {
+              /* Yes.. we found it */
+
+              uip_listenports[ndx] = conn;
+              ret = OK;
+              break;
+            }
+        }
+    }
+
+  uip_unlock(flags);
+  return ret;
+}
+
+/****************************************************************************
+ * Function: uip_islistener
+ *
+ * Description:
+ *   Return true is there is a listener for the specified port
+ *
+ * Assumptions:
+ *   Called at interrupt level
+ *
+ ****************************************************************************/
+
+bool uip_islistener(uint16_t portno)
+{
+  return uip_findlistener(portno) != NULL;
+}
+
+/****************************************************************************
+ * Function: uip_accept
+ *
+ * Description:
+ *   Accept the new connection for the specified listening port.
+ *
+ * Assumptions:
+ *   Called at interrupt level
+ *
+ ****************************************************************************/
+
+int uip_accept(struct uip_driver_s *dev, struct uip_conn *conn,
+               uint16_t portno)
+{
+  struct uip_conn *listener;
+  int ret = ERROR;
+
+  /* The interrupt logic has already allocated and initialized a TCP
+   * connection -- now check there if is an application in place to accept the
+   * connection.
+   */
+
+  listener = uip_findlistener(portno);
+  if (listener)
+    {
+      /* Yes, there is a listener.  Is it accepting connections now? */
+
+      if (listener->accept)
+        {
+         /* Yes.. accept the connection */
+
+          ret = listener->accept(listener, conn);
+        }
+#ifdef CONFIG_NET_TCPBACKLOG
+      else
+        {
+          /* Add the connection to the backlog and notify any threads that
+           * may be waiting on poll()/select() that the connection is available.
+           */
+
+          ret = uip_backlogadd(listener, conn);
+          if (ret == OK)
+            {
+              (void)uip_tcpcallback(dev, listener, UIP_BACKLOG);
+            }
+        }
+#endif
+    }
+
+  return ret;
+}
+
+#endif /* CONFIG_NET */