A watch to G_IO_HUP is added to remove the file descriptor when the emulator is automatically disconnected when its GAtServer closes. We use a dupped file descriptor because the events aren't delivered to the file descriptor who originated them. --- plugins/hfp_ag_bluez5.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/plugins/hfp_ag_bluez5.c b/plugins/hfp_ag_bluez5.c index bbced26..a0203b1 100644 --- a/plugins/hfp_ag_bluez5.c +++ b/plugins/hfp_ag_bluez5.c @@ -59,12 +59,24 @@ static void connection_destroy(gpointer data) close(fd); } +static gboolean io_hup_cb(GIOChannel *io, GIOCondition cond, gpointer data) +{ + char *device = data; + + DBG("Remove %s", device); + + g_hash_table_remove(connection_hash, device); + + return FALSE; +} + static DBusMessage *profile_new_connection(DBusConnection *conn, DBusMessage *msg, void *data) { DBusMessageIter entry; const char *device; - int fd; + GIOChannel *io; + int fd, fd_dup; struct ofono_emulator *em; struct ofono_modem *modem; @@ -111,6 +123,15 @@ static DBusMessage *profile_new_connection(DBusConnection *conn, ofono_emulator_register(em, fd); + fd_dup = dup(fd); + io = g_io_channel_unix_new(fd_dup); + g_io_add_watch_full(io, G_PRIORITY_DEFAULT, G_IO_HUP, io_hup_cb, + g_strdup(device), g_free); + g_io_channel_unref(io); + + g_hash_table_insert(connection_hash, g_strdup(device), + GINT_TO_POINTER(fd_dup)); + return dbus_message_new_method_return(msg); invalid: -- 1.7.9.5

When a RequestDisconnect() is received, the socket must be closed. This way, the related emulator will be freed. --- plugins/hfp_ag_bluez5.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/plugins/hfp_ag_bluez5.c b/plugins/hfp_ag_bluez5.c index a0203b1..59e84d2 100644 --- a/plugins/hfp_ag_bluez5.c +++ b/plugins/hfp_ag_bluez5.c @@ -162,11 +162,35 @@ static DBusMessage *profile_cancel(DBusConnection *conn, static DBusMessage *profile_disconnection(DBusConnection *conn, DBusMessage *msg, void *user_data) { + DBusMessageIter iter; + const char *device; + gpointer fd; + DBG("Profile handler RequestDisconnection"); - return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE - ".NotImplemented", - "Implementation not provided"); + if (!dbus_message_iter_init(msg, &iter)) + goto invalid; + + if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_OBJECT_PATH) + goto invalid; + + dbus_message_iter_get_basic(&iter, &device); + + DBG("%s", device); + + fd = g_hash_table_lookup(connection_hash, device); + if (fd == NULL) + goto invalid; + + shutdown(GPOINTER_TO_INT(fd), SHUT_RDWR); + + g_hash_table_remove(connection_hash, device); + + return dbus_message_new_method_return(msg); + +invalid: + return g_dbus_create_error(msg, BLUEZ_ERROR_INTERFACE ".Rejected", + "Invalid arguments in method call"); } static const GDBusMethodTable profile_methods[] = { -- 1.7.9.5