Changes in uspace/srv/net/udp/assoc.c [89ba88c:498ced1] in mainline

File:

• uspace/srv/net/udp/assoc.c (modified) (8 diffs)

uspace/srv/net/udp/assoc.c

@@ -40 +40 @@
 #include <fibril_synch.h>
 #include <inet/endpoint.h>
+#include <inet/inet.h>
 #include <io/log.h>
 #include <nettl/amap.h>
@@ -47 +48 @@
 #include "msg.h"
 #include "pdu.h"
+#include "udp_inet.h"
 #include "udp_type.h"
 
@@ -55 +57 @@
 static udp_assoc_t *udp_assoc_find_ref(inet_ep2_t *);
 static errno_t udp_assoc_queue_msg(udp_assoc_t *, inet_ep2_t *, udp_msg_t *);
-static udp_assocs_dep_t *assocs_dep;
 
 /** Initialize associations. */
-errno_t udp_assocs_init(udp_assocs_dep_t *dep)
+errno_t udp_assocs_init(void)
 {
         errno_t rc;
@@ -68 +69 @@
         }
 
-        assocs_dep = dep;
         return EOK;
-}
-
-/** Finalize associations. */
-void udp_assocs_fini(void)
-{
-        assert(list_empty(&assoc_list));
-
-        amap_destroy(amap);
-        amap = NULL;
 }
 
@@ -183 +174 @@
 
         assert(assoc->deleted == false);
+        udp_assoc_delref(assoc);
         assoc->deleted = true;
-        udp_assoc_delref(assoc);
 }
 
@@ -253 +244 @@
 errno_t udp_assoc_send(udp_assoc_t *assoc, inet_ep_t *remote, udp_msg_t *msg)
 {
+        udp_pdu_t *pdu;
         inet_ep2_t epp;
         errno_t rc;
@@ -274 +266 @@
         if (inet_addr_is_any(&epp.local.addr) && !assoc->nolocal) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Determine local address.");
-                rc = (*assocs_dep->get_srcaddr)(&epp.remote.addr, 0,
-                    &epp.local.addr);
+                rc = inet_get_srcaddr(&epp.remote.addr, 0, &epp.local.addr);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "Cannot determine "
@@ -289 +280 @@
                 return EINVAL;
 
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send - encode pdu");
+
+        rc = udp_pdu_encode(&epp, msg, &pdu);
+        if (rc != EOK)
+                return ENOMEM;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send - transmit");
-        rc = (*assocs_dep->transmit_msg)(&epp, msg);
+
+        rc = udp_transmit_pdu(pdu);
+        udp_pdu_delete(pdu);
 
         if (rc != EOK)