Changeset 6eb957dc in mainline for uspace/srv/net/tcp/ucall.c

Timestamp:

2014-10-09T03:34:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ef3da5a

Parents:

fa65df1 (diff), 18cc83c (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:

Mainline changes

File:

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

uspace/srv/net/tcp/ucall.c

@@ -76 +76 @@
         nconn = tcp_conn_new(lsock, fsock);
         tcp_conn_add(nconn);
+        tcp_conn_lock(nconn);
 
         if (acpass == ap_active) {
@@ -83 +84 @@
 
         if (oflags == tcp_open_nonblock) {
+                tcp_conn_unlock(nconn);
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open -> %p", nconn);
                 *conn = nconn;
@@ -90 +92 @@
         /* Wait for connection to be established or reset */
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open: Wait for connection.");
-        tcp_conn_lock(nconn);
         while (nconn->cstate == st_listen ||
             nconn->cstate == st_syn_sent ||