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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

uspace/srv/net/udp/ucall.c

@@ -68 +68 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock);
+        
+        udp_assoc_set_local(assoc, lsock);
+        return UDP_EOK;
+}
 
-        udp_assoc_set_local(assoc, lsock);
+udp_error_t udp_uc_set_local_port(udp_assoc_t *assoc, uint16_t lport)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %" PRIu16 ")", assoc, lport);
+        
+        udp_assoc_set_local_port(assoc, lport);
         return UDP_EOK;
 }
@@ -105 +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);
         }
 
@@ -125 +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);
 }