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/osl/unx | |
| 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/osl/unx')
| -rw-r--r-- | sal/osl/unx/socket.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index c78e43a9de93..cc1798e4eb1d 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -426,7 +426,10 @@ oslSocketAddr SAL_CALL osl_createInetBroadcastAddr ( &pDottedAddr, strDottedAddr->buffer, strDottedAddr->length, RTL_TEXTENCODING_UTF8, OUSTRING_TO_OSTRING_CVTFLAGS); - nAddr = inet_addr (pDottedAddr->buffer); + in_addr buf; + if (inet_pton (AF_INET, pDottedAddr->buffer, &buf) == 1) { + nAddr = buf.s_addr; + } rtl_string_release (pDottedAddr); } @@ -494,11 +497,11 @@ oslSocketAddr osl_psz_createInetSocketAddr ( sal_Int32 Port) { oslSocketAddr pAddr = nullptr; - sal_Int32 Addr = inet_addr(pszDottedAddr); - if(Addr != -1) + in_addr buf; + if(inet_pton(AF_INET, pszDottedAddr, &buf) == 1) { /* valid dotted addr */ - pAddr = createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port) , Addr ); + pAddr = createSocketAddrWithFamily( osl_Socket_FamilyInet, htons(Port) , buf.s_addr ); } return pAddr; } |