Changes in uspace/srv/net/udp/assoc.c [a2e3ee6:69a93df7] in mainline

File:

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

uspace/srv/net/udp/assoc.c

@@ -36 +36 @@
 
 #include <adt/list.h>
-#include <stdbool.h>
+#include <bool.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -82 +82 @@
         if (lsock != NULL)
                 assoc->ident.local = *lsock;
-        
         if (fsock != NULL)
                 assoc->ident.foreign = *fsock;
@@ -105 +104 @@
 static void udp_assoc_free(udp_assoc_t *assoc)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_free(%p)", assoc->name, assoc);
+        log_msg(LVL_DEBUG, "%s: udp_assoc_free(%p)", assoc->name, assoc);
 
         while (!list_empty(&assoc->rcv_queue)) {
@@ -128 +127 @@
 void udp_assoc_addref(udp_assoc_t *assoc)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc);
+        log_msg(LVL_DEBUG, "%s: upd_assoc_addref(%p)", assoc->name, assoc);
         atomic_inc(&assoc->refcnt);
 }
@@ -140 +139 @@
 void udp_assoc_delref(udp_assoc_t *assoc)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc);
+        log_msg(LVL_DEBUG, "%s: udp_assoc_delref(%p)", assoc->name, assoc);
 
         if (atomic_predec(&assoc->refcnt) == 0)
@@ -155 +154 @@
 void udp_assoc_delete(udp_assoc_t *assoc)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_assoc_delete(%p)", assoc->name, assoc);
+        log_msg(LVL_DEBUG, "%s: udp_assoc_delete(%p)", assoc->name, assoc);
 
         assert(assoc->deleted == false);
@@ -193 +192 @@
 void udp_assoc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_foreign(%p, %p)", assoc, fsock);
+        log_msg(LVL_DEBUG, "udp_assoc_set_foreign(%p, %p)", assoc, fsock);
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.foreign = *fsock;
@@ -201 +200 @@
 /** Set local socket in association.
  *
- * @param assoc Association
- * @param lsock Local socket (deeply copied)
- *
+ * @param assoc         Association
+ * @param fsock         Foreign socket (deeply copied)
  */
 void udp_assoc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, lsock);
+        log_msg(LVL_DEBUG, "udp_assoc_set_local(%p, %p)", assoc, lsock);
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.local = *lsock;
-        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);
 }
@@ -244 +228 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_send(%p, %p, %p)",
+        log_msg(LVL_DEBUG, "udp_assoc_send(%p, %p, %p)",
             assoc, fsock, msg);
 
@@ -252 +236 @@
                 sp.foreign = *fsock;
 
-        if ((inet_addr_is_any(&sp.foreign.addr)) ||
-            (sp.foreign.port == UDP_PORT_ANY))
+        if (sp.foreign.addr.ipv4 == 0 || sp.foreign.port == 0)
                 return EINVAL;
 
@@ -278 +261 @@
         udp_rcv_queue_entry_t *rqe;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv()");
+        log_msg(LVL_DEBUG, "udp_assoc_recv()");
 
         fibril_mutex_lock(&assoc->lock);
-        while (list_empty(&assoc->rcv_queue) && !assoc->reset) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - waiting");
+        while (list_empty(&assoc->rcv_queue)) {
+                log_msg(LVL_DEBUG, "udp_assoc_recv() - waiting");
                 fibril_condvar_wait(&assoc->rcv_queue_cv, &assoc->lock);
         }
 
-        if (assoc->reset) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - association was reset");
-                fibril_mutex_unlock(&assoc->lock);
-                return ECONNABORTED;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv() - got a message");
+        log_msg(LVL_DEBUG, "udp_assoc_recv() - got a message");
         link = list_first(&assoc->rcv_queue);
         rqe = list_get_instance(link, udp_rcv_queue_entry_t, link);
@@ -314 +291 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_received(%p, %p)", rsp, msg);
+        log_msg(LVL_DEBUG, "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(LVL_DEBUG, "No association found. Message dropped.");
                 /* XXX Generate ICMP error. */
                 /* XXX Might propagate error directly by error return. */
@@ -326 +303 @@
         rc = udp_assoc_queue_msg(assoc, rsp, msg);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "Out of memory. Message dropped.");
