sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/usrsock: Don't return -ESHUTDOWN even usrsockdev_is_opened return false

Browse Source 
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]
This commit is contained in:
Xiang Xiao 2020-02-22 18:12:37 +08:00 committed by Gregory Nutt
parent 8c8771a29d
commit f7ef08cdc1
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/usrsock/usrsock_dev.c
View File

@ -1155,7 +1155,6 @@ int usrsockdev_do_request(FAR struct usrsock_conn_s *conn,
{ {
FAR struct usrsockdev_s *dev = conn->dev; FAR struct usrsockdev_s *dev = conn->dev;
FAR struct usrsock_request_common_s *req_head = iov[0].iov_base; FAR struct usrsock_request_common_s *req_head = iov[0].iov_base;
int ret = OK;
if (!dev) 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", ninfo("usockid=%d; daemon abruptly closed /dev/usrsock.\n",
conn->usockid); conn->usockid);
ret = -ESHUTDOWN;
} }
/* Free request line for next command. */ /* 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. */ --dev->req.nbusy; /* net_lock held. */
return ret; return OK;
} }
/**************************************************************************** /****************************************************************************