Changeset 2a3214e in mainline for uspace/srv/net/tl/tcp/conn.c

Timestamp:

2011-10-26T16:50:52Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8218b6b

Parents:

6e88fea

Message:

Fibril timer primitive.
TCP Time-Wait timeout.

File:

• uspace/srv/net/tl/tcp/conn.c (modified) (9 diffs)

uspace/srv/net/tl/tcp/conn.c

@@ -45 +45 @@
 #include "segment.h"
 #include "seq_no.h"
+#include "state.h"
 #include "tcp_type.h"
 #include "tqueue.h"
@@ -51 +52 @@
 #define SND_BUF_SIZE 4096
 
+#define MAX_SEGMENT_LIFETIME    (15*1000*1000) //(2*60*1000*1000)
+#define TIME_WAIT_TIMEOUT       (2*MAX_SEGMENT_LIFETIME)
+
 LIST_INITIALIZE(conn_list);
 
 static void tcp_conn_seg_process(tcp_conn_t *conn, tcp_segment_t *seg);
+static void tcp_conn_tw_timer_set(tcp_conn_t *conn);
 
 /** Create new segment structure.
@@ -63 +68 @@
 tcp_conn_t *tcp_conn_new(tcp_sock_t *lsock, tcp_sock_t *fsock)
 {
-        tcp_conn_t *conn;
+        tcp_conn_t *conn = NULL;
 
         /* Allocate connection structure */
         conn = calloc(1, sizeof(tcp_conn_t));
         if (conn == NULL)
-                return NULL;
+                goto error;
+
+        conn->tw_timer = fibril_timer_create();
+        if (conn->tw_timer == NULL)
+                goto error;
 
         /* Allocate receive buffer */
@@ -78 +87 @@
 
         conn->rcv_buf = calloc(1, conn->rcv_buf_size);
-        if (conn->rcv_buf == NULL) {
-                free(conn);
-                return NULL;
-        }
+        if (conn->rcv_buf == NULL)
+                goto error;
 
         /** Allocate send buffer */
@@ -88 +95 @@
         conn->snd_buf_fin = false;
         conn->snd_buf = calloc(1, conn->snd_buf_size);
-        if (conn->snd_buf == NULL) {
-                free(conn);
-                return NULL;
-        }
+        if (conn->snd_buf == NULL)
+                goto error;
 
         /* Set up receive window. */
@@ -109 +114 @@
 
         return conn;
+
+error:
+        if (conn != NULL && conn->rcv_buf != NULL)
+                free(conn->rcv_buf);
+        if (conn != NULL && conn->snd_buf != NULL)
+                free(conn->snd_buf);
+        if (conn != NULL && conn->tw_timer != NULL)
+                fibril_timer_destroy(conn->tw_timer);
+        if (conn != NULL)
+                free(conn);
+
+        return NULL;
 }
 
@@ -803 +820 @@
                         log_msg(LVL_DEBUG, "FIN received -> Time-Wait");
                         conn->cstate = st_time_wait;
-                        /* XXX start time-wait timer */
+                        /* Start the Time-Wait timer */
+                        tcp_conn_tw_timer_set(conn);
                         break;
                 case st_close_wait:
@@ -811 +829 @@
                         break;
                 case st_time_wait:
-                        /* XXX Restart the 2 MSL time-wait timeout */
+                        /* Restart the Time-Wait timer */
+                        tcp_conn_tw_timer_set(conn);
                         break;
                 }
@@ -912 +931 @@
 }
 
+/** Time-Wait timeout handler.
+ *
+ * @param arg   Connection
+ */
+static void tw_timeout_func(void *arg)
+{
+        tcp_conn_t *conn = (tcp_conn_t *) arg;
+
+        log_msg(LVL_DEBUG, "tw_timeout_func(%p)", conn);
+        log_msg(LVL_DEBUG, " TW Timeout -> Closed");
+
+        tcp_conn_remove(conn);
+        conn->cstate = st_closed;
+}
+
+/** Start or restart the Time-Wait timeout.
+ *
+ * @param conn          Connection
+ */
+void tcp_conn_tw_timer_set(tcp_conn_t *conn)
+{
+        fibril_timer_set(conn->tw_timer, TIME_WAIT_TIMEOUT, tw_timeout_func,
+            (void *)conn);
+}
+
 /** Trim segment to the receive window.
  *