Various fixes/logging/features

Author: oliviermartin

dbus/gattlib.c

@@ -133,19 +133,22 @@ gatt_connection_t *gattlib_connect(void* adapter, const char *dst, unsigned long
 
     // even after init_default_adapter() - the adapter can be NULL
     if (gattlib_adapter == NULL) {
+        GATTLIB_LOG(GATTLIB_DEBUG, "gattlib_connect: No adapter");
         return NULL;
     }
 
 	get_device_path_from_mac(adapter_name, dst, object_path, sizeof(object_path));
 
 	gattlib_context_t* conn_context = calloc(sizeof(gattlib_context_t), 1);
 	if (conn_context == NULL) {
+		GATTLIB_LOG(GATTLIB_DEBUG, "gattlib_connect: Cannot allocate context");
 		return NULL;
 	}
 	conn_context->adapter = gattlib_adapter;
 
 	gatt_connection_t* connection = calloc(sizeof(gatt_connection_t), 1);
 	if (connection == NULL) {
+		GATTLIB_LOG(GATTLIB_DEBUG, "gattlib_connect: Cannot allocate connection");
 		goto FREE_CONN_CONTEXT;
 	} else {
 		connection->context = conn_context;
@@ -162,6 +165,8 @@ gatt_connection_t *gattlib_connect(void* adapter, const char *dst, unsigned long
 		if (error) {
 			GATTLIB_LOG(GATTLIB_ERROR, "Failed to connect to DBus Bluez Device: %s", error->message);
 			g_error_free(error);
+		} else {
+			GATTLIB_LOG(GATTLIB_DEBUG, "gattlib_connect: Failed to connect to DBus Bluez Device");
 		}
 		goto FREE_CONNECTION;
 	} else {
@@ -206,6 +211,7 @@ gatt_connection_t *gattlib_connect(void* adapter, const char *dst, unsigned long
 	// Get list of objects belonging to Device Manager
 	device_manager = get_device_manager_from_adapter(conn_context->adapter);
     if (device_manager == NULL) {
+        GATTLIB_LOG(GATTLIB_DEBUG, "gattlib_connect: Failed to get device manager from adapter");
         goto FREE_DEVICE;
     }
 	conn_context->dbus_objects = g_dbus_object_manager_get_objects(device_manager);
@@ -227,8 +233,7 @@ gatt_connection_t *gattlib_connect(void* adapter, const char *dst, unsigned long
 	free(conn_context);
 
 	// destroy default adapter
-	if(adapter == NULL)
-	{
+	if(adapter == NULL) {
 		gattlib_adapter_close(gattlib_adapter);
 	}
 
@@ -250,9 +255,21 @@ gatt_connection_t *gattlib_connect_async(void *adapter, const char *dst,
 }
 
 int gattlib_disconnect(gatt_connection_t* connection) {
-	gattlib_context_t* conn_context = connection->context;
+	gattlib_context_t* conn_context;
 	GError *error = NULL;
 
+	if (connection == NULL) {
+		GATTLIB_LOG(GATTLIB_ERROR, "Cannot disconnect - connection parameter is not valid.");
+		return GATTLIB_INVALID_PARAMETER;
+	}
+
+	conn_context = connection->context;
+
+	if (conn_context == NULL) {
+		GATTLIB_LOG(GATTLIB_ERROR, "Cannot disconnect - connection context is not valid.");
+		return GATTLIB_NOT_SUPPORTED;
+	}
+
 	org_bluez_device1_call_disconnect_sync(conn_context->device, NULL, &error);
 	if (error) {
 		GATTLIB_LOG(GATTLIB_ERROR, "Failed to disconnect DBus Bluez Device: %s", error->message);
@@ -266,7 +283,7 @@ int gattlib_disconnect(gatt_connection_t* connection) {
 	pthread_join(conn_context->event_thread, NULL);
 	g_main_loop_unref(conn_context->connection_loop);
 	disconnect_all_notifications(conn_context);
-	
+
 	free(conn_context->adapter->adapter_name);
 	free(conn_context->adapter);
 
@@ -790,7 +807,7 @@ int gattlib_discover_char_range(gatt_connection_t* connection, int start, int en
 			interface = g_dbus_object_manager_get_interface(device_manager, object_path, "org.bluez.Battery1");
 			if (interface) {
 				g_object_unref(interface);
-	
+
 				characteristic_list[count].handle = 0;
 				characteristic_list[count].value_handle = 0;
 				characteristic_list[count].properties = GATTLIB_CHARACTERISTIC_READ | GATTLIB_CHARACTERISTIC_NOTIFY;

gattlib-py/gattlib/device.py

@@ -42,7 +42,7 @@ def __init__(self, adapter, addr, name=None):
         self._gatt_characteristic_callbacks = {}
 
     @property
-    def mac_address(self):
+    def mac_address(self) -> str:
         """Return Device MAC Address"""
         return self._addr.decode("utf-8")
 
@@ -53,6 +53,10 @@ def connection(self):
         else:
             return c_void_p(None)
 
+    @property
+    def is_connected(self) -> bool:
+        return (self._connection is not None)
+
     def connect(self, options=CONNECTION_OPTIONS_LEGACY_DEFAULT):
         if self._adapter:
             adapter_name = self._adapter.name
@@ -61,7 +65,7 @@ def connect(self, options=CONNECTION_OPTIONS_LEGACY_DEFAULT):
 
         self._connection = gattlib_connect(adapter_name, self._addr, options)
         if self._connection is None:
-            raise DeviceError()
+            raise DeviceError(adapter=adapter_name, mac_address=self._addr)
 
     @property
     def rssi(self):
@@ -86,8 +90,10 @@ def register_on_disconnect(self, callback, user_data):
         gattlib_register_on_disconnect(self.connection, Device.on_disconnection, self)
 
     def disconnect(self):
-        ret = gattlib_disconnect(self.connection)
-        handle_return(ret)
+        if self._connection:
+            ret = gattlib_disconnect(self.connection)
+            handle_return(ret)
+        self._connection = None
 
     def discover(self):
         #

gattlib-py/gattlib/exception.py

@@ -38,8 +38,12 @@ class NotSupported(GattlibException):
 
 
 class DeviceError(GattlibException):
-    pass
+    def __init__(self, adapter: str = None, mac_address: str = None) -> None:
+        self.adapter = adapter
+        self.mac_address = mac_address
 
+    def __str__(self) -> str:
+        return f"Error with device {self.mac_address} on adapter {self.adapter}"
 
 class DBusError(GattlibException):
     pass