Changeset 0c2d9bb in mainline for uspace/srv/net/tcp/ucall.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/tcp/ucall.c (modified) (2 diffs)

uspace/srv/net/tcp/ucall.c

@@ -83 +83 @@
 
         if (oflags == tcp_open_nonblock) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_open -> %p", nconn);
                 *conn = nconn;
                 return TCP_EOK;
@@ -234 +235 @@
 tcp_error_t tcp_uc_close(tcp_conn_t *conn)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_close()", conn->name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_uc_close(%p)", conn->name,
+            conn);
 
         fibril_mutex_lock(&conn->lock);
 
         if (conn->cstate == st_closed) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_close - ENOTEXIST");
                 fibril_mutex_unlock(&conn->lock);
                 return TCP_ENOTEXIST;
         }
 
+        if (conn->cstate == st_listen || conn->cstate == st_syn_sent) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_close - listen/syn_sent");
+                tcp_conn_reset(conn);
+                tcp_conn_remove(conn);
+                return TCP_EOK;
+        }
+
         if (conn->snd_buf_fin) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_close - ECLOSING");
                 fibril_mutex_unlock(&conn->lock);
                 return TCP_ECLOSING;
         }
 
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_uc_close - set snd_buf_fin");
         conn->snd_buf_fin = true;
         tcp_tqueue_new_data(conn);