This patch moves the SCO socket handling from hfp_hf_bluez5 plugin to
handsfree-audio.c file.
This is the initial step to be able to support sending the file
descriptor through the Agent NewConnection method.
---
plugins/hfp_hf_bluez5.c | 102 +----------------------------------------------
src/handsfree-audio.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 103 insertions(+), 102 deletions(-)
diff --git a/plugins/hfp_hf_bluez5.c b/plugins/hfp_hf_bluez5.c
index dea0f34..ea2c848 100644
--- a/plugins/hfp_hf_bluez5.c
+++ b/plugins/hfp_hf_bluez5.c
@@ -67,8 +67,6 @@ struct hfp {
};
static GDBusClient *bluez = NULL;
-static guint sco_watch = 0;
-static uint16_t local_hfp_version = HFP_VERSION_1_6;
static void hfp_debug(const char *str, void *user_data)
{
@@ -482,100 +480,11 @@ static const GDBusMethodTable profile_methods[] = {
{ }
};
-static ofono_bool_t slc_match(struct ofono_modem *modem, void *userdata)
-{
- const char *remote = userdata;
- const char *value = ofono_modem_get_string(modem, "Remote");
-
- if (value == NULL)
- return FALSE;
-
- /* Make sure SLC has been established */
- if (ofono_modem_get_powered(modem) != TRUE)
- return FALSE;
-
- return g_str_equal(remote, value);
-}
-
-static gboolean sco_accept(GIOChannel *io, GIOCondition cond,
- gpointer user_data)
-{
- struct sockaddr_sco saddr;
- socklen_t alen;
- int sk, nsk;
- char remote[18];
-
- if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
- return FALSE;
-
- sk = g_io_channel_unix_get_fd(io);
-
- memset(&saddr, 0, sizeof(saddr));
- alen = sizeof(saddr);
-
- nsk = accept(sk, (struct sockaddr *) &saddr, &alen);
- if (nsk < 0)
- return TRUE;
-
- bt_ba2str(&saddr.sco_bdaddr, remote);
-
- if (ofono_modem_find(slc_match, remote) == NULL) {
- ofono_error("Rejecting SCO: No SLC connection found!");
- close(nsk);
- return TRUE;
- }
-
- return TRUE;
-}
-
-static int sco_init(void)
-{
- GIOChannel *sco_io;
- struct sockaddr_sco saddr;
- int sk, defer_setup = 1;
-
- sk = socket(PF_BLUETOOTH, SOCK_SEQPACKET | O_NONBLOCK | SOCK_CLOEXEC,
- BTPROTO_SCO);
- if (sk < 0)
- return -errno;
-
- /* Bind to local address */
- memset(&saddr, 0, sizeof(saddr));
- saddr.sco_family = AF_BLUETOOTH;
- bt_bacpy(&saddr.sco_bdaddr, BDADDR_ANY);
-
- if (bind(sk, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
- close(sk);
- return -errno;
- }
-
- if (setsockopt(sk, SOL_BLUETOOTH, BT_DEFER_SETUP,
- &defer_setup, sizeof(defer_setup)) < 0) {
- ofono_warn("Can't enable deferred setup: %s (%d)",
- strerror(errno), errno);
- local_hfp_version = HFP_VERSION_1_5;
- }
-
- if (listen(sk, 5) < 0) {
- close(sk);
- return -errno;
- }
-
- sco_io = g_io_channel_unix_new(sk);
- sco_watch = g_io_add_watch(sco_io,
- G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
- sco_accept, NULL);
-
- g_io_channel_unref(sco_io);
-
- return 0;
-}
-
static void connect_handler(DBusConnection *conn, void *user_data)
{
DBG("Registering External Profile handler ...");
- bt_register_profile(conn, HFP_HS_UUID, local_hfp_version, "hfp_hf",
+ bt_register_profile(conn, HFP_HS_UUID, HFP_VERSION_1_5, "hfp_hf",
HFP_EXT_PROFILE_PATH);
}
@@ -695,12 +604,6 @@ static int hfp_init(void)
if (DBUS_TYPE_UNIX_FD < 0)
return -EBADF;
- err = sco_init();
- if (err < 0) {
- ofono_error("SCO: %s(%d)", strerror(-err), -err);
- return err;
- }
-
/* Registers External Profile handler */
if (!g_dbus_register_interface(conn, HFP_EXT_PROFILE_PATH,
BLUEZ_PROFILE_INTERFACE,
@@ -742,9 +645,6 @@ static void hfp_exit(void)
BLUEZ_PROFILE_INTERFACE);
ofono_modem_driver_unregister(&hfp_driver);
g_dbus_client_unref(bluez);
-
- if (sco_watch > 0)
- g_source_remove(sco_watch);
}
OFONO_PLUGIN_DEFINE(hfp_bluez5, "External Hands-Free Profile Plugin", VERSION,
diff --git a/src/handsfree-audio.c b/src/handsfree-audio.c
index b2d4b97..14488ac 100644
--- a/src/handsfree-audio.c
+++ b/src/handsfree-audio.c
@@ -25,12 +25,19 @@
#include <errno.h>
#include <stdio.h>
+#include <stdint.h>
#include <string.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/socket.h>
#include <gdbus.h>
+#include <gatchat.h>
+#include <drivers/hfpmodem/slc.h>
#include <ofono/handsfree-audio.h>
+#include "bluetooth.h"
#include "ofono.h"
#define HFP_AUDIO_MANAGER_INTERFACE OFONO_SERVICE ".HandsfreeAudioManager"
@@ -60,6 +67,97 @@ struct agent {
static struct agent *agent = NULL;
static int ref_count = 0;
static GSList *card_list = 0;
+static guint sco_watch = 0;
+static uint16_t local_hfp_version = HFP_VERSION_1_6;
+
+static ofono_bool_t slc_match(struct ofono_modem *modem, void *userdata)
+{
+ const char *remote = userdata;
+ const char *value = ofono_modem_get_string(modem, "Remote");
+
+ if (value == NULL)
+ return FALSE;
+
+ /* Make sure SLC has been established */
+ if (ofono_modem_get_powered(modem) != TRUE)
+ return FALSE;
+
+ return g_str_equal(remote, value);
+}
+
+static gboolean sco_accept(GIOChannel *io, GIOCondition cond,
+ gpointer user_data)
+{
+ struct sockaddr_sco saddr;
+ socklen_t alen;
+ int sk, nsk;
+ char remote[18];
+
+ if (cond & (G_IO_ERR | G_IO_HUP | G_IO_NVAL))
+ return FALSE;
+
+ sk = g_io_channel_unix_get_fd(io);
+
+ memset(&saddr, 0, sizeof(saddr));
+ alen = sizeof(saddr);
+
+ nsk = accept(sk, (struct sockaddr *) &saddr, &alen);
+ if (nsk < 0)
+ return TRUE;
+
+ bt_ba2str(&saddr.sco_bdaddr, remote);
+
+ if (ofono_modem_find(slc_match, remote) == NULL) {
+ ofono_error("Rejecting SCO: No SLC connection found!");
+ close(nsk);
+ return TRUE;
+ }
+
+ return TRUE;
+}
+
+static int sco_init(void)
+{
+ GIOChannel *sco_io;
+ struct sockaddr_sco saddr;
+ int sk, defer_setup = 1;
+
+ sk = socket(PF_BLUETOOTH, SOCK_SEQPACKET | O_NONBLOCK | SOCK_CLOEXEC,
+ BTPROTO_SCO);
+ if (sk < 0)
+ return -errno;
+
+ /* Bind to local address */
+ memset(&saddr, 0, sizeof(saddr));
+ saddr.sco_family = AF_BLUETOOTH;
+ bt_bacpy(&saddr.sco_bdaddr, BDADDR_ANY);
+
+ if (bind(sk, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
+ close(sk);
+ return -errno;
+ }
+
+ if (setsockopt(sk, SOL_BLUETOOTH, BT_DEFER_SETUP,
+ &defer_setup, sizeof(defer_setup)) < 0) {
+ ofono_warn("Can't enable deferred setup: %s (%d)",
+ strerror(errno), errno);
+ local_hfp_version = HFP_VERSION_1_5;
+ }
+
+ if (listen(sk, 5) < 0) {
+ close(sk);
+ return -errno;
+ }
+
+ sco_io = g_io_channel_unix_new(sk);
+ sco_watch = g_io_add_watch(sco_io,
+ G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+ sco_accept, NULL);
+
+ g_io_channel_unref(sco_io);
+
+ return 0;
+}
static void card_append_properties(struct ofono_handsfree_card *card,
DBusMessageIter *dict)
@@ -430,7 +528,7 @@ void ofono_handsfree_audio_unref(void)
int __ofono_handsfree_audio_manager_init(void)
{
- return 0;
+ return sco_init();
}
void __ofono_handsfree_audio_manager_cleanup(void)
@@ -443,4 +541,7 @@ void __ofono_handsfree_audio_manager_cleanup(void)
ref_count = 1;
ofono_handsfree_audio_unref();
+
+ if (sco_watch > 0)
+ g_source_remove(sco_watch);
}
--
1.7.11.7
_______________________________________________
ofono mailing list
[email protected]
http://lists.ofono.org/listinfo/ofono
