Changeset 2c4bb828 in mainline

Timestamp:

2015-06-03T15:53:12Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1ede059

Parents:

8d48c7e

Message:

Must update amap when connection ident changes.

Location:

uspace/srv/net/tcp

Files:

• conn.c (modified) (4 diffs)
• conn.h (modified) (1 diff)
• ucall.c (modified) (1 diff)

uspace/srv/net/tcp/conn.c

@@ -58 +58 @@
 
 static LIST_INITIALIZE(conn_list);
+/** Taken after tcp_conn_t lock */
 static FIBRIL_MUTEX_INITIALIZE(conn_list_lock);
 static amap_t *amap;
@@ -1176 +1177 @@
  *
  * @param conn          Connection
- * @param seg           Segment
- */
-void tcp_conn_segment_arrived(tcp_conn_t *conn, tcp_segment_t *seg)
-{
+ * @param epp           Endpoint pair on which segment was received
+ * @param seg           Segment
+ */
+void tcp_conn_segment_arrived(tcp_conn_t *conn, inet_ep2_t *epp,
+    tcp_segment_t *seg)
+{
+        inet_ep2_t aepp;
+        inet_ep2_t oldepp;
+        int rc;
+
         log_msg(LOG_DEFAULT, LVL_NOTE, "conn=%p", conn);
         log_msg(LOG_DEFAULT, LVL_NOTE, "conn->name=%p", conn->name);
@@ -1185 +1192 @@
             conn->name, seg);
 
+        tcp_conn_lock(conn);
+
+        if (conn->cstate == st_closed) {
+                log_msg(LOG_DEFAULT, LVL_WARN, "Connection is closed.");
+                tcp_unexpected_segment(epp, seg);
+                tcp_conn_unlock(conn);
+                return;
+        }
+
+        if (inet_addr_is_any(&conn->ident.remote.addr) ||
+            conn->ident.remote.port == inet_port_any ||
+            inet_addr_is_any(&conn->ident.local.addr)) {
+
+                log_msg(LOG_DEFAULT, LVL_NOTE, "tcp_conn_segment_arrived: "
+                    "Changing connection ID, updating amap.");
+                oldepp = conn->ident;
+
+                /* Need to remove and re-insert connection with new identity */
+                fibril_mutex_lock(&conn_list_lock);
+
+                if (inet_addr_is_any(&conn->ident.remote.addr))
+                        conn->ident.remote.addr = epp->remote.addr;
+
+                if (conn->ident.remote.port == inet_port_any)
+                        conn->ident.remote.port = epp->remote.port;
+
+                if (inet_addr_is_any(&conn->ident.local.addr))
+                        conn->ident.local.addr = epp->local.addr;
+
+                rc = amap_insert(amap, &conn->ident, conn, af_allow_system, &aepp);
+                if (rc != EOK) {
+                        assert(rc != EEXISTS);
+                        assert(rc == ENOMEM);
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
+                        fibril_mutex_unlock(&conn_list_lock);
+                        tcp_conn_unlock(conn);
+                        return;
+                }
+
+                amap_remove(amap, &oldepp);
+                fibril_mutex_unlock(&conn_list_lock);
+
+                conn->name = (char *) "a";
+        }
+
         switch (conn->cstate) {
         case st_listen:
-                tcp_conn_sa_listen(conn, seg); break;
+                tcp_conn_sa_listen(conn, seg);
+                break;
         case st_syn_sent:
-                tcp_conn_sa_syn_sent(conn, seg); break;
+                tcp_conn_sa_syn_sent(conn, seg);
+                break;
         case st_syn_received:
         case st_established:
@@ -1199 +1253 @@
         case st_time_wait:
                 /* Process segments in order of sequence number */
-                tcp_conn_sa_queue(conn, seg); break;
+                tcp_conn_sa_queue(conn, seg);
+                break;
         case st_closed:
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "state=%d", (int) conn->cstate);
                 assert(false);
         }
+
+        tcp_conn_unlock(conn);
 }
 

uspace/srv/net/tcp/conn.h

@@ -55 +55 @@
 extern void tcp_conn_unlock(tcp_conn_t *);
 extern bool tcp_conn_got_syn(tcp_conn_t *);
-extern void tcp_conn_segment_arrived(tcp_conn_t *, tcp_segment_t *);
+extern void tcp_conn_segment_arrived(tcp_conn_t *, inet_ep2_t *,
+    tcp_segment_t *);
 extern void tcp_conn_trim_seg_to_wnd(tcp_conn_t *, tcp_segment_t *);
 extern void tcp_unexpected_segment(inet_ep2_t *, tcp_segment_t *);

uspace/srv/net/tcp/ucall.c

@@ -336 +336 @@
         }
 
-        tcp_conn_lock(conn);
-
-        if (conn->cstate == st_closed) {
-                log_msg(LOG_DEFAULT, LVL_WARN, "Connection is closed.");
-                tcp_unexpected_segment(epp, seg);
-                tcp_conn_unlock(conn);
-                tcp_conn_delref(conn);
-                return;
-        }
-
-        if (inet_addr_is_any(&conn->ident.remote.addr))
-                conn->ident.remote.addr = epp->remote.addr;
-
-        if (conn->ident.remote.port == inet_port_any)
-                conn->ident.remote.port = epp->remote.port;
-
-        if (inet_addr_is_any(&conn->ident.local.addr))
-                conn->ident.local.addr = epp->local.addr;
-
-        tcp_conn_segment_arrived(conn, seg);
-
-        tcp_conn_unlock(conn);
+        tcp_conn_segment_arrived(conn, epp, seg);
         tcp_conn_delref(conn);
 }