[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |9 +++--
sd/source/ui/remotecontrol/Server.cxx |2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit d1114a44cef9c54dc6d5b35578ce272a3cb74811
Author: Rostislav Kondratenko
Date: Wed Feb 21 17:27:00 2018 +0300
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
Tested-by: Jenkins
(cherry picked from commit fb5f13671c50f7f84d654a779bc0ff07e31ce95e)
Reviewed-on: https://gerrit.libreoffice.org/50413
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 4965ea11830b..780224719309 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1332,16 +1332,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(&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(&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;
@@ -1365,7 +1363,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 5fdaa1772209..28cb5f18b6a6 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() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |9 +++--
sd/source/ui/remotecontrol/Server.cxx |2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit 424eb9e4282596818ed39943b9d4a64cb6888eef
Author: Rostislav Kondratenko
Date: Wed Feb 21 17:27:00 2018 +0300
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
Tested-by: Jenkins
(cherry picked from commit fb5f13671c50f7f84d654a779bc0ff07e31ce95e)
Reviewed-on: https://gerrit.libreoffice.org/50414
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index bf68261e95e1..e42fc31c96b1 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1336,16 +1336,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(&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(&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;
@@ -1369,7 +1367,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() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |9 +++--
sd/source/ui/remotecontrol/Server.cxx |2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit fb5f13671c50f7f84d654a779bc0ff07e31ce95e
Author: Rostislav Kondratenko
Date: Wed Feb 21 17:27:00 2018 +0300
Fixing initialization code for Bluetooth and IP Server for Impress.
Change-Id: Icc385fb760b8a5ff337f58dc95ba3c3f86805eaa
Reviewed-on: https://gerrit.libreoffice.org/50108
Reviewed-by: Michael Stahl
Tested-by: Jenkins
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index ccdb332dc7ef..c89acf3daf58 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1332,16 +1332,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(&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(&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;
@@ -1365,7 +1363,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 5fdaa1772209..28cb5f18b6a6 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() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
