From ba4ab0e0c7cbeb1adcf59720d6f9d0f87c0d446b Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 22 Feb 2020 18:12:37 +0800 Subject: [PATCH 1/2] net/usrsock: Don't return -ESHUTDOWN even usrsockdev_is_opened return false since usrsock_conn_s::resp::result contain more detailed info and fix the below error in usrsocktest: Testing group "WakeWithSignal" => [TEST ASSERT FAILED!] In function "do_usrsock_blocking_connect_thread": line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed. got value: 110 should be: 113 [TEST ASSERT FAILED!] In function "do_usrsock_blocking_connect_thread": line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed. got value: 110 should be: 113 [TEST ASSERT FAILED!] In function "do_usrsock_blocking_connect_thread": line 200: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((test_abort ? 113 : 4))' failed. got value: 110 should be: 113 [TEST ASSERT FAILED!] In function "do_wake_test": line 567: Assertion `(bool)((usrsocktest_test_failed)) == (bool)(false)' failed. got value: 1 should be: 0 Group "WakeWithSignal": [FAILED] Change-Id: I0cbd9d659e3ecf8be457bec94df2f33f647314a1 Signed-off-by: Xiang Xiao --- net/usrsock/usrsock_dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/usrsock/usrsock_dev.c b/net/usrsock/usrsock_dev.c index 9f1f21bff5473..a557e99218522 100644 --- a/net/usrsock/usrsock_dev.c +++ b/net/usrsock/usrsock_dev.c @@ -1155,7 +1155,6 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn, { FAR struct usrsockdev_s *dev = conn->dev; FAR struct usrsock_request_common_s *req_head = iov[0].iov_base; - int ret = OK; if (!dev) { @@ -1207,7 +1206,6 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn, { ninfo("usockid=%d; daemon abruptly closed /dev/usrsock.\n", conn->usockid); - ret = -ESHUTDOWN; } /* Free request line for next command. */ @@ -1216,7 +1214,7 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn, --dev->req.nbusy; /* net_lock held. */ - return ret; + return OK; } /**************************************************************************** From 79a4d8b09ec5edfd17ce4982571c65993826ccb1 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sat, 22 Feb 2020 18:23:55 +0800 Subject: [PATCH 2/2] net/socket: Don't skip return -ENETDOWN in usrsock case Fix the below error in usrsocktest: Testing group "WakeWithSignal" => [TEST ASSERT FAILED!] In function "do_usrsock_blocking_socket_thread": line 122: Assertion `(ssize_t)((*get_errno_ptr())) == (ssize_t)((115))' failed. got value: 123 should be: 115 [TEST ASSERT FAILED!] In function "do_wake_test": line 567: Assertion `(bool)((usrsocktest_test_failed)) == (bool)(false)' failed. got value: 1 should be: 0 Group "WakeWithSignal": [FAILED] Change-Id: Ib80a078c2418a434343e1c2674d6826a9a089ce7 Signed-off-by: Xiang Xiao --- net/socket/socket.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/net/socket/socket.c b/net/socket/socket.c index 635ec4dc94d77..86ec8da9298be 100644 --- a/net/socket/socket.c +++ b/net/socket/socket.c @@ -113,23 +113,8 @@ int psock_socket(int domain, int type, int protocol, FAR struct socket *psock) */ ret = g_usrsock_sockif.si_setup(psock, protocol); - if (ret == -ENETDOWN) - { - /* -ENETDOWN means that USRSOCK daemon is not running. Attempt to - * open socket with kernel networking stack. - */ - } - else - { - psock->s_sockif = &g_usrsock_sockif; - - if (ret < 0) - { - return ret; - } - - return ret; - } + psock->s_sockif = &g_usrsock_sockif; + return ret; } #endif /* CONFIG_NET_USRSOCK */