Changeset 25eec4ef in mainline for uspace/srv/net/udp/assoc.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

uspace/srv/net/udp/assoc.c

@@ -36 +36 @@
 
 #include <adt/list.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <io/log.h>
@@ -200 +200 @@
 /** Set local socket in association.
  *
- * @param assoc         Association
- * @param fsock         Foreign socket (deeply copied)
+ * @param assoc Association
+ * @param lsock Local socket (deeply copied)
+ *
  */
 void udp_assoc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
@@ -208 +209 @@
         fibril_mutex_lock(&assoc->lock);
         assoc->ident.local = *lsock;
+        fibril_mutex_unlock(&assoc->lock);
+}
+
+/** Set local port in association.
+ *
+ * @param assoc Association
+ * @param lport Local port
+ *
+ */
+void udp_assoc_set_local_port(udp_assoc_t *assoc, uint16_t lport)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_set_local(%p, %" PRIu16 ")", assoc, lport);
+        fibril_mutex_lock(&assoc->lock);
+        assoc->ident.local.port = lport;
         fibril_mutex_unlock(&assoc->lock);
 }
@@ -425 +440 @@
 }
 
-
 /**
  * @}