Changeset 2989c7e in mainline for uspace/srv/net/tcp

Timestamp:

2015-05-25T21:04:33Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ab6326bc

Parents:

58e9dec

Message:

Association map / portrange prototype.

Location:

uspace/srv/net/tcp

Files:

• Makefile (modified) (1 diff)
• conn.c (modified) (4 diffs)
• conn.h (modified) (1 diff)
• service.c (modified) (3 diffs)
• tcp.c (modified) (2 diffs)
• ucall.c (modified) (3 diffs)

uspace/srv/net/tcp/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
+
+LIBS = \
+        $(LIBNETTL_PREFIX)/libnettl.a
+
+EXTRA_CFLAGS += \
+        -I$(LIBNETTL_PREFIX)/include
+
 BINARY = tcp
 

uspace/srv/net/tcp/conn.c

@@ -36 +36 @@
 
 #include <adt/list.h>
-#include <stdbool.h>
 #include <errno.h>
 #include <inet/endpoint.h>
 #include <io/log.h>
 #include <macros.h>
+#include <nettl/amap.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include "conn.h"
@@ -56 +57 @@
 #define TIME_WAIT_TIMEOUT       (2*MAX_SEGMENT_LIFETIME)
 
-LIST_INITIALIZE(conn_list);
-FIBRIL_MUTEX_INITIALIZE(conn_list_lock);
+static LIST_INITIALIZE(conn_list);
+static FIBRIL_MUTEX_INITIALIZE(conn_list_lock);
+static amap_t *amap;
 
 static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg);
 static void tcp_conn_tw_timer_set(tcp_conn_t *conn);
 static void tcp_conn_tw_timer_clear(tcp_conn_t *conn);
+
+/** Initialize connections. */
+int tcp_conns_init(void)
+{
+        int rc;
+
+        rc = amap_create(&amap);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                return ENOMEM;
+        }
+
+        return EOK;
+}
 
 /** Create new connection structure.
@@ -246 +262 @@
  * Add connection to the connection map.
  */
-void tcp_conn_add(tcp_conn_t *conn)
-{
+int tcp_conn_add(tcp_conn_t *conn)
+{
+        inet_ep2_t aepp;
+        int rc;
+
         tcp_conn_addref(conn);
         fibril_mutex_lock(&conn_list_lock);
+
+        rc = amap_insert(amap, &conn->ident, conn, af_allow_system, &aepp);
+        if (rc != EOK) {
+                tcp_conn_delref(conn);
+                fibril_mutex_unlock(&conn_list_lock);
+                return rc;
+        }
+
+        conn->ident = aepp;
         list_append(&conn->link, &conn_list);
         fibril_mutex_unlock(&conn_list_lock);
+
+        return EOK;
 }
 
@@ -261 +291 @@
 {
         fibril_mutex_lock(&conn_list_lock);
+        amap_remove(amap, &conn->ident);
         list_remove(&conn->link);
         fibril_mutex_unlock(&conn_list_lock);

uspace/srv/net/tcp/conn.h

@@ -40 +40 @@
 #include "tcp_type.h"
 
+extern int tcp_conns_init(void);
 extern tcp_conn_t *tcp_conn_new(inet_ep2_t *);
 extern void tcp_conn_delete(tcp_conn_t *);
-extern void tcp_conn_add(tcp_conn_t *);
+extern int tcp_conn_add(tcp_conn_t *);
 extern void tcp_conn_remove(tcp_conn_t *);
 extern void tcp_conn_reset(tcp_conn_t *conn);

uspace/srv/net/tcp/service.c

@@ -335 +335 @@
         tcp_conn_t *conn;
         tcp_cconn_t *cconn;
-        inet_ep2_t cepp;
         int rc;
         tcp_error_t trc;
@@ -343 +342 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl");
 
-        cepp = *epp;
-
-        /* Fill in local address? */
-        if (inet_addr_is_any(&epp->local.addr)) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
-                    "determine local address");
-                rc = inet_get_srcaddr(&epp->remote.addr, 0, &cepp.local.addr);
-                if (rc != EOK) {
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
-                            "cannot determine local address");
-                        return rc;
-                }
-        } else {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
-                    "local address specified");
-        }
-
-        /* Allocate local port? */
-        if (cepp.local.port == 0) {
-                cepp.local.port = 49152; /* XXX */
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
-                    "allocated local port %" PRIu16, cepp.local.port);
-        } else {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create_impl: "
-                    "local port %" PRIu16 " specified", cepp.local.port);
-        }
-
-        inet_addr_format(&cepp.local.addr, &slocal);
-        inet_addr_format(&cepp.remote.addr, &sremote);
+        inet_addr_format(&epp->local.addr, &slocal);
+        inet_addr_format(&epp->remote.addr, &sremote);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_create: local=%s remote=%s",
             slocal, sremote);
@@ -377 +349 @@
         free(sremote);
 
-        trc = tcp_uc_open(&cepp, ap_active, tcp_open_nonblock, &conn);
+        trc = tcp_uc_open(epp, ap_active, tcp_open_nonblock, &conn);
         if (trc != TCP_EOK)
                 return EIO;

uspace/srv/net/tcp/tcp.c

@@ -45 +45 @@
 #include <task.h>
 
+#include "conn.h"
 #include "ncsim.h"
 #include "pdu.h"
@@ -179 +180 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()");
 
+        rc = tcp_conns_init();
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing connections");
+                return ENOMEM;
+        }
+
         tcp_rqueue_init();
         tcp_rqueue_fibril_start();

uspace/srv/net/tcp/ucall.c

@@ -35 +35 @@
  */
 
+#include <errno.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -68 +69 @@
 {
         tcp_conn_t *nconn;
+        int rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open(%p, %s, %s, %p)",
@@ -74 +76 @@
 
         nconn = tcp_conn_new(epp);
-        tcp_conn_add(nconn);
+        rc = tcp_conn_add(nconn);
+        if (rc != EOK) {
+                tcp_conn_delete(nconn);
+                return TCP_EEXISTS;
+        }
+
         tcp_conn_lock(nconn);