+                log_msg(LVL_DEBUG, "Out of memory. Message dropped.");
                 /* XXX Generate ICMP error? */
         }
 }
 
-/** Reset association.
- *
- * This causes any pendingreceive operations to return immediately with
- * UDP_ERESET.
- */
-void udp_assoc_reset(udp_assoc_t *assoc)
-{
-        fibril_mutex_lock(&assoc->lock);
-        assoc->reset = true;
-        fibril_condvar_broadcast(&assoc->rcv_queue_cv);
-        fibril_mutex_unlock(&assoc->lock);
-}
-
 static int udp_assoc_queue_msg(udp_assoc_t *assoc, udp_sockpair_t *sp,
     udp_msg_t *msg)
@@ -349 +313 @@
         udp_rcv_queue_entry_t *rqe;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_queue_msg(%p, %p, %p)",
+        log_msg(LVL_DEBUG, "udp_assoc_queue_msg(%p, %p, %p)",
             assoc, sp, msg);
 
@@ -372 +336 @@
 static bool udp_socket_match(udp_sock_t *sock, udp_sock_t *patt)
 {
-        if ((!inet_addr_is_any(&patt->addr)) &&
-            (!inet_addr_compare(&patt->addr, &sock->addr)))
+        log_msg(LVL_DEBUG, "udp_socket_match(sock=(%x,%u), pat=(%x,%u))",
+            sock->addr.ipv4, sock->port, patt->addr.ipv4, patt->port);
+
+        if (patt->addr.ipv4 != UDP_IPV4_ANY &&
+            patt->addr.ipv4 != sock->addr.ipv4)
                 return false;
-        
-        if ((patt->port != UDP_PORT_ANY) &&
-            (patt->port != sock->port))
+
+        if (patt->port != UDP_PORT_ANY &&
+            patt->port != sock->port)
                 return false;
-        
-        log_msg(LOG_DEFAULT, LVL_DEBUG, " -> match");
-        
+
+        log_msg(LVL_DEBUG, " -> match");
+
         return true;
 }
@@ -388 +355 @@
 static bool udp_sockpair_match(udp_sockpair_t *sp, udp_sockpair_t *pattern)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_sockpair_match(%p, %p)", sp, pattern);
+        log_msg(LVL_DEBUG, "udp_sockpair_match(%p, %p)", sp, pattern);
 
         if (!udp_socket_match(&sp->local, &pattern->local))
@@ -396 +363 @@
                 return false;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Socket pair matched.");
+        log_msg(LVL_DEBUG, "Socket pair matched.");
         return true;
 }
@@ -412 +379 @@
 static udp_assoc_t *udp_assoc_find_ref(udp_sockpair_t *sp)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_find_ref(%p)", sp);
-        
+        log_msg(LVL_DEBUG, "udp_assoc_find_ref(%p)", sp);
+
         fibril_mutex_lock(&assoc_list_lock);
-        
+
         list_foreach(assoc_list, link) {
                 udp_assoc_t *assoc = list_get_instance(link, udp_assoc_t, link);
                 udp_sockpair_t *asp = &assoc->ident;
-                
+                log_msg(LVL_DEBUG, "compare with assoc (f:(%x,%u), l:(%x,%u))",
+                    asp->foreign.addr.ipv4, asp->foreign.port,
+                    asp->local.addr.ipv4, asp->local.port);
+
                 /* Skip unbound associations */
                 if (asp->local.port == UDP_PORT_ANY)
                         continue;
-                
+
                 if (udp_sockpair_match(sp, asp)) {
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Returning assoc %p", assoc);
+                        log_msg(LVL_DEBUG, "Returning assoc %p", assoc);
                         udp_assoc_addref(assoc);
                         fibril_mutex_unlock(&assoc_list_lock);
@@ -431 +401 @@
                 }
         }
-        
+
         fibril_mutex_unlock(&assoc_list_lock);
         return NULL;
 }
 
+
 /**
  * @}