Changeset fab2746 in mainline for uspace/srv/net/udp/assoc.c

Timestamp:

2015-04-08T21:25:30Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

99ea91b2

Parents:

ba0eac5

Message:

New transport layer API. Only UDP implemented.

File:

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

uspace/srv/net/udp/assoc.c

@@ -36 +36 @@
 
 #include <adt/list.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <fibril_synch.h>
@@ -62 +63 @@
  * @return              New association or NULL
  */
-udp_assoc_t *udp_assoc_new(udp_sock_t *lsock, udp_sock_t *fsock)
+udp_assoc_t *udp_assoc_new(udp_sock_t *lsock, udp_sock_t *fsock,
+    udp_assoc_cb_t *cb, void *cb_arg)
 {
         udp_assoc_t *assoc = NULL;
@@ -82 +84 @@
         if (lsock != NULL)
                 assoc->ident.local = *lsock;
-        
+
         if (fsock != NULL)
                 assoc->ident.foreign = *fsock;
 
+        assoc->cb = cb;
+        assoc->cb_arg = cb_arg;
         return assoc;
 error:
@@ -258 +262 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send(%p, %p, %p)",
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_send(%p, %p, %p)",
             assoc, fsock, msg);
 
@@ -266 +270 @@
                 sp.foreign = *fsock;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_send - check addr any");
+
         if ((inet_addr_is_any(&sp.foreign.addr)) ||
             (sp.foreign.port == UDP_PORT_ANY))
                 return EINVAL;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_send - check version");
+
+        if (sp.foreign.addr.version != sp.local.addr.version)
+                return EINVAL;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_send - encode pdu");
+
         rc = udp_pdu_encode(&sp, msg, &pdu);
         if (rc != EOK)
                 return ENOMEM;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_send - transmit");
+
         rc = udp_transmit_pdu(pdu);
         udp_pdu_delete(pdu);
@@ -280 +295 @@
                 return EIO;
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_send - success");
         return EOK;
 }
@@ -292 +308 @@
         udp_rcv_queue_entry_t *rqe;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv()");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_recv()");
 
         fibril_mutex_lock(&assoc->lock);
@@ -303 +319 @@
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - association was reset");
                 fibril_mutex_unlock(&assoc->lock);
-                return ECONNABORTED;
+                return ENXIO;
         }
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - got a message");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_recv() - got a message");
         link = list_first(&assoc->rcv_queue);
         rqe = list_get_instance(link, udp_rcv_queue_entry_t, link);
@@ -328 +344 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_received(%p, %p)", rsp, msg);
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_received(%p, %p)", rsp, msg);
 
         assoc = udp_assoc_find_ref(rsp);
         if (assoc == NULL) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "No association found. Message dropped.");
+                log_msg(LOG_DEFAULT, LVL_NOTE, "No association found. Message dropped.");
                 /* XXX Generate ICMP error. */
                 /* XXX Might propagate error directly by error return. */
@@ -339 +355 @@
         }
 
-        rc = udp_assoc_queue_msg(assoc, rsp, msg);
-        if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Out of memory. Message dropped.");
+        if (0) {
+                rc = udp_assoc_queue_msg(assoc, rsp, msg);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Out of memory. Message dropped.");
                 /* XXX Generate ICMP error? */
+                }
         }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "call assoc->cb->recv_msg");
+        assoc->cb->recv_msg(assoc->cb_arg, rsp, msg);
 }
 
@@ -387 +408 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG,
-            "udp_socket_match(sock=(%u), pat=(%u))", sock->port, patt->port);
+        char *sa, *pa;
+
+        sa = pa = (char *)"?";
+        (void) inet_addr_format(&sock->addr, &sa);
+        (void) inet_addr_format(&patt->addr, &pa);
+
+        log_msg(LOG_DEFAULT, LVL_NOTE,
+            "udp_socket_match(sock=(%s,%u), pat=(%s,%u))",
+            sa, sock->port, pa, patt->port);
         
         if ((!inet_addr_is_any(&patt->addr)) &&
@@ -394 +422 @@
                 return false;
         
+        log_msg(LOG_DEFAULT, LVL_NOTE, "addr OK");
+        
         if ((patt->port != UDP_PORT_ANY) &&
             (patt->port != sock->port))
                 return false;
         
-        log_msg(LOG_DEFAULT, LVL_DEBUG, " -> match");
+        log_msg(LOG_DEFAULT, LVL_NOTE, " -> match");
         
         return true;
@@ -430 +460 @@
 static udp_assoc_t *udp_assoc_find_ref(udp_sockpair_t *sp)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_find_ref(%p)", sp);
+        char *la, *ra;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "udp_assoc_find_ref(%p)", sp);
         
         fibril_mutex_lock(&assoc_list_lock);
         
+        log_msg(LOG_DEFAULT, LVL_NOTE, "associations:");
         list_foreach(assoc_list, link, udp_assoc_t, assoc) {
                 udp_sockpair_t *asp = &assoc->ident;
                 
+                la = ra = NULL;
+
+                (void) inet_addr_format(&asp->local.addr, &la);
+                (void) inet_addr_format(&asp->foreign.addr, &ra);
+
+                log_msg(LOG_DEFAULT, LVL_NOTE, "find_ref:asp=%p la=%s ra=%s",
+                    asp, la, ra);
                 /* Skip unbound associations */
-                if (asp->local.port == UDP_PORT_ANY)
+                if (asp->local.port == UDP_PORT_ANY) {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "skip unbound");
                         continue;
+                }
                 
                 if (udp_sockpair_match(sp, asp)) {
@@ -446 +488 @@
                         fibril_mutex_unlock(&assoc_list_lock);
                         return assoc;
+                } else {
+                        log_msg(LOG_DEFAULT, LVL_NOTE, "not matched");
                 }
         }
         
+        log_msg(LOG_DEFAULT, LVL_NOTE, "associations END");
         fibril_mutex_unlock(&assoc_list_lock);
         return NULL;