From 40c45f2330725c32563e110474a91d1fe1109088 Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Thu, 4 Sep 2008 15:54:37 -0300 Subject: Serial: Missing DBusConnection unref --- serial/main.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'serial') diff --git a/serial/main.c b/serial/main.c index 97b26925..50dda095 100644 --- a/serial/main.c +++ b/serial/main.c @@ -26,24 +26,24 @@ #endif #include -#include #include #include "plugin.h" -#include "logging.h" #include "manager.h" +static DBusConnection *connection = NULL; + static int serial_init(void) { - DBusConnection *conn; - - conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); - if (conn == NULL) + connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL); + if (connection == NULL) return -EIO; - if (serial_manager_init(conn) < 0) + if (serial_manager_init(connection) < 0) { + dbus_connection_unref(connection); return -EIO; + } return 0; } @@ -51,6 +51,7 @@ static int serial_init(void) static void serial_exit(void) { serial_manager_exit(); + dbus_connection_unref(connection); } BLUETOOTH_PLUGIN_DEFINE("serial", serial_init, serial_exit) -- cgit From c74f11481aabe51612c7200e1e3ab91f7f1c4abb Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 6 Sep 2008 01:10:56 +0200 Subject: Fix D-Bus connection init --- serial/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'serial') diff --git a/serial/main.c b/serial/main.c index 50dda095..39df1650 100644 --- a/serial/main.c +++ b/serial/main.c @@ -32,7 +32,7 @@ #include "plugin.h" #include "manager.h" -static DBusConnection *connection = NULL; +static DBusConnection *connection; static int serial_init(void) { @@ -51,6 +51,7 @@ static int serial_init(void) static void serial_exit(void) { serial_manager_exit(); + dbus_connection_unref(connection); } -- cgit From 028ea961e350c8cdec87204d12cb83e64372380e Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 6 Sep 2008 01:33:29 +0200 Subject: Fix org.bluez.Serial interface --- serial/port.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'serial') diff --git a/serial/port.c b/serial/port.c index 0c70dc07..4abd954e 100644 --- a/serial/port.c +++ b/serial/port.c @@ -53,7 +53,7 @@ #include "manager.h" #include "storage.h" -#define SERIAL_PORT_INTERFACE "org.bluez.serial.Port" +#define SERIAL_PORT_INTERFACE "org.bluez.Serial" #define ERROR_INVALID_ARGS "org.bluez.Error.InvalidArguments" #define ERROR_DOES_NOT_EXIST "org.bluez.Error.DoesNotExist" -- cgit From d1a55f14c65738c0838daaf7391de1a6ecdf1cd3 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 6 Sep 2008 01:34:02 +0200 Subject: Remove old serial test script --- serial/test-serial | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100755 serial/test-serial (limited to 'serial') diff --git a/serial/test-serial b/serial/test-serial deleted file mode 100755 index aec728d4..00000000 --- a/serial/test-serial +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/python - -import sys -import time -import dbus - -bus = dbus.SystemBus() - -manager = dbus.Interface(bus.get_object('org.bluez', '/org/bluez'), - 'org.bluez.Manager') - -conn = manager.ActivateService('serial') - -serial = dbus.Interface(bus.get_object(conn, '/org/bluez/serial'), - 'org.bluez.serial.Manager') - -if (len(sys.argv) < 2): - print "Usage: %s
[service]" % (sys.argv[0]) - sys.exit(1) - -address = sys.argv[1] - -if (len(sys.argv) < 3): - service = "spp" -else: - service = sys.argv[2] - -device = serial.ConnectService(address, service) - -print "Connected %s to %s" % (device, address) - -print "Press CTRL-C to disconnect" - -try: - time.sleep(1000) - print "Terminating connection" -except: - pass - -serial.DisconnectService(device) -- cgit From b326ad96e35e4abcd0466a82e5c92c727c8cc2af Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 6 Sep 2008 01:39:37 +0200 Subject: Fix D-Bus API for serial and network plugins --- serial/proxy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'serial') diff --git a/serial/proxy.c b/serial/proxy.c index d779d848..7128bdbc 100644 --- a/serial/proxy.c +++ b/serial/proxy.c @@ -67,8 +67,8 @@ #define DIALUP_NET_NAME "dun" #define DIALUP_NET_UUID "00001103-0000-1000-8000-00805F9B34FB" -#define SERIAL_PROXY_INTERFACE "org.bluez.serial.Proxy" -#define SERIAL_MANAGER_INTERFACE "org.bluez.serial.ProxyManager" +#define SERIAL_PROXY_INTERFACE "org.bluez.SerialProxy" +#define SERIAL_MANAGER_INTERFACE "org.bluez.SerialProxyManager" #define BUF_SIZE 1024 typedef enum { -- cgit From 862ac7734f267001fbe36cba28d4ab5daf36685f Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 6 Sep 2008 04:55:11 +0200 Subject: Fix distribution includes --- serial/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'serial') diff --git a/serial/Makefile.am b/serial/Makefile.am index 01551889..7a0b34c2 100644 --- a/serial/Makefile.am +++ b/serial/Makefile.am @@ -19,6 +19,6 @@ AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src -EXTRA_DIST = serial-api.txt test-serial +EXTRA_DIST = serial-api.txt MAINTAINERCLEANFILES = Makefile.in -- cgit