Changeset 3bacee1 in mainline for uspace/srv/net/tcp

Timestamp:

2018-04-12T16:27:17Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3cf22f9

Parents:

76d0981d

git-author:

Jiri Svoboda <jiri@…> (2018-04-11 19:25:33)

git-committer:

Jiri Svoboda <jiri@…> (2018-04-12 16:27:17)

Message:

Make ccheck-fix again and commit more good files.

Location:

uspace/srv/net/tcp

Files:

• conn.c (modified) (1 diff)
• inet.c (modified) (1 diff)
• pdu.c (modified) (1 diff)
• seq_no.c (modified) (1 diff)
• test/conn.c (modified) (3 diffs)
• test/rqueue.c (modified) (1 diff)
• test/seq_no.c (modified) (1 diff)

uspace/srv/net/tcp/conn.c

@@ -156 +156 @@
 
         /* Initialize retransmission queue */
-        if (tcp_tqueue_init(&conn->retransmit, conn, &tcp_conn_tqueue_cb)
-            != EOK) {
+        if (tcp_tqueue_init(&conn->retransmit, conn, &tcp_conn_tqueue_cb) !=
+            EOK) {
                 goto error;
         }

uspace/srv/net/tcp/inet.c

@@ -97 +97 @@
         if (hdr_size < sizeof(tcp_header_t)) {
                 log_msg(LOG_DEFAULT, LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu",
-                    hdr_size, sizeof(tcp_header_t));            return EINVAL;
+                    hdr_size, sizeof(tcp_header_t));
+                return EINVAL;
         }
 

uspace/srv/net/tcp/pdu.c

@@ -73 +73 @@
 
         for (i = 0; i < words; i++) {
-                w = ((uint16_t)bdata[2*i] << 8) | bdata[2*i + 1];
+                w = ((uint16_t)bdata[2 * i] << 8) | bdata[2 * i + 1];
                 sum = tcp_ocadd16(sum, w);
         }
 
         if (size % 2 != 0) {
-                w = ((uint16_t)bdata[2*words] << 8);
+                w = ((uint16_t)bdata[2 * words] << 8);
                 sum = tcp_ocadd16(sum, w);
         }

uspace/srv/net/tcp/seq_no.c

@@ -170 +170 @@
 
         /* Beginning of segment is inside window */
-        b_in = seq_no_le_lt(conn->rcv_nxt, seg->seq, conn->rcv_nxt
-            + conn->rcv_wnd);
+        b_in = seq_no_le_lt(conn->rcv_nxt, seg->seq, conn->rcv_nxt +
+            conn->rcv_wnd);
 
         /* End of segment is inside window */

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

@@ -139 +139 @@
 
         while (conn->cstate == st_syn_sent)
-                fibril_condvar_wait(&conn->cstate_cv, &conn->lock);
+                fibril_condvar_wait(&conn->cstate_cv, &conn->lock);
 
         PCUT_ASSERT_INT_EQUALS(st_closed, conn->cstate);
@@ -194 +194 @@
         /* Wait for client-side state to transition */
         while (cconn->cstate == st_syn_sent)
-                fibril_condvar_wait(&cconn->cstate_cv, &cconn->lock);
+                fibril_condvar_wait(&cconn->cstate_cv, &cconn->lock);
 
         PCUT_ASSERT_INT_EQUALS(st_established, cconn->cstate);
@@ -203 +203 @@
         tcp_conn_lock(sconn);
         while (sconn->cstate == st_listen || sconn->cstate == st_syn_received)
-                fibril_condvar_wait(&sconn->cstate_cv, &sconn->lock);
+                fibril_condvar_wait(&sconn->cstate_cv, &sconn->lock);
 
         PCUT_ASSERT_INT_EQUALS(st_established, sconn->cstate);

uspace/srv/net/tcp/test/rqueue.c

@@ -107 +107 @@
         seg_cnt = 0;
 
-        inet_ep2_init(&epp);
+        inet_ep2_init(&epp);
 
         tcp_rqueue_fibril_start();

uspace/srv/net/tcp/test/seq_no.c

@@ -130 +130 @@
         conn->rcv_wnd = (uint32_t) -10;
 
-        PCUT_ASSERT_FALSE(seq_no_in_rcv_wnd(conn,19));
+        PCUT_ASSERT_FALSE(seq_no_in_rcv_wnd(conn, 19));
         PCUT_ASSERT_TRUE(seq_no_in_rcv_wnd(conn, 20));
         PCUT_ASSERT_TRUE(seq_no_in_rcv_wnd(conn, 21));