[PATCH 2/2] Bluetooth DUN modem prototype
Gustavo F. Padovan
gustavo at padovan.org
Thu May 6 02:17:08 PDT 2010
Add a still dummy DUN code, now it can only creates and removes modems.
The DUN plugin follows the HFP one a lot, the is basics a copy of some
HFP plugin's parts.
---
Makefile.am | 6 +
drivers/dunmodem/dunmodem.c | 51 ++++++++++
drivers/dunmodem/dunmodem.h | 29 ++++++
drivers/hfpmodem/hfpmodem.h | 4 +-
include/bluetooth.h | 1 +
plugins/dun.c | 214 +++++++++++++++++++++++++++++++++++++++++++
plugins/hfp.c | 25 +-----
src/bluetooth.c | 27 ++++++
8 files changed, 331 insertions(+), 26 deletions(-)
create mode 100644 drivers/dunmodem/dunmodem.c
create mode 100644 drivers/dunmodem/dunmodem.h
create mode 100644 plugins/dun.c
diff --git a/Makefile.am b/Makefile.am
index 501f4bd..2b109e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,6 +172,9 @@ builtin_sources += drivers/atmodem/atutil.h \
drivers/hfpmodem/network-registration.c \
drivers/hfpmodem/call-volume.c
+builtin_modules += dunmodem
+builtin_sources += drivers/dunmodem/dunmodem.h drivers/dunmodem/dunmodem.c
+
builtin_modules += mbmmodem
builtin_sources += drivers/atmodem/atutil.h \
drivers/mbmmodem/mbmmodem.h \
@@ -233,6 +236,9 @@ builtin_sources += plugins/novatel.c
builtin_modules += hfp
builtin_sources += plugins/hfp.c
+builtin_modules += dun
+builtin_sources += plugins/dun.c
+
builtin_modules += palmpre
builtin_sources += plugins/palmpre.c
diff --git a/drivers/dunmodem/dunmodem.c b/drivers/dunmodem/dunmodem.c
new file mode 100644
index 0000000..8658bee
--- /dev/null
+++ b/drivers/dunmodem/dunmodem.c
@@ -0,0 +1,51 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo at padovan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <glib.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+
+#include "dunmodem.h"
+
+static int dunmodem_init(void)
+{
+ return 0;
+}
+
+static void dunmodem_exit(void)
+{
+}
+
+OFONO_PLUGIN_DEFINE(dunmodem, "Dial-up Networking Driver", VERSION,
+ OFONO_PLUGIN_PRIORITY_DEFAULT, dunmodem_init, dunmodem_exit)
+
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
new file mode 100644
index 0000000..6bbf7b9
--- /dev/null
+++ b/drivers/dunmodem/dunmodem.h
@@ -0,0 +1,29 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo at padovan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+#ifndef __DUN_MODEM_H__
+#define __DUN_MODEM_H__
+
+struct dun_data {
+ char *dun_path;
+};
+
+#endif
+
diff --git a/drivers/hfpmodem/hfpmodem.h b/drivers/hfpmodem/hfpmodem.h
index c95ea3f..381d05a 100644
--- a/drivers/hfpmodem/hfpmodem.h
+++ b/drivers/hfpmodem/hfpmodem.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
-#ifndef __BLUETOOTH_H__
-#define __BLUETOOTH_H__
+#ifndef __HFPMODEM_H__
+#define __HFPMODEM_H__
#include <drivers/atmodem/atutil.h>
#include <ofono/dbus.h>
diff --git a/include/bluetooth.h b/include/bluetooth.h
index db3663e..0a6edca 100644
--- a/include/bluetooth.h
+++ b/include/bluetooth.h
@@ -44,5 +44,6 @@ struct bluetooth_profile {
int bluetooth_register_uuid(const char *uuid, struct bluetooth_profile *profile);
void bluetooth_unregister_uuid(const char *uuid);
+void bluetooth_create_path(const char *dev_addr, const char *adapter_addr, char *buf, int size);
#endif /* __BLUETOOTH_H */
diff --git a/plugins/dun.c b/plugins/dun.c
new file mode 100644
index 0000000..0ee31fb
--- /dev/null
+++ b/plugins/dun.c
@@ -0,0 +1,214 @@
+/*
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo at padovan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <glib.h>
+#include <ofono.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+
+#include <drivers/dunmodem/dunmodem.h>
+
+#include <ofono/dbus.h>
+
+#include <ofono/bluetooth.h>
+
+#ifndef DBUS_TYPE_UNIX_FD
+#define DBUS_TYPE_UNIX_FD -1
+#endif
+
+static DBusConnection *connection;
+static GHashTable *modem_hash = NULL;
+
+static int dun_create_modem(const char *device, const char *dev_addr,
+ const char *adapter_addr, const char *alias)
+{
+ struct ofono_modem *modem;
+ struct dun_data *data;
+ char buf[256];
+
+ /* We already have this device in our hash, ignore */
+ if (g_hash_table_lookup(modem_hash, device) != NULL)
+ return -EALREADY;
+
+ ofono_info("Using device: %s, devaddr: %s, adapter: %s",
+ device, dev_addr, adapter_addr);
+
+ strcpy(buf, "dun/");
+ bluetooth_create_path(dev_addr, adapter_addr, buf + 4, sizeof(buf) - 4);
+
+ modem = ofono_modem_create(buf, "dun");
+ if (modem == NULL)
+ return -ENOMEM;
+
+ data = g_try_new0(struct dun_data, 1);
+ if (!data)
+ goto free;
+
+ data->dun_path = g_strdup(device);
+ if (data->dun_path == NULL)
+ goto free;
+
+ ofono_modem_set_data(modem, data);
+ ofono_modem_set_name(modem, alias);
+ ofono_modem_register(modem);
+
+ g_hash_table_insert(modem_hash, g_strdup(device), modem);
+ return 0;
+
+free:
+ g_free(data);
+ ofono_modem_remove(modem);
+
+ return -ENOMEM;
+}
+
+static gboolean dun_remove_each_modem(gpointer key, gpointer value, gpointer user_data)
+{
+ struct ofono_modem *modem = value;
+
+ ofono_modem_remove(modem);
+
+ return TRUE;
+}
+
+static void dun_remove_all_modem()
+{
+ if (modem_hash == NULL)
+ return;
+
+ g_hash_table_foreach_remove(modem_hash, dun_remove_each_modem, NULL);
+}
+
+static void dun_set_alias(const char *device, const char *alias)
+{
+ struct ofono_modem *modem;
+
+ if (!device || !alias)
+ return;
+
+ modem = g_hash_table_lookup(modem_hash, device);
+ if (!modem)
+ return;
+
+ ofono_modem_set_name(modem, alias);
+}
+
+static int dun_probe(struct ofono_modem *modem)
+{
+ DBG("%p", modem);
+ return 0;
+}
+
+static void dun_remove(struct ofono_modem *modem)
+{
+ struct dun_data *data = ofono_modem_get_data(modem);
+
+ g_hash_table_remove(modem_hash, data->dun_path);
+
+ g_free(data->dun_path);
+ g_free(data);
+
+ ofono_modem_set_data(modem, NULL);
+}
+
+static int dun_enable(struct ofono_modem *modem)
+{
+ DBG("%p", modem);
+ return 0;
+}
+
+static int dun_disable(struct ofono_modem *modem)
+{
+ DBG("%p", modem);
+ return 0;
+}
+
+static void dun_pre_sim(struct ofono_modem *modem)
+{
+ DBG("%p", modem);
+}
+
+static void dun_post_sim(struct ofono_modem *modem)
+{
+ DBG("%p", modem);
+}
+
+static struct ofono_modem_driver dun_driver = {
+ .name = "dun",
+ .probe = dun_probe,
+ .remove = dun_remove,
+ .enable = dun_enable,
+ .disable = dun_disable,
+ .pre_sim = dun_pre_sim,
+ .post_sim = dun_post_sim,
+};
+
+static struct bluetooth_profile dun_profile = {
+ .name = "dun",
+ .create = dun_create_modem,
+ .remove_all = dun_remove_all_modem,
+ .set_alias = dun_set_alias,
+};
+
+static int dun_init()
+{
+ int err;
+
+ if (DBUS_TYPE_UNIX_FD < 0)
+ return -EBADF;
+
+ connection = ofono_dbus_get_connection();
+
+ err = ofono_modem_driver_register(&dun_driver);
+ if (err < 0)
+ return err;
+
+ err = bluetooth_register_uuid(DUN_GW_UUID, &dun_profile);
+ if (err < 0) {
+ ofono_modem_driver_unregister(&dun_driver);
+ return err;
+ }
+
+ modem_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+ g_free, NULL);
+
+ return 0;
+}
+
+static void dun_exit()
+{
+ bluetooth_unregister_uuid(DUN_GW_UUID);
+ ofono_modem_driver_unregister(&dun_driver);
+
+ g_hash_table_destroy(modem_hash);
+}
+
+OFONO_PLUGIN_DEFINE(dun, "Dial-up Networking Profile Plugins", VERSION,
+ OFONO_PLUGIN_PRIORITY_DEFAULT, dun_init, dun_exit)
diff --git a/plugins/hfp.c b/plugins/hfp.c
index d669b84..407232c 100644
--- a/plugins/hfp.c
+++ b/plugins/hfp.c
@@ -448,29 +448,6 @@ static GDBusMethodTable agent_methods[] = {
{ NULL, NULL, NULL, NULL }
};
-static void create_path(const char *dev_addr, const char *adapter_addr,
- char *buf, int size)
-{
- int i, j;
-
- for (i = 0, j = 0; adapter_addr[j] && i < size - 1; j++)
- if (adapter_addr[j] >= '0' && adapter_addr[j] <= '9')
- buf[i++] = adapter_addr[j];
- else if (adapter_addr[j] >= 'A' && adapter_addr[j] <= 'F')
- buf[i++] = adapter_addr[j];
-
- if (i < size - 1)
- buf[i++] = '_';
-
- for (j = 0; dev_addr[j] && i < size - 1; j++)
- if (dev_addr[j] >= '0' && dev_addr[j] <= '9')
- buf[i++] = dev_addr[j];
- else if (dev_addr[j] >= 'A' && dev_addr[j] <= 'F')
- buf[i++] = dev_addr[j];
-
- buf[i] = '\0';
-}
-
static int hfp_create_modem(const char *device, const char *dev_addr,
const char *adapter_addr, const char *alias)
{
@@ -486,7 +463,7 @@ static int hfp_create_modem(const char *device, const char *dev_addr,
device, dev_addr, adapter_addr);
strcpy(buf, "hfp/");
- create_path(dev_addr, adapter_addr, buf + 4, sizeof(buf) - 4);
+ bluetooth_create_path(dev_addr, adapter_addr, buf + 4, sizeof(buf) - 4);
modem = ofono_modem_create(buf, "hfp");
if (modem == NULL)
diff --git a/src/bluetooth.c b/src/bluetooth.c
index 256ef4f..ce6c80b 100644
--- a/src/bluetooth.c
+++ b/src/bluetooth.c
@@ -41,6 +41,28 @@ static GHashTable *adapter_address_hash = NULL;
static int refcnt = 0;
+void bluetooth_create_path(const char *dev_addr, const char *adapter_addr, char *buf, int size)
+{
+ int i, j;
+
+ for (i = 0, j = 0; adapter_addr[j] && i < size - 1; j++)
+ if (adapter_addr[j] >= '0' && adapter_addr[j] <= '9')
+ buf[i++] = adapter_addr[j];
+ else if (adapter_addr[j] >= 'A' && adapter_addr[j] <= 'F')
+ buf[i++] = adapter_addr[j];
+
+ if (i < size - 1)
+ buf[i++] = '_';
+
+ for (j = 0; dev_addr[j] && i < size - 1; j++)
+ if (dev_addr[j] >= '0' && dev_addr[j] <= '9')
+ buf[i++] = dev_addr[j];
+ else if (dev_addr[j] >= 'A' && dev_addr[j] <= 'F')
+ buf[i++] = dev_addr[j];
+
+ buf[i] = '\0';
+}
+
static int send_method_call_with_reply(const char *dest, const char *path,
const char *interface, const char *method,
DBusPendingCallNotifyFunction cb,
@@ -254,6 +276,11 @@ static void device_properties_cb(DBusPendingCall *call, gpointer user_data)
profile->create(path, device_addr, adapter_addr, alias);
}
+ if ((have_uuid & DUN_GW) && device_addr && adapter_addr) {
+ profile = g_hash_table_lookup(uuid_hash, DUN_GW_UUID);
+ profile->create(path, device_addr, adapter_addr, alias);
+ }
+
done:
dbus_message_unref(reply);
}
--
1.7.0.4
More information about the ofono
mailing list