Changeset 9362cc2 in mainline

Timestamp:

2015-06-06T15:48:36Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8499160

Parents:

7c15d6f

Message:

Need to set reset flag before changing state, which causes callback function to be called.

Location:

uspace/srv/net/tcp

Files:

• conn.c (modified) (1 diff)
• service.c (modified) (1 diff)

uspace/srv/net/tcp/conn.c

@@ -412 +412 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: tcp_conn_reset()", conn->name);
+        conn->reset = true;
         tcp_conn_state_set(conn, st_closed);
-        conn->reset = true;
 
         tcp_conn_tw_timer_clear(conn);

uspace/srv/net/tcp/service.c

@@ -94 +94 @@
 
         if (old_state != st_closed && nstate == st_closed && conn->reset) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_service_cstate_change: "
+                    "Connection reset");
                 /* Connection reset */
                 tcp_ev_conn_reset(cconn);
+        } else {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_service_cstate_change: "
+                    "old_state=%d nstate=%d conn->reset=%d",
+                    old_state, nstate, conn->reset);
         }