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

Timestamp:

2013-09-29T06:56:33Z (12 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

a9bd960d

Parents:

3deb0155 (diff), 13be2583 (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) (3 diffs)

uspace/srv/net/udp/ucall.c

@@ -57 +57 @@
 }
 
+void udp_uc_set_iplink(udp_assoc_t *assoc, service_id_t iplink)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_iplink(%p, %zu)",
+            assoc, iplink);
+
+        udp_assoc_set_iplink(assoc, iplink);
+}
+
 udp_error_t udp_uc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock)
 {
@@ -113 +121 @@
         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 +148 @@
 {
         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);
 }