Changeset 204ba47 in mainline

Timestamp:

2015-06-08T13:16:48Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1f2b07a

Parents:

048cd69

Message:

Fix data_avail callback. Fix tcp_conn_recv(). Do not generate spurious data_avail callbacks.

Location:

uspace

Files:

• app/nterm/conn.c (modified) (1 diff)
• lib/c/generic/inet/tcp.c (modified) (1 diff)
• srv/net/tcp/conn.c (modified) (1 diff)
• srv/net/tcp/service.c (modified) (1 diff)

uspace/app/nterm/conn.c

@@ -75 +75 @@
                 rc = tcp_conn_recv(conn, recv_buf, RECV_BUF_SIZE, &nrecv);
                 if (rc != EOK) {
-                        printf("\n[Receive error]\n");
+                        printf("\n[Receive error %d]\n", rc);
                         break;
                 }

uspace/lib/c/generic/inet/tcp.c

@@ -525 +525 @@
         fibril_condvar_broadcast(&conn->cv);
 
+        if (conn->cb != NULL && conn->cb->data_avail != NULL)
+                conn->cb->data_avail(conn);
+
         async_answer_0(iid, EOK);
 }

uspace/srv/net/tcp/conn.c

@@ -1011 +1011 @@
 
         /* Signal to the receive function that new data has arrived */
-        fibril_condvar_broadcast(&conn->rcv_buf_cv);
-        if (conn->cb != NULL && conn->cb->recv_data != NULL)
-                conn->cb->recv_data(conn, conn->cb_arg);
+        if (xfer_size > 0) {
+                fibril_condvar_broadcast(&conn->rcv_buf_cv);
+                if (conn->cb != NULL && conn->cb->recv_data != NULL)
+                        conn->cb->recv_data(conn, conn->cb_arg);
+        }
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Received %zu bytes of data.", xfer_size);

uspace/srv/net/tcp/service.c

@@ -769 +769 @@
         }
 
-        size = max(size, 16384);
+        size = min(size, 16384);
         data = malloc(size);
         if (data == NULL) {