Changeset 0c2d9bb in mainline for uspace/srv/net/udp/assoc.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/assoc.c (modified) (2 diffs)

uspace/srv/net/udp/assoc.c

@@ -186 +186 @@
 }
 
+/** Set IP link in association.
+ *
+ * @param assoc         Association
+ * @param iplink        IP link
+ */
+void udp_assoc_set_iplink(udp_assoc_t *assoc, service_id_t iplink)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_iplink(%p, %zu)",
+            assoc, iplink);
+        fibril_mutex_lock(&assoc->lock);
+        assoc->ident.iplink = iplink;
+        fibril_mutex_unlock(&assoc->lock);
+}
+
 /** Set foreign socket in association.
  *
@@ -419 +433 @@
         fibril_mutex_lock(&assoc_list_lock);
         
-        list_foreach(assoc_list, link) {
-                udp_assoc_t *assoc = list_get_instance(link, udp_assoc_t, link);
+        list_foreach(assoc_list, link, udp_assoc_t, assoc) {
                 udp_sockpair_t *asp = &assoc->ident;