Changeset 7ce8f88 in mainline for uspace/srv/net/tcp/service.c

Timestamp:

2017-12-20T22:12:55Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

8610c2c

Parents:

95ab29b

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:03:44)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2017-12-20 22:12:55)

Message:

Fix error handling in tcp somewhat.

File:

• uspace/srv/net/tcp/service.c (modified) (5 diffs)

uspace/srv/net/tcp/service.c

@@ -661 +661 @@
         tcp_cconn_t *cconn;
         int rc;
+        tcp_error_t trc;
 
         rc = tcp_cconn_get(client, conn_id, &cconn);
@@ -666 +667 @@
                 return rc;
 
-        rc = tcp_uc_send(cconn->conn, data, size, 0);
-        if (rc != EOK)
-                return rc;
+        trc = tcp_uc_send(cconn->conn, data, size, 0);
+        if (trc != TCP_EOK)
+                return EIO;
 
         return EOK;
@@ -691 +692 @@
         xflags_t xflags;
         int rc;
+        tcp_error_t trc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_impl()");
@@ -700 +702 @@
         }
 
-        rc = tcp_uc_receive(cconn->conn, data, size, nrecv, &xflags);
-        if (rc != EOK) {
-                switch (rc) {
+        trc = tcp_uc_receive(cconn->conn, data, size, nrecv, &xflags);
+        if (trc != TCP_EOK) {
+                switch (trc) {
                 case TCP_EAGAIN:
                         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_impl() - EAGAIN");
@@ -710 +712 @@
                         return EOK;
                 default:
-                        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_impl() - trc=%d", rc);
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_impl() - trc=%d", trc);
                         return EIO;
                 }