Changeset 132ab5d1 in mainline for uspace/srv/net/tcp/service.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/srv/net/tcp/service.c

@@ -37 +37 @@
 #include <async.h>
 #include <errno.h>
+#include <str_error.h>
 #include <inet/endpoint.h>
 #include <inet/inet.h>
@@ -432 +433 @@
  * @param rconn_id Place to store ID of new connection
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 static int tcp_conn_create_impl(tcp_client_t *client, inet_ep2_t *epp,
@@ -506 +507 @@
  * @param rlst_id Place to store ID of new listener
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
 */
 static int tcp_listener_create_impl(tcp_client_t *client, inet_ep_t *ep,
@@ -577 +578 @@
  * @param conn_id Connection ID
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 static int tcp_conn_send_fin_impl(tcp_client_t *client, sysarg_t conn_id)
@@ -602 +603 @@
  * @param conn_id Connection ID
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 static int tcp_conn_push_impl(tcp_client_t *client, sysarg_t conn_id)
@@ -627 +628 @@
  * @param conn_id Connection ID
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 static int tcp_conn_reset_impl(tcp_client_t *client, sysarg_t conn_id)
@@ -653 +654 @@
  * @param size    Data size in bytes
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 static int tcp_conn_send_impl(tcp_client_t *client, sysarg_t conn_id,
@@ -660 +661 @@
         tcp_cconn_t *cconn;
         int rc;
+        tcp_error_t trc;
 
         rc = tcp_cconn_get(client, conn_id, &cconn);
@@ -665 +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;
@@ -682 +684 @@
  * @param nrecv   Place to store actual number of bytes received
  *
- * @return EOK on success or negative error code
+ * @return EOK on success or an error code
  */
 static int tcp_conn_recv_impl(tcp_client_t *client, sysarg_t conn_id,
@@ -690 +692 @@
         xflags_t xflags;
         int rc;
+        tcp_error_t trc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_impl()");
@@ -699 +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");
@@ -709 +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;
                 }
@@ -1095 +1098 @@
         rc = tcp_conn_recv_impl(client, conn_id, data, size, &rsize);
         if (rc != EOK) {
-                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_wait_srv - recv_impl failed rc=%d", rc);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_conn_recv_wait_srv - recv_impl failed rc=%s", str_error_name(rc));
                 async_answer_0(callid, rc);
                 async_answer_0(iid, rc);
@@ -1241 +1244 @@
 /** Initialize TCP service.
  *
- * @return EOK on success or negative error code.
+ * @return EOK on success or an error code.
  */
 int tcp_service_init(void)