You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/09/01 06:58:16 UTC
[incubator-nuttx-apps] 02/06: examples/usrsocktest: correct the check region of remote address
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 5b47bc24ae824c0a33fffff8efaf8141ea1a810e
Author: chao an <an...@xiaomi.com>
AuthorDate: Wed Aug 31 22:51:02 2022 +0800
examples/usrsocktest: correct the check region of remote address
let us skip the sin_zero
Signed-off-by: chao an <an...@xiaomi.com>
---
examples/usrsocktest/usrsocktest_block_recv.c | 6 ++++--
examples/usrsocktest/usrsocktest_noblock_recv.c | 5 +++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/examples/usrsocktest/usrsocktest_block_recv.c b/examples/usrsocktest/usrsocktest_block_recv.c
index d5126ca64..a6684380d 100644
--- a/examples/usrsocktest/usrsocktest_block_recv.c
+++ b/examples/usrsocktest/usrsocktest_block_recv.c
@@ -248,7 +248,8 @@ static void no_block_connect(FAR struct usrsocktest_daemon_conf_s *dconf)
TEST_ASSERT_EQUAL(1, ret);
TEST_ASSERT_EQUAL_UINT8_ARRAY("a", data, 1);
TEST_ASSERT_EQUAL(sizeof(remoteaddr), addrlen);
- TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr, addrlen);
+ TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr,
+ addrlen - sizeof(addr.sin_zero));
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(6, usrsocktest_daemon_get_recv_bytes());
@@ -265,7 +266,8 @@ static void no_block_connect(FAR struct usrsocktest_daemon_conf_s *dconf)
TEST_ASSERT_EQUAL(5, ret);
TEST_ASSERT_EQUAL_UINT8_ARRAY("abcde", data, 5);
TEST_ASSERT_EQUAL(sizeof(remoteaddr), addrlen);
- TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr, addrlen);
+ TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr,
+ addrlen - sizeof(addr.sin_zero));
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(11, usrsocktest_daemon_get_recv_bytes());
diff --git a/examples/usrsocktest/usrsocktest_noblock_recv.c b/examples/usrsocktest/usrsocktest_noblock_recv.c
index 585843fe1..01995f6d3 100644
--- a/examples/usrsocktest/usrsocktest_noblock_recv.c
+++ b/examples/usrsocktest/usrsocktest_noblock_recv.c
@@ -180,7 +180,8 @@ static void receive(struct usrsocktest_daemon_conf_s *dconf)
TEST_ASSERT_EQUAL(3, ret);
TEST_ASSERT_EQUAL_UINT8_ARRAY("abc", data, 3);
TEST_ASSERT_EQUAL(addrlen, sizeof(remoteaddr));
- TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr, addrlen);
+ TEST_ASSERT_EQUAL_UINT8_ARRAY(&remoteaddr, &addr,
+ addrlen - sizeof(addr.sin_zero));
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(datalen + ret, usrsocktest_daemon_get_recv_bytes());
@@ -365,7 +366,7 @@ static void delayed_connect(struct usrsocktest_daemon_conf_s *dconf)
&addrlen);
TEST_ASSERT_EQUAL(-1, ret);
TEST_ASSERT_EQUAL(EAGAIN, errno);
- TEST_ASSERT_EQUAL(0, addrlen);
+ TEST_ASSERT_EQUAL(sizeof(remoteaddr), addrlen);
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_connected_sockets());
TEST_ASSERT_EQUAL(1, usrsocktest_daemon_get_num_active_sockets());
TEST_ASSERT_EQUAL(0, usrsocktest_daemon_get_send_bytes());