1 files changed, 69 insertions, 25 deletions

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 0052397a64ef..bcff4addb44f 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -22,29 +22,60 @@
 #include "bluetooth/rfcomm.h"
 #endif
 
+
+#include "Communicator.hxx"
+
 using namespace sd;
 
-BluetoothServer::BluetoothServer():
-    Thread( "BluetoothServer" )
+BluetoothServer::BluetoothServer( std::vector<Communicator*>* pCommunicators ):
+    Thread( "BluetoothServer" ),
+    mpCommunicators( pCommunicators )
 {
-
 }
 
 BluetoothServer::~BluetoothServer()
 {
 }
 
+struct oslSocketImpl {
+    int                 m_Socket;
+    int                 m_nLastError;
+    void*    m_CloseCallback;
+    void*               m_CallbackArg;
+    oslInterlockedCount m_nRefCount;
+#if defined(LINUX)
+    sal_Bool            m_bIsAccepting;
+    sal_Bool            m_bIsInShutdown;
+#endif
+};
+
+
 void BluetoothServer::execute()
 {
 #ifdef LINUX
-//     g_type_init();
-//     GError* aError = NULL;
-//     GDBusConnection* aConnection = g_bus_get_sync( G_BUS_TYPE_SYSTEM, NULL, &aError );
-//     if ( aError )
-//     {
-//         fprintf( stderr, aError->message );
-//         g_error_free( aError );
-//     }
+    g_type_init();
+    GError* aError = NULL;
+    GDBusConnection* aConnection = g_bus_get_sync( G_BUS_TYPE_SYSTEM, NULL, &aError );
+    if ( aError )
+    {
+        fprintf( stderr, aError->message );
+        g_error_free( aError );
+    }
+
+    GVariant *aAdapter = g_dbus_connection_call_sync( aConnection,
+                                "org.bluez", "/", "org.bluez.Manager",
+                                "DefaultAdapter", NULL,
+                                G_VARIANT_TYPE_TUPLE,
+                                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &aError);
+    GVariant *aAdapterName = g_variant_get_child_value( aAdapter, 0 );
+    if ( aError )
+    {
+        fprintf( stderr, aError->message );
+        g_error_free( aError );
+    }
+    fprintf( stderr, (const char*) g_variant_get_string( aAdapterName, NULL ) );
+
+
 //     GDBusObjectManager* aManager = g_dbus_object_manager_client_new_sync( aConnection,
 //                     G_DBUS_OBJECT_MANAGER_CLIENT_FLAGS_NONE, "org.bluez.Manager", "/org/bluez",
 //                     NULL, NULL, NULL, NULL, &aError );
@@ -53,14 +84,21 @@ void BluetoothServer::execute()
 //         fprintf( stderr, aError->message );
 //         g_error_free( aError );
 //     }
-//
-//     GVariant *aRet = g_dbus_connection_call_sync( aConnection,
-//                                 "org.bluez", "/", "org.bluez.Database",
-//                                 "AddServiceRecordFromXml",
-//                                  g_variant_new ("s",
-//                                             ""),,
-//                                 G_VARIANT_TYPE_UINT32,
-//                                 G_DBUS_CALL_FLAGS_NONE, -1, NULL, &aError);
+
+    GVariant *aRecordHandle = g_dbus_connection_call_sync( aConnection,
+                                "org.bluez", g_variant_get_string( aAdapterName, NULL ), "org.bluez.Service",
+                                "AddRecord",
+                                 g_variant_new("(s)",
+                                            "<?xml version='1.0' encoding= 'UTF-8' ?><record><attribute id='0x0001'><sequence><uuid value='0x1101' /></sequence></attribute><attribute id='0x0004'><sequence><sequence><uuid value='0x0100' /></sequence><sequence><uuid value='0x0003' /><uint8 value='0x05' /></sequence></sequence></attribute><attribute id='0x0005'><sequence><uuid value='0x1002' /></sequence></attribute><attribute id='0x0006'><sequence><uint16 value='0x656e' /><uint16 value='0x006a' /><uint16 value='0x0100' /></sequence></attribute><attribute id='0x0009'><sequence><sequence><uuid value='0x1101' /><uint16 value='0x0100' /></sequence></sequence></attribute><attribute id='0x0100'><text value='Serial Port' /></attribute><attribute id='0x0101'><text value='COM Port' /></attribute></record>"),
+                                G_VARIANT_TYPE_TUPLE,
+                                G_DBUS_CALL_FLAGS_NONE, -1, NULL, &aError);
+    if ( aError )
+    {
+        fprintf( stderr, aError->message );
+        g_error_free( aError );
+    }
+    (void) aRecordHandle;
+    // Remove handle again at some point
 //     g_variant_unref( aRet );
 //     fprintf( stderr, "Manager gotten\n" );
 //
@@ -125,8 +163,8 @@ void BluetoothServer::execute()
 
     sockaddr_rc aAddr;
     aAddr.rc_family = AF_BLUETOOTH;
-//      aAddr.rc_bdaddr = *BDADDR_ANY;
-    aAddr.rc_channel = 1;
+    aAddr.rc_bdaddr = {{0, 0, 0, 0, 0, 0}}; // BDADDR_ANY is broken
+    aAddr.rc_channel = 5;
 
     if ( bind( aSocket, (sockaddr*) &aAddr, sizeof(aAddr)) < 0 ) {
         close( aSocket );
@@ -141,12 +179,18 @@ void BluetoothServer::execute()
 
     sockaddr_rc aRemoteAddr;
     socklen_t  aRemoteAddrLen = sizeof(aRemoteAddr);
-    if ( accept(aSocket, (sockaddr*) &aRemoteAddr, &aRemoteAddrLen) < 0 )
+    int bSocket;
+    if ( (bSocket = accept(aSocket, (sockaddr*) &aRemoteAddr, &aRemoteAddrLen)) < 0 )
     {
         close( aSocket );
         return;
     } else {
         fprintf( stderr, "Accepted Bluetooth\n" );
+
+        Communicator* pCommunicator = new Communicator( new BufferedStreamSocket( bSocket) );
+        mpCommunicators->push_back( pCommunicator );
+        pCommunicator->launch();
+
     }
 
 #endif
@@ -163,14 +207,14 @@ void BluetoothServer::execute()
 
 BluetoothServer *sd::BluetoothServer::spServer = NULL;
 
-void BluetoothServer::setup()
+void BluetoothServer::setup( std::vector<Communicator*>* pCommunicators )
 {
     if (spServer)
         return;
 
-    spServer = new BluetoothServer();
+    spServer = new BluetoothServer( pCommunicators );
     spServer->launch();
 }
 
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file