Changeset 89ac5513 in mainline for uspace/srv/net/udp/ucall.c

Timestamp:

2013-06-23T19:54:53Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

ddb1922

Parents:

3abf0760 (diff), 96cbd18 (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 mainline changes.

File:

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

uspace/srv/net/udp/ucall.c

@@ -113 +113 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_receive()", assoc->name);
         rc = udp_assoc_recv(assoc, &msg, fsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv -> %d", rc);
         switch (rc) {
+        case EOK:
+                break;
+        case ECONNABORTED:
+                return UDP_ERESET;
+        default:
+                assert(false);
         }
 
@@ -133 +140 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_destroy()");
+        udp_assoc_reset(assoc);
         udp_assoc_remove(assoc);
         udp_assoc_delete(assoc);
+}
+
+void udp_uc_reset(udp_assoc_t *assoc)
+{
+        udp_assoc_reset(assoc);
 }