diff options
| author | Rostislav Kondratenko <rostik@rkond.ru> | 2018-02-21 17:27:00 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-06 16:36:41 +0100 |
| commit | f31361a7721a071257b77f57268259a8bf94be86 (patch) | |
| tree | dad02d42be74bca9f6148896f5ca486432d5c00f | |
| parent | forcepoint #10 pop empty stack (diff) | |
| download | core-f31361a7721a071257b77f57268259a8bf94be86.tar.gz core-f31361a7721a071257b77f57268259a8bf94be86.zip | |
tdf#97614 Fixing initialization code for Bluetooth and IP Server for Impress.
Change-Id: Icc385fb760b8a5ff337f58dc95ba3c3f86805eaa
Reviewed-on: https://gerrit.libreoffice.org/50108
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit fb5f13671c50f7f84d654a779bc0ff07e31ce95e)
Reviewed-on: https://gerrit.libreoffice.org/50414
(cherry picked from commit 424eb9e4282596818ed39943b9d4a64cb6888eef)
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 9 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/Server.cxx | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 5b858edac340..6fd5591cdba1 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -1343,16 +1343,14 @@ void SAL_CALL BluetoothServer::run() return; } - SOCKADDR aName; + SOCKADDR_BTH aName; int aNameSize = sizeof(aName); - getsockname( aSocket, &aName, &aNameSize ); // Retrieve the local address and port + getsockname( aSocket, reinterpret_cast<SOCKADDR*>(&aName), &aNameSize ); // Retrieve the local address and port CSADDR_INFO aAddrInfo; memset( &aAddrInfo, 0, sizeof(aAddrInfo) ); - aAddrInfo.LocalAddr.lpSockaddr = &aName; + aAddrInfo.LocalAddr.lpSockaddr = reinterpret_cast<SOCKADDR*>(&aName); aAddrInfo.LocalAddr.iSockaddrLength = sizeof( SOCKADDR_BTH ); - aAddrInfo.RemoteAddr.lpSockaddr = &aName; - aAddrInfo.RemoteAddr.iSockaddrLength = sizeof( SOCKADDR_BTH ); aAddrInfo.iSocketType = SOCK_STREAM; aAddrInfo.iProtocol = BTHPROTO_RFCOMM; @@ -1376,7 +1374,6 @@ void SAL_CALL BluetoothServer::run() aRecord.dwNameSpace = NS_BTH; aRecord.dwNumberOfCsAddrs = 1; aRecord.lpcsaBuffer = &aAddrInfo; - if (WSASetServiceW( &aRecord, RNRSERVICE_REGISTER, 0 ) == SOCKET_ERROR) { closesocket( aSocket ); diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 6d51a4e0d4a5..d653b0a380d6 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -83,7 +83,7 @@ void RemoteServer::execute() spServer = nullptr; return; } - osl::SocketAddr aAddr( "0", PORT ); + osl::SocketAddr aAddr( "0.0.0.0", PORT ); if ( !mSocket.bind( aAddr ) ) { SAL_WARN( "sdremote", "bind failed" << mSocket.getErrorAsString() ); |