diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-05-31 11:29:48 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-05-31 15:22:33 +0200 |
| commit | 1fef071c01caf6c293dd941ee7c8340e6894afc3 (patch) | |
| tree | d43fb27dec4017719aa04200e7590b45b9a58e4e /sal/qa | |
| parent | d220fc00c2c3d7a2a24fd762599d1bfcc27f34d5 (diff) | |
Replace inet_addr with inet_pton
...as inet_addr is deprecated (it does not allow to distinguish successful
return for "255.255.255.255" from -1 error return); and update tests
Change-Id: I605cb2ba18fe9bd11d2d68c8f1c94271c4503509
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116441
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal/qa')
| -rw-r--r-- | sal/qa/osl/socket.cxx | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/sal/qa/osl/socket.cxx b/sal/qa/osl/socket.cxx index dab2621f2293..813702f4ca21 100644 --- a/sal/qa/osl/socket.cxx +++ b/sal/qa/osl/socket.cxx @@ -19,18 +19,34 @@ namespace class SocketTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(SocketTest); - CPPUNIT_TEST(test_getDottedInetAddrOfSocketAddr); + CPPUNIT_TEST(test_createInetSocketAddr); + CPPUNIT_TEST(test_createInetBroadcastAddr); CPPUNIT_TEST_SUITE_END(); - void test_getDottedInetAddrOfSocketAddr() + void test_createInetSocketAddr() { OUString const in("123.4.56.78"); - auto const addr = osl_createInetSocketAddr(in.pData, 0); + auto const addr = osl_createInetSocketAddr(in.pData, 100); CPPUNIT_ASSERT(addr != nullptr); + CPPUNIT_ASSERT_EQUAL(osl_Socket_FamilyInet, osl_getFamilyOfSocketAddr(addr)); OUString out; auto const res = osl_getDottedInetAddrOfSocketAddr(addr, &out.pData); CPPUNIT_ASSERT_EQUAL(osl_Socket_Ok, res); CPPUNIT_ASSERT_EQUAL(in, out); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), osl_getInetPortOfSocketAddr(addr)); + } + + void test_createInetBroadcastAddr() + { + OUString const in("123.4.56.78"); + auto const addr = osl_createInetBroadcastAddr(in.pData, 100); + CPPUNIT_ASSERT(addr != nullptr); + CPPUNIT_ASSERT_EQUAL(osl_Socket_FamilyInet, osl_getFamilyOfSocketAddr(addr)); + OUString out; + auto const res = osl_getDottedInetAddrOfSocketAddr(addr, &out.pData); + CPPUNIT_ASSERT_EQUAL(osl_Socket_Ok, res); + CPPUNIT_ASSERT_EQUAL(OUString("123.255.255.255"), out); + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), osl_getInetPortOfSocketAddr(addr)); } }; |