Update and cleanup D-Bus support

1 files changed, 23 insertions, 94 deletions

diff --git a/hcid/dbus.c b/hcid/dbus.c
index 36fd476c..d76da4cd 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -178,12 +178,8 @@ static DBusMessage* handle_get_devices_req(DBusMessage *msg, void *data);
 static DBusMessage* handle_not_implemented_req(DBusMessage *msg, void *data);
 
 static const DBusObjectPathVTable obj_vtable = {
-	NULL,
-	&msg_func,
-	NULL,
-	NULL,
-	NULL,
-	NULL
+	.message_function = &msg_func,
+	.unregister_function = NULL
 };
 
 /*
@@ -554,8 +550,6 @@ static void watch_toggled(DBusWatch *watch, void *data)
 gboolean hcid_dbus_init(void)
 {
 	DBusError error;
-	uint16_t *dev_path_id  = (uint16_t *) malloc(1);
-	uint16_t *mgr_path_id  = (uint16_t *) malloc(1);
 
 	dbus_error_init(&error);
 
@@ -578,33 +572,22 @@ gboolean hcid_dbus_init(void)
 		return FALSE;
 	}
 
-	if (!dev_path_id)
-		return FALSE;
-
-	*dev_path_id = DEVICE_PATH_ID;
-
 	if (!dbus_connection_register_object_path(connection, DEVICE_PATH,
-						&obj_vtable, dev_path_id)) {
+						&obj_vtable, (void *)DEVICE_PATH_ID)) {
 		syslog(LOG_ERR, "Can't register %s object", DEVICE_PATH);
 		return FALSE;
 	}
 
 	syslog(LOG_INFO,"Registered %s object", DEVICE_PATH);
 
-	if (!mgr_path_id)
-		goto done;
-
-	*mgr_path_id = MANAGER_PATH_ID;
-
 	if (!dbus_connection_register_fallback(connection, MANAGER_PATH,
-						&obj_vtable, mgr_path_id)) {
+						&obj_vtable, (void *)MANAGER_PATH_ID)) {
 		syslog(LOG_ERR, "Can't register %s object", MANAGER_PATH);
 		return FALSE;
 	}
 
 	syslog(LOG_INFO, "Registered %s object", MANAGER_PATH);
 
-done:
 	if (!dbus_connection_add_filter(connection, hci_signal_filter, NULL, NULL)) {
 		syslog(LOG_ERR, "Can't add new HCI filter");
 		return FALSE;
@@ -625,35 +608,18 @@ void hcid_dbus_exit(void)
 	char **snd_level = NULL;
 	char *ptr1;
 	char *ptr2;
-	uint16_t *data = NULL;
 
 	if (!connection)
 		return;
 
-	if (dbus_connection_get_object_path_data(connection,
-						DEVICE_PATH, (void *) &data)) {
-		if (data) {
-			free(data);
-			data = NULL;
-		}
-	}
-
 	if (!dbus_connection_unregister_object_path(connection, DEVICE_PATH))
 		syslog(LOG_ERR, "Can't unregister %s object", DEVICE_PATH);
 	else
 		syslog(LOG_INFO, "Unregistered %s object", DEVICE_PATH);
 
-	if (dbus_connection_get_object_path_data(connection,
-						MANAGER_PATH, (void*) &data)) {
-		if (data) {
-			free(data);
-			data = NULL;
-		}
-	}
-
 	if (!dbus_connection_unregister_object_path(connection, MANAGER_PATH))
 		syslog(LOG_ERR, "Can't unregister %s object", MANAGER_PATH);
-	else 
+	else
 		syslog(LOG_INFO, "Unregistered %s object", MANAGER_PATH);
 
 	dbus_connection_list_registered(connection, fst_parent, &fst_level);
@@ -669,14 +635,6 @@ void hcid_dbus_exit(void)
 
 			syslog(LOG_INFO, "Unregistered %s object", path);
 
-			if (dbus_connection_get_object_path_data(connection,
-							path, (void*) &data)) {
-				if (data) {
-					free(data);
-					data = NULL;
-				}
-			}
-
 			if (!dbus_connection_unregister_object_path(connection, path))
 				syslog(LOG_ERR, "Can't unregister %s object", path);
 
@@ -689,14 +647,6 @@ void hcid_dbus_exit(void)
 
 			syslog(LOG_INFO, "Unregistered %s object", path);
 
-			if (dbus_connection_get_object_path_data(connection,
-							path, (void*) &data)) {
-				if (data) {
-					free(data);
-					data = NULL;
-				}
-			}
-
 			if (!dbus_connection_unregister_object_path(connection, path))
 				syslog(LOG_ERR, "Can't unregister %s object", path);
 		}
@@ -760,31 +710,25 @@ gboolean hcid_dbus_unregister_device(uint16_t id)
 static int hci_dbus_reg_obj_path(DBusConnection *conn, int dft_reg, uint16_t id)
 {
 	char path[MAX_PATH_LENGTH];
-	uint16_t *ptr_id =  (uint16_t*)malloc(1);
-	uint16_t *ptr_id_dft;
 
 	/* register the default path*/
 	if (!dft_reg) {
-		ptr_id_dft =  (uint16_t*)malloc(1);
-		*ptr_id_dft = DEFAULT_DEVICE_PATH_ID;
 		sprintf(path, "%s/%s/%s", MANAGER_PATH, HCI_DEFAULT_DEVICE_NAME, BLUEZ_HCI);
 
 		syslog(LOG_INFO, "registering dft path:%s - id:%d", path, DEFAULT_DEVICE_PATH_ID);
 
-		if (!dbus_connection_register_object_path(conn, path, &obj_vtable, ptr_id_dft)) { 
+		if (!dbus_connection_register_object_path(conn, path, &obj_vtable, (void *)DEFAULT_DEVICE_PATH_ID)) { 
 			syslog(LOG_ERR,"DBUS failed to register %s object", path);
 			/* ignore, the default path was already registered */
 		}
 	}
 
-	*ptr_id = id;
-
 	/* register the default path*/
 	sprintf(path, "%s/%s%d/%s", MANAGER_PATH, HCI_DEVICE_NAME, id, BLUEZ_HCI);
 
 	syslog(LOG_INFO, "registering  -  path:%s - id:%d",path, id);
 
-	if (!dbus_connection_register_object_path(conn, path, &obj_vtable, ptr_id)) {
+	if (!dbus_connection_register_object_path(conn, path, &obj_vtable, (void *)((uint32_t)id))) {
 		syslog(LOG_ERR,"DBUS failed to register %s object", path);
 		/* ignore, the path was already registered */
 	}
@@ -807,7 +751,6 @@ static int hci_dbus_unreg_obj_path(DBusConnection *conn, int unreg_dft, uint16_t
 	int ret = 0;
 	char path[MAX_PATH_LENGTH];
 	char dft_path[MAX_PATH_LENGTH];
-	uint16_t *data;
 
 	if (unreg_dft) {
 		sprintf(dft_path, "%s/%s/%s", MANAGER_PATH, HCI_DEFAULT_DEVICE_NAME, BLUEZ_HCI);
@@ -815,13 +758,6 @@ static int hci_dbus_unreg_obj_path(DBusConnection *conn, int unreg_dft, uint16_t
 		if (!dbus_connection_unregister_object_path (connection, dft_path)) {
 			syslog(LOG_ERR,"DBUS failed to unregister %s object", dft_path);
 			ret = -1;
-		} else {
-			if (dbus_connection_get_object_path_data(conn, dft_path, (void *) &data)) {
-				if (data) {
-					free(data);
-					data = NULL;
-				}
-			}
 		}
 	}
 
@@ -830,13 +766,6 @@ static int hci_dbus_unreg_obj_path(DBusConnection *conn, int unreg_dft, uint16_t
 	if (!dbus_connection_unregister_object_path (connection, path)) {
 		syslog(LOG_ERR,"DBUS failed to unregister %s object", path);
 		ret = -1;
-	} else {
-		if (dbus_connection_get_object_path_data(conn, path, (void *) &data)) {
-			if (data) {
-				free(data);
-				data = NULL;
-			}
-		}
 	}
 
 	return ret;
@@ -897,7 +826,7 @@ static DBusHandlerResult msg_func(DBusConnection *conn, DBusMessage *msg, void *
 	const char *path;
 	const char *rel_path;
 	const char *tmp_iface = NULL;
-	const uint16_t *udata = (uint16_t *) data;
+	const uint32_t udata = (uint32_t) data;
 	uint32_t result = BLUEZ_EDBUS_UNKNOWN_METHOD;
 	DBusHandlerResult ret = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 	uint8_t found = 0;
@@ -908,7 +837,7 @@ static DBusHandlerResult msg_func(DBusConnection *conn, DBusMessage *msg, void *
 	method = dbus_message_get_member (msg);
 	signature = dbus_message_get_signature(msg);
 
-	syslog (LOG_INFO, "%s - path:%s, udata:0x%X", __PRETTY_FUNCTION__, path, *udata);
+	syslog (LOG_INFO, "%s - path:%s, udata:0x%X", __PRETTY_FUNCTION__, path, udata);
 
 	if (strcmp(path, DEVICE_PATH) == 0) {
 		ptr_handlers = dev_services;
@@ -917,7 +846,7 @@ static DBusHandlerResult msg_func(DBusConnection *conn, DBusMessage *msg, void *
 	} else {
 		if (strcmp(path, MANAGER_PATH) > 0) {
 			/* it is device specific path */
-			if ( *udata == MANAGER_PATH_ID ) {
+			if ( udata == MANAGER_PATH_ID ) {
 				/* fallback handling. The child path IS NOT registered */
 				reply = bluez_new_failure_msg(msg, BLUEZ_EDBUS_UNKNOWN_PATH);
 				ret = DBUS_HANDLER_RESULT_HANDLED;
@@ -989,14 +918,14 @@ static DBusMessage* handle_periodic_inq_req(DBusMessage *msg, void *data)
 	periodic_inquiry_cp inq_param;
 	DBusMessageIter iter;
 	DBusMessage *reply = NULL;
-	const uint16_t *udata = (uint16_t *) data;
+	uint32_t udata = (uint32_t) data;
 	uint8_t length;
 	uint8_t max_period;
 	uint8_t min_period;
 	int sock = -1;
 	int dev_id = -1;
 
-	if (*udata == DEFAULT_DEVICE_PATH_ID) {
+	if (udata == DEFAULT_DEVICE_PATH_ID) {
 		if ((dev_id = hci_get_route(NULL)) < 0) {
 			syslog(LOG_ERR, "Bluetooth device is not available");
 			reply = bluez_new_failure_msg(msg, BLUEZ_ESYSTEM_ENODEV);
@@ -1004,7 +933,7 @@ static DBusMessage* handle_periodic_inq_req(DBusMessage *msg, void *data)
 		
 		}
 	} else
-		dev_id = *udata;
+		dev_id = udata;
 
 	if ((sock = hci_open_dev(dev_id)) < 0) {
 		syslog(LOG_ERR, "HCI device open failed");
@@ -1068,18 +997,18 @@ static DBusMessage* handle_cancel_periodic_inq_req(DBusMessage *msg, void *data)
 {
 	DBusMessageIter iter;
 	DBusMessage *reply = NULL;
-	const uint16_t *udata = (uint16_t *)data;
+	uint32_t udata = (uint32_t) data;
 	int sock = -1;
 	int dev_id = -1;
 
-	if (*udata == DEFAULT_DEVICE_PATH_ID) {
+	if (udata == DEFAULT_DEVICE_PATH_ID) {
 		if ((dev_id = hci_get_route(NULL)) < 0) {
 			syslog(LOG_ERR, "Bluetooth device is not available");
 			reply = bluez_new_failure_msg(msg, BLUEZ_ESYSTEM_ENODEV);
 			goto failed;
 		}
 	} else
-		dev_id = *udata;
+		dev_id = udata;
 
 	if ((sock = hci_open_dev(dev_id)) < 0) {
 		syslog(LOG_ERR, "HCI device open failed");
@@ -1114,7 +1043,7 @@ static DBusMessage* handle_inq_req(DBusMessage *msg, void *data)
 	DBusMessageIter  struct_iter;
 	DBusMessage *reply = NULL;
 	inquiry_info *info = NULL;
-	const uint16_t *udata = (uint16_t *)data;
+	uint32_t udata = (uint32_t) data;
 	const char *paddr = addr;
 	int dev_id = -1;
 	int i;
@@ -1124,14 +1053,14 @@ static DBusMessage* handle_inq_req(DBusMessage *msg, void *data)
 	int8_t length;
 	int8_t num_rsp;
 
-	if (*udata == DEFAULT_DEVICE_PATH_ID) {
+	if (udata == DEFAULT_DEVICE_PATH_ID) {
 		if ((dev_id = hci_get_route(NULL)) < 0) {
 			syslog(LOG_ERR, "Bluetooth device is not available");
 			reply = bluez_new_failure_msg(msg, BLUEZ_ESYSTEM_ENODEV);
 			goto failed;
 		}
 	} else
-		dev_id = *udata;
+		dev_id = udata;
 
 	dbus_message_iter_init(msg, &iter);
 	dbus_message_iter_get_basic(&iter, &length);
@@ -1183,7 +1112,7 @@ static DBusMessage* handle_role_switch_req(DBusMessage *msg, void *data)
 	DBusMessageIter iter;
 	DBusMessage *reply = NULL;
 	char *str_bdaddr = NULL;
-	const uint16_t *udata = (uint16_t *)data;
+	const uint32_t udata = (uint32_t) data;
 	bdaddr_t bdaddr;
 	uint8_t role;
 	int dev_id = -1;
@@ -1204,7 +1133,7 @@ static DBusMessage* handle_role_switch_req(DBusMessage *msg, void *data)
 		goto failed;
 	}
 
-	if (*udata != DEFAULT_DEVICE_PATH_ID && *udata != dev_id) {
+	if (udata != DEFAULT_DEVICE_PATH_ID && udata != dev_id) {
 		syslog(LOG_ERR, "Connection not found\n");
 		reply = bluez_new_failure_msg(msg, BLUEZ_EDBUS_CONN_NOT_FOUND);
 		goto failed;
@@ -1276,7 +1205,7 @@ static DBusMessage* handle_get_devices_req(DBusMessage *msg, void *data)
 	dl->dev_num = HCI_MAX_DEV;
 	dr = dl->dev_req;
 
-	if (ioctl(sock, HCIGETDEVLIST, (void *) dl) < 0) {
+	if (ioctl(sock, HCIGETDEVLIST, dl) < 0) {
 		reply = bluez_new_failure_msg(msg, BLUEZ_ESYSTEM_OFFSET + errno);
 		goto failed;
 	}
@@ -1292,7 +1221,7 @@ static DBusMessage* handle_get_devices_req(DBusMessage *msg, void *data)
 			memset(&di, 0 , sizeof(struct hci_dev_info));
 			di.dev_id = dr->dev_id;
 
-			if (!ioctl(sock, HCIGETDEVINFO, (void *) &di)) {
+			if (!ioctl(sock, HCIGETDEVINFO, &di)) {
 				strcpy(aname, di.name);
 				ba2str(&di.bdaddr, aaddr);
 				dbus_message_iter_open_container(&array_iter, DBUS_TYPE_STRUCT, NULL,