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

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/udp

Files:

• Makefile (modified) (2 diffs)
• assoc.c (modified) (6 diffs)
• assoc.h (modified) (1 diff)
• service.c (modified) (1 diff)
• ucall.c (deleted)
• udp.c (modified) (2 diffs)

uspace/srv/net/udp/Makefile

@@ -28 +28 @@
 
 USPACE_PREFIX = ../../..
+
+LIBS = \
+        $(LIBNETTL_PREFIX)/libnettl.a
+
+EXTRA_CFLAGS += \
+        -I$(LIBNETTL_PREFIX)/include
+
 BINARY = udp
 
@@ -35 +42 @@
         pdu.c \
         service.c \
-        ucall.c \
         udp.c \
         udp_inet.c

uspace/srv/net/udp/assoc.c

@@ -41 +41 @@
 #include <inet/endpoint.h>
 #include <io/log.h>
+#include <nettl/amap.h>
 #include <stdlib.h>
 
@@ -46 +47 @@
 #include "msg.h"
 #include "pdu.h"
-#include "ucall.h"
 #include "udp_inet.h"
 #include "udp_type.h"
 
-LIST_INITIALIZE(assoc_list);
-FIBRIL_MUTEX_INITIALIZE(assoc_list_lock);
+static LIST_INITIALIZE(assoc_list);
+static FIBRIL_MUTEX_INITIALIZE(assoc_list_lock);
+static amap_t *amap;
 
 static udp_assoc_t *udp_assoc_find_ref(inet_ep2_t *);
@@ -57 +58 @@
 static bool udp_ep_match(inet_ep_t *, inet_ep_t *);
 static bool udp_ep2_match(inet_ep2_t *, inet_ep2_t *);
+
+/** Initialize associations. */
+int udp_assocs_init(void)
+{
+        int rc;
+
+        rc = amap_create(&amap);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                return ENOMEM;
+        }
+
+        return EOK;
+}
 
 /** Create new association structure.
@@ -168 +183 @@
  * Add association to the association map.
  */
-void udp_assoc_add(udp_assoc_t *assoc)
-{
+int udp_assoc_add(udp_assoc_t *assoc)
+{
+        inet_ep2_t aepp;
+        int rc;
+
         udp_assoc_addref(assoc);
         fibril_mutex_lock(&assoc_list_lock);
+
+        rc = amap_insert(amap, &assoc->ident, assoc, af_allow_system, &aepp);
+        if (rc != EOK) {
+                udp_assoc_delref(assoc);
+                fibril_mutex_unlock(&assoc_list_lock);
+                return rc;
+        }
+
+        assoc->ident = aepp;
         list_append(&assoc->link, &assoc_list);
         fibril_mutex_unlock(&assoc_list_lock);
+
+        return EOK;
 }
 
@@ -183 +212 @@
 {
         fibril_mutex_lock(&assoc_list_lock);
+        amap_remove(amap, &assoc->ident);
         list_remove(&assoc->link);
         fibril_mutex_unlock(&assoc_list_lock);
@@ -199 +229 @@
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.local_link = iplink;
-        fibril_mutex_unlock(&assoc->lock);
-}
-
-/** Set remote endpoint in association.
- *
- * @param assoc         Association
- * @param remote        Remote endpoint (deeply copied)
- */
-void udp_assoc_set_remote(udp_assoc_t *assoc, inet_ep_t *remote)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_remote(%p, %p)", assoc, remote);
-        fibril_mutex_lock(&assoc->lock);
-        assoc->ident.remote = *remote;
-        fibril_mutex_unlock(&assoc->lock);
-}
-
-/** Set local endpoint in association.
- *
- * @param assoc Association
- * @param local Local endpoint (deeply copied)
- *
- */
-void udp_assoc_set_local(udp_assoc_t *assoc, inet_ep_t *local)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, local);
-        fibril_mutex_lock(&assoc->lock);
-        assoc->ident.local = *local;
-        fibril_mutex_unlock(&assoc->lock);
-}
-
-/** Set local port in association.
- *
- * @param assoc Association
- * @param lport Local port
- *
- */
-void udp_assoc_set_local_port(udp_assoc_t *assoc, uint16_t lport)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %" PRIu16 ")", assoc, lport);
-        fibril_mutex_lock(&assoc->lock);
-        assoc->ident.local.port = lport;
         fibril_mutex_unlock(&assoc->lock);
 }

uspace/srv/net/udp/assoc.h

@@ -41 +41 @@
 #include "udp_type.h"
 
+extern int udp_assocs_init(void);
 extern udp_assoc_t *udp_assoc_new(inet_ep2_t *, udp_assoc_cb_t *, void *);
 extern void udp_assoc_delete(udp_assoc_t *);
-extern void udp_assoc_add(udp_assoc_t *);
+extern int udp_assoc_add(udp_assoc_t *);
 extern void udp_assoc_remove(udp_assoc_t *);
 extern void udp_assoc_addref(udp_assoc_t *);
 extern void udp_assoc_delref(udp_assoc_t *);
 extern void udp_assoc_set_iplink(udp_assoc_t *, service_id_t);
-extern void udp_assoc_set_remote(udp_assoc_t *, inet_ep_t *);
-extern void udp_assoc_set_local(udp_assoc_t *, inet_ep_t *);
-extern void udp_assoc_set_local_port(udp_assoc_t *, uint16_t);
 extern int udp_assoc_send(udp_assoc_t *, inet_ep_t *, udp_msg_t *);
 extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, inet_ep_t *);

uspace/srv/net/udp/service.c

@@ -178 +178 @@
         assoc->cb_arg = cassoc;
 
-        udp_assoc_add(assoc);
+        rc = udp_assoc_add(assoc);
+        if (rc != EOK) {
+                udp_cassoc_destroy(cassoc);
+                udp_assoc_delete(assoc);
+                return rc;
+        }
 
         *rassoc_id = cassoc->id;

uspace/srv/net/udp/udp.c

@@ -41 +41 @@
 #include <task.h>
 
+#include "assoc.h"
 #include "service.h"
 #include "udp_inet.h"
@@ -51 +52 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_init()");
+
+        rc = udp_assocs_init();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing associations.");
+                return ENOMEM;
+        }
 
         rc = udp_inet_init();