2:08 a.m.
From: Mario Tokarz <mario.tokarz(a)bmw-carit.de>
Hi all,
so, this is basically a draft for the missing piece in the dun functionality.
The gprs-context brings up the PPP, while the basic bluetooth communication is
part of the dun_dt plug-in.
Still, I don't have it all straight yet. The code will bring up the modem once,
but closing PPP in the context will also close the IoChannel, which means it
cannot be reopened.
I'm sure the solution is pretty obvious, but I am a bit trapped in the dark,
so any hint on how to best sort the necessary calls would be highly appreciated.
Cheers,
Mario
Mario Tokarz (2):
dunmodem: Add stub for gprs-context.
dun_dt: Add baseline for dun_dt plug-in.
Makefile.am | 6 +-
drivers/dunmodem/dunmodem.c | 2 +
drivers/dunmodem/dunmodem.h | 3 +
drivers/dunmodem/gprs-context.c | 220 +++++++++++++++++++++++
plugins/dun_dt.c | 375 +++++++++++++++++++++++++++++++++++++++
5 files changed, 605 insertions(+), 1 deletions(-)
create mode 100644 drivers/dunmodem/gprs-context.c
create mode 100644 plugins/dun_dt.c
--
1.7.4.1
2:08 a.m.
New subject: [RFC 1/2] dunmodem: Add stub for gprs-context.
From: Mario Tokarz <mario.tokarz(a)bmw-carit.de>
---
Makefile.am | 3 +-
drivers/dunmodem/dunmodem.c | 2 +
drivers/dunmodem/dunmodem.h | 3 +
drivers/dunmodem/gprs-context.c | 220 +++++++++++++++++++++++++++++++++++++++
4 files changed, 227 insertions(+), 1 deletions(-)
create mode 100644 drivers/dunmodem/gprs-context.c
diff --git a/Makefile.am b/Makefile.am
index 9c56711..fbc85d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,7 +249,8 @@ builtin_sources += drivers/atmodem/atutil.h \
drivers/dunmodem/dunmodem.h \
drivers/dunmodem/dunmodem.c \
drivers/dunmodem/network-registration.c \
- drivers/dunmodem/gprs.c
+ drivers/dunmodem/gprs.c \
+ drivers/dunmodem/gprs-context.c
builtin_modules += hfpmodem
builtin_sources += drivers/atmodem/atutil.h \
diff --git a/drivers/dunmodem/dunmodem.c b/drivers/dunmodem/dunmodem.c
index 35a7dbb..5ed307b 100644
--- a/drivers/dunmodem/dunmodem.c
+++ b/drivers/dunmodem/dunmodem.c
@@ -36,6 +36,7 @@ static int dunmodem_init(void)
{
dun_netreg_init();
dun_gprs_init();
+ dun_gprs_context_init();
return 0;
}
@@ -44,6 +45,7 @@ static void dunmodem_exit(void)
{
dun_netreg_exit();
dun_gprs_exit();
+ dun_gprs_context_init();
}
OFONO_PLUGIN_DEFINE(dunmodem, "Dialup modem driver", VERSION,
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
index 4fbd4a5..3bacdad 100644
--- a/drivers/dunmodem/dunmodem.h
+++ b/drivers/dunmodem/dunmodem.h
@@ -26,3 +26,6 @@ extern void dun_netreg_exit(void);
extern void dun_gprs_init(void);
extern void dun_gprs_exit(void);
+
+extern void dun_gprs_context_init(void);
+extern void dun_gprs_context_exit(void);
diff --git a/drivers/dunmodem/gprs-context.c b/drivers/dunmodem/gprs-context.c
new file mode 100644
index 0000000..c5bd182
--- /dev/null
+++ b/drivers/dunmodem/gprs-context.c
@@ -0,0 +1,220 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved.
+ *
+ * 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 <errno.h>
+
+#include <glib.h>
+#include <gatchat.h>
+#include <gatppp.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs-context.h>
+
+#include "dunmodem.h"
+
+#define STATIC_IP_NETMASK "255.255.255.255"
+
+struct gprs_context_data {
+ GAtChat *chat;
+ GAtPPP *ppp;
+ ofono_gprs_context_cb_t cb;
+ void* cb_data;
+};
+
+static void dun_debug(const char *str, void *data)
+{
+ ofono_info("%s: %s", (const char *) data, str);
+}
+
+static void ppp_connect(const char *interface, const char *local,
+ const char *remote,
+ const char *dns1, const char *dns2,
+ gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ const char* dns[3] = {dns1, dns2, 0};
+
+ DBG("gc %p, interface %s, local %s, remote %s, dns1 %s, dns2 %s",
+ gc, interface, local, remote, dns1, dns2);
+
+ ofono_gprs_context_set_interface(gc, interface);
+ ofono_gprs_context_set_ipv4_address(gc, local, TRUE);
+ ofono_gprs_context_set_ipv4_netmask(gc, STATIC_IP_NETMASK);
+ ofono_gprs_context_set_ipv4_dns_servers(gc, dns);
+
+ CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+}
+
+static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+ DBG("");
+
+ g_at_ppp_unref(gcd->ppp);
+ gcd->ppp = NULL;
+
+ g_at_chat_resume(gcd->chat);
+
+ DBG("Io %p", g_at_chat_get_io(gcd->chat));
+
+ CALLBACK_WITH_SUCCESS(gcd->cb, gcd->cb_data);
+}
+
+static gboolean setup_ppp(struct ofono_gprs_context *gc)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ GAtIO *io;
+
+ DBG("");
+
+ io = g_at_chat_get_io(gcd->chat);
+
+ g_at_chat_suspend(gcd->chat);
+
+ gcd->ppp = g_at_ppp_new();
+ if (gcd->ppp == NULL)
+ return FALSE;
+
+ g_at_ppp_set_connect_function(gcd->ppp, ppp_connect, gc);
+ g_at_ppp_set_disconnect_function(gcd->ppp, ppp_disconnect, gc);
+
+ if (TRUE)
+ g_at_ppp_set_debug(gcd->ppp, dun_debug, "DunModem (PPP):");
+
+ g_at_ppp_open(gcd->ppp, io);
+
+ return TRUE;
+}
+
+static void dialup_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+ DBG("");
+
+ if (setup_ppp(gc))
+ return;
+
+ CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
+}
+
+static void dun_gprs_activate_primary(struct ofono_gprs_context *gc,
+ const struct ofono_gprs_primary_context *ctx,
+ ofono_gprs_context_cb_t cb, void *data)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ GAtIO *io = g_at_chat_get_io(gcd->chat);
+
+ DBG("");
+
+ gcd->cb = cb;
+ gcd->cb_data = data;
+
+ DBG("chat %p, Io %p", gcd->chat, io);
+
+ if(g_at_chat_send(gcd->chat, "ATD*99#", NULL,
+ dialup_cb, gc , NULL))
+ return;
+
+ CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
+}
+
+static void dun_gprs_deactivate_primary(struct ofono_gprs_context *gc,
+ unsigned int cid,
+ ofono_gprs_context_cb_t cb,
+ void *data)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+ DBG("");
+
+ gcd->cb = cb;
+ gcd->cb_data = data;
+
+ if (gcd->ppp == NULL)
+ return;
+
+ g_at_ppp_shutdown(gcd->ppp);
+}
+
+static int dun_gprs_context_probe(struct ofono_gprs_context *gc,
+ unsigned int vendor, void *data)
+{
+ GAtChat *chat = data;
+ struct gprs_context_data *gcd;
+
+ DBG("");
+
+ gcd = g_try_new0(struct gprs_context_data, 1);
+ if (gcd == NULL)
+ return -ENOMEM;
+
+ gcd->chat = g_at_chat_clone(chat);
+
+ ofono_gprs_context_set_data(gc, gcd);
+
+ return 0;
+}
+
+static void dun_gprs_context_remove(struct ofono_gprs_context *gc)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+ DBG("%p", gc);
+
+ if (gcd->ppp)
+ g_at_ppp_unref(gcd->ppp);
+
+ g_at_chat_unref(gcd->chat);
+
+ ofono_gprs_context_set_data(gc, NULL);
+
+ g_free(gcd);
+}
+
+static struct ofono_gprs_context_driver driver = {
+ .name = "dunmodem",
+ .probe = dun_gprs_context_probe,
+ .remove = dun_gprs_context_remove,
+ .activate_primary = dun_gprs_activate_primary,
+ .deactivate_primary = dun_gprs_deactivate_primary,
+};
+
+void dun_gprs_context_init(void)
+{
+ ofono_gprs_context_driver_register(&driver);
+}
+
+void dun_gprs_context_exit(void)
+{
+ ofono_gprs_context_driver_unregister(&driver);
+}
--
1.7.4.1
2:08 a.m.
New subject: [RFC 2/2] dun_dt: Add baseline for dun_dt plug-in.
From: Mario Tokarz <mario.tokarz(a)bmw-carit.de>
---
Makefile.am | 3 +
plugins/dun_dt.c | 375 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 378 insertions(+), 0 deletions(-)
create mode 100644 plugins/dun_dt.c
diff --git a/Makefile.am b/Makefile.am
index fbc85d4..778310b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -362,6 +362,9 @@ builtin_sources += plugins/hfp_ag.c plugins/bluetooth.h
builtin_modules += dun_gw
builtin_sources += plugins/dun_gw.c plugins/bluetooth.h
+builtin_modules += dun_dt
+builtin_sources += plugins/dun_dt.c plugins/bluetooth.h
+
builtin_modules += connman
builtin_sources += plugins/connman.c
diff --git a/plugins/dun_dt.c b/plugins/dun_dt.c
new file mode 100644
index 0000000..ce642cf
--- /dev/null
+++ b/plugins/dun_dt.c
@@ -0,0 +1,375 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Gustavo Padovan <gustavo(a)padovan.org>
+ * Copyright (C) 2011 BMW Car IT GmbH. All rights reserved.
+ *
+ * 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 <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <glib.h>
+#include <gatchat.h>
+#include <gattty.h>
+#include <ofono.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs.h>
+
+#include <drivers/dunmodem/dunmodem.h>
+
+#include <ofono/dbus.h>
+
+#include "bluetooth.h"
+
+#define BLUEZ_SERIAL_INTERFACE BLUEZ_SERVICE ".Serial"
+
+#ifndef DBUS_TYPE_UNIX_FD
+#define DBUS_TYPE_UNIX_FD -1
+#endif
+
+static DBusConnection *connection;
+static GHashTable *modem_hash;
+
+struct dun_data {
+ char *dun_path;
+ char *tty;
+ GAtChat *chat;
+};
+
+static void dun_debug(const char *str, void *data)
+{
+ ofono_info("%s: %s", (const char *) data, str);
+}
+
+static int dun_probe(struct ofono_modem *modem)
+{
+ DBG("modem: %p", modem);
+
+ return 0;
+}
+
+static GAtChat* open_chat(struct dun_data *dd)
+{
+ GIOChannel *io;
+ GAtSyntax *syntax;
+ GAtChat *chat;
+
+ DBG("");
+
+ io = g_at_tty_open(dd->tty, NULL);
+ if (io == NULL) {
+ ofono_error("Connection failed: %s (%d)",
+ strerror(errno), errno);
+ return NULL;
+ }
+
+ syntax = g_at_syntax_new_gsm_permissive();
+ chat = g_at_chat_new(io, syntax);
+
+ g_at_syntax_unref(syntax);
+ g_io_channel_unref(io);
+
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(chat, dun_debug, "DunModem:");
+
+ return chat;
+}
+
+static void bt_connect_reply(DBusPendingCall *call, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct dun_data *dd = ofono_modem_get_data(modem);
+ DBusMessage *reply = dbus_pending_call_steal_reply(call);
+ DBusError derr;
+ char *tty;
+ GAtChat *chat;
+
+ DBG("modem: %p", modem);
+
+ dbus_error_init(&derr);
+ if (dbus_set_error_from_message(&derr, reply)) {
+ DBG("Connection to bt serial returned with error: %s, %s",
+ derr.name, derr.message);
+
+ dbus_error_free(&derr);
+ goto done;
+ }
+
+ dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING, &tty,
+ DBUS_TYPE_INVALID);
+
+ DBG("modem: %p, tty %s", modem, tty);
+
+ dd->tty = g_strdup(tty);
+
+ chat = open_chat(dd);
+ if (chat == NULL)
+ goto done;
+
+ dd->chat = chat;
+
+ ofono_modem_set_powered(modem, TRUE);
+
+done:
+ dbus_message_unref(reply);
+}
+
+static int dun_enable(struct ofono_modem *modem)
+{
+ struct dun_data *data = ofono_modem_get_data(modem);
+ char *profile = "dun";
+
+ DBG("modem: %p", modem);
+
+ bluetooth_send_with_reply(data->dun_path,
+ BLUEZ_SERIAL_INTERFACE, "Connect",
+ bt_connect_reply, modem,
+ NULL, DBUS_TIMEOUT,
+ DBUS_TYPE_STRING, &profile,
+ DBUS_TYPE_INVALID);
+
+ return -EINPROGRESS;
+}
+
+static void bt_disconnect_reply(DBusPendingCall *call, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct dun_data *dd = ofono_modem_get_data(modem);
+
+ ofono_modem_set_powered(modem, FALSE);
+
+ g_free(dd->tty);
+ dd->tty = NULL;
+}
+
+static int dun_disable(struct ofono_modem *modem)
+{
+ struct dun_data *data = ofono_modem_get_data(modem);
+
+ DBG("modem: %p", modem);
+
+ bluetooth_send_with_reply(data->dun_path,
+ BLUEZ_SERIAL_INTERFACE, "Disconnect",
+ bt_disconnect_reply, modem,
+ NULL, DBUS_TIMEOUT,
+ DBUS_TYPE_STRING, &data->tty,
+ DBUS_TYPE_INVALID);
+
+ return -EINPROGRESS;
+}
+
+static void dun_set_online(struct ofono_modem *modem, ofono_bool_t online,
+ ofono_modem_online_cb_t cb, void *data) {
+ DBG("modem: %p, online: %d", modem, online);
+
+ CALLBACK_WITH_SUCCESS(cb, data);
+}
+
+static void dun_pre_sim(struct ofono_modem *modem)
+{
+ DBG("modem: %p", modem);
+}
+
+static void dun_post_online(struct ofono_modem *modem)
+{
+ DBG("modem: %p", modem);
+}
+
+static void dun_post_sim(struct ofono_modem *modem)
+{
+ struct dun_data *dd = ofono_modem_get_data(modem);
+ struct ofono_gprs *gprs;
+ struct ofono_gprs_context *gc;
+
+
+ DBG("%p, %s", modem, dd->tty);
+
+ ofono_netreg_create(modem, 0, "dunmodem", dd->chat);
+
+ gprs = ofono_gprs_create(modem, 0, "dunmodem", dd->chat);
+
+ ofono_gprs_set_cid_range(gprs, 1, 1);
+
+ gc = ofono_gprs_context_create(modem, 0, "dunmodem", dd->chat);
+
+ if (gprs && gc)
+ ofono_gprs_add_context(gprs, gc);
+}
+
+static struct ofono_modem_driver dun_driver = {
+ .name = "dun_dt",
+ .probe = dun_probe,
+ .enable = dun_enable,
+ .disable = dun_disable,
+ .set_online = dun_set_online,
+ .pre_sim = dun_pre_sim,
+ .post_sim = dun_post_sim,
+ .post_online = dun_post_online
+};
+
+static int dun_bt_probe(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];
+
+ DBG("");
+
+ /* 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_dt");
+ if (modem == NULL) {
+ DBG("Failed to create modem");
+ return -ENOMEM;
+ }
+
+ DBG("modem: %p", modem);
+
+ data = g_try_new0(struct dun_data, 1);
+ if (data == NULL)
+ goto free;
+
+ data->dun_path = g_strdup(device);
+ if (data->dun_path == NULL)
+ goto free;
+
+ ofono_modem_set_data(modem, data);
+
+ ofono_modem_register(modem);
+
+ g_hash_table_insert(modem_hash, g_strdup(device), modem);
+ return 0;
+
+free:
+ g_free(data->dun_path);
+ data->dun_path = NULL;
+ g_free(data);
+ ofono_modem_remove(modem);
+
+ return -ENOMEM;
+}
+
+static gboolean dun_bt_remove_modem(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct ofono_modem *modem = value;
+ const char *device = key;
+ const char *prefix = user_data;
+
+ DBG("");
+
+ if (prefix && g_str_has_prefix(device, prefix) == FALSE)
+ return FALSE;
+
+ ofono_modem_remove(modem);
+
+ return TRUE;
+}
+
+static void dun_bt_remove(const char *prefix)
+{
+ DBG("%s", prefix);
+
+ if (modem_hash == NULL)
+ return;
+
+ g_hash_table_foreach_remove(modem_hash, dun_bt_remove_modem,
+ (gpointer) prefix);
+}
+
+static void dun_bt_set_alias(const char *device, const char *alias)
+{
+ struct ofono_modem *modem;
+
+ DBG("");
+
+ if (device == NULL || alias == NULL)
+ return;
+
+ modem = g_hash_table_lookup(modem_hash, device);
+ if (modem == NULL)
+ return;
+
+ ofono_modem_set_name(modem, alias);
+}
+
+static struct bluetooth_profile dun_profile = {
+ .name = "dun_dt",
+ .probe = dun_bt_probe,
+ .remove = dun_bt_remove,
+ .set_alias = dun_bt_set_alias,
+};
+
+static int dun_init(void)
+{
+ int err;
+
+ DBG("");
+
+ 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(void)
+{
+ DBG("");
+
+ bluetooth_unregister_uuid(DUN_GW_UUID);
+ ofono_modem_driver_unregister(&dun_driver);
+
+ g_hash_table_destroy(modem_hash);
+}
+
+OFONO_PLUGIN_DEFINE(dun_dt, "Dial-up Networking Data Terminal Profile
Plugins",
+ VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT,
+ dun_init, dun_exit)
--
1.7.4.1
4063
days inactive
4063
days old
2 comments
1 participants
participants (1)
-
mario＠tokarz.eu