diff options
author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2020-12-10 14:24:05 +0100 |
---|---|---|
committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2021-04-19 09:22:57 +0200 |
commit | eac00017e34e77343b9ac3638bed9c75115a23fe (patch) | |
tree | cdbfb83b09325602e5ef1099051390413ad0a93c /sal/inc | |
parent | 9f06c54ca1819b6d4df48f33772cfa5ceb90dccd (diff) |
[API CHANGE] Do not call getaddrinfo if we just want the hostname
Similiar to afc41a467fdfabb2cd0879be3e4f1879a1d1dc91 ,
don't call getaddrinfo in getLocalHostname which calls DNS.
This causes a lag when creating the lockfile on opening a document
if the network is flaky/disabled.
See tdf#97931 and tdf#47179 for some problems caused by this.
For the one case where it is expected to call DNS, add a separate function
to restore the old behavior.
The (semantic) [API CHANGE] is in osl_getLocalHostname,
it does no longer return a FQDN.
Change-Id: I43455715a474ff6770351d1ce007c28aeb08f32e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107554
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'sal/inc')
-rw-r--r-- | sal/inc/oslsocket.hxx | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sal/inc/oslsocket.hxx b/sal/inc/oslsocket.hxx new file mode 100644 index 000000000000..52260c263190 --- /dev/null +++ b/sal/inc/oslsocket.hxx @@ -0,0 +1,24 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <rtl/ustring.h> +#include <osl/socket.h> + +/** Retrieve this machines hostname as fully qualified domain name (FQDN). + Note that this might be slower than calling osl_getLocalHostname + since DNS needs to be queried to determine the FQDN. + @param strLocalHostname out-parameter. The string that receives the local host name. + @retval sal_True upon success + @retval sal_False +*/ +oslSocketResult osl_getLocalHostnameFQDN(rtl_uString** strLocalHostname); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file |