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

Timestamp:

2013-05-03T21:14:39Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

716357f

Parents:

1c7ba2d (diff), 5d1cb8a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge simple DNS resolver.

File:

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

uspace/srv/net/udp/assoc.c

@@ -279 +279 @@
 
         fibril_mutex_lock(&assoc->lock);
-        while (list_empty(&assoc->rcv_queue)) {
+        while (list_empty(&assoc->rcv_queue) && !assoc->reset) {
                 log_msg(LOG_DEFAULT, 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;
         }
 
@@ -323 +329 @@
 }
 
+/** 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)