3:42 p.m.
Hi All,
Here follows my current implementation for the Bluetooth Dial-up Profile
in oFono. It is still partially working, it is stopping at some point in
the PPP negotiation. I haven't found time to debug this lately so I'm
posting all the code I have here then others can look, make comments,
help the development, etc.
To run it just enable the dunmodem and them activate the context. The
log from my ofnod stops in the PPP phase 1:
ofonod[1548]: src/gprs.c:gprs_attach_callback() /dun/001A6BF7A10E_000AD97C7140 error = 0
ofonod[1548]: src/gprs.c:registration_status_cb() /dun/001A6BF7A10E_000AD97C7140 error 0
status 1
ofonod[1548]: src/gprs.c:ofono_gprs_status_notify() /dun/001A6BF7A10E_000AD97C7140 status
1
ofonod[1548]: > AT+CGDCONT=2,"IP",""\r
ofonod[1548]: < AT+CGDCONT=2,"IP",""\r
ofonod[1548]: < \r\nOK\r\n
ofonod[1548]: > AT+CGDATA="PPP",2\r
ofonod[1548]: < AT+CGDATA="PPP",2\r
ofonod[1548]: < \r\nCONNECT\r\n
Entering new phase: 1
Gustavo F. Padovan (8):
Bluetooth DUN modem prototype
Add dun_enable() function
Add dun_disable() to power down the modem
dun: Add GAtChat for the rfcomm device
dun: add network registration atom
Add gprs-context to DUN
gprs: Prevent crash due to a NULL pid_map
Add gprs drivers for dunmodem
Makefile.am | 9 +
drivers/dunmodem/dunmodem.c | 56 +++++
drivers/dunmodem/dunmodem.h | 36 +++
drivers/dunmodem/gprs.c | 110 +++++++++
drivers/dunmodem/network-registration.c | 91 ++++++++
plugins/bluetooth.c | 11 +
plugins/bluetooth.h | 3 +
plugins/dun.c | 379 +++++++++++++++++++++++++++++++
src/gprs.c | 8 +-
9 files changed, 699 insertions(+), 4 deletions(-)
create mode 100644 drivers/dunmodem/dunmodem.c
create mode 100644 drivers/dunmodem/dunmodem.h
create mode 100644 drivers/dunmodem/gprs.c
create mode 100644 drivers/dunmodem/network-registration.c
create mode 100644 plugins/dun.c
--
1.7.3
3:42 p.m.
New subject: [PATCH 1/8] Bluetooth DUN modem prototype
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 | 50 +++++++++++
drivers/dunmodem/dunmodem.h | 24 +++++
plugins/bluetooth.c | 11 +++
plugins/bluetooth.h | 2 +
plugins/dun.c | 203 +++++++++++++++++++++++++++++++++++++++++++
6 files changed, 296 insertions(+), 0 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 05082de..7fcde7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,6 +196,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 \
@@ -272,6 +275,9 @@ builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
builtin_modules += hfp
builtin_sources += plugins/hfp.c plugins/bluetooth.h
+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..5657668
--- /dev/null
+++ b/drivers/dunmodem/dunmodem.c
@@ -0,0 +1,50 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo(a)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/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..291e2ce
--- /dev/null
+++ b/drivers/dunmodem/dunmodem.h
@@ -0,0 +1,24 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo(a)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
+ *
+ */
+
+struct dun_data {
+ char *dun_path;
+};
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 8e79b2e..b8eddb1 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -219,6 +219,9 @@ static void has_uuid(DBusMessageIter *array, gpointer user_data)
if (!strcasecmp(uuid, HFP_AG_UUID))
*profiles |= HFP_AG;
+ if (!strcasecmp(uuid, DUN_GW_UUID))
+ *profiles |= DUN_GW;
+
dbus_message_iter_next(&value);
}
}
@@ -277,6 +280,14 @@ 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);
+ if (!profile || !profile->create)
+ goto done;
+
+ profile->create(path, device_addr, adapter_addr, alias);
+ }
+
done:
dbus_message_unref(reply);
}
diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
index f187529..7cf45f0 100644
--- a/plugins/bluetooth.h
+++ b/plugins/bluetooth.h
@@ -27,9 +27,11 @@
#define DBUS_TIMEOUT 15
#define HFP_AG_UUID "0000111F-0000-1000-8000-00805F9B34FB"
+#define DUN_GW_UUID "00001103-0000-1000-8000-00805F9B34FB"
/* Profiles bitfield */
#define HFP_AG 0x01
+#define DUN_GW 0x02
struct bluetooth_profile {
const char *name;
diff --git a/plugins/dun.c b/plugins/dun.c
new file mode 100644
index 0000000..1e9f972
--- /dev/null
+++ b/plugins/dun.c
@@ -0,0 +1,203 @@
+/*
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo(a)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 "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 struct ofono_modem_driver dun_driver = {
+ .name = "dun",
+ .probe = dun_probe,
+ .remove = dun_remove,
+ .enable = dun_enable,
+ .disable = dun_disable,
+};
+
+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)
--
1.7.3
3:42 p.m.
New subject: [PATCH 2/8] Add dun_enable() function
dun_enable() is called by setting the Powered property to true.
It creates a rfcomm link throught the BlueZ Serial API.
---
drivers/dunmodem/dunmodem.h | 1 +
plugins/bluetooth.h | 1 +
plugins/dun.c | 62 +++++++++++++++++++++++++++++++++++++++++-
3 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
index 291e2ce..6d545c9 100644
--- a/drivers/dunmodem/dunmodem.h
+++ b/drivers/dunmodem/dunmodem.h
@@ -21,4 +21,5 @@
struct dun_data {
char *dun_path;
+ char *rfcomm;
};
diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
index 7cf45f0..1c8103a 100644
--- a/plugins/bluetooth.h
+++ b/plugins/bluetooth.h
@@ -23,6 +23,7 @@
#define BLUEZ_MANAGER_INTERFACE BLUEZ_SERVICE ".Manager"
#define BLUEZ_ADAPTER_INTERFACE BLUEZ_SERVICE ".Adapter"
#define BLUEZ_DEVICE_INTERFACE BLUEZ_SERVICE ".Device"
+#define BLUEZ_SERIAL_INTERFACE BLUEZ_SERVICE ".Serial"
#define DBUS_TIMEOUT 15
diff --git a/plugins/dun.c b/plugins/dun.c
index 1e9f972..60d0271 100644
--- a/plugins/dun.c
+++ b/plugins/dun.c
@@ -25,6 +25,7 @@
#include <stdio.h>
#include <string.h>
#include <errno.h>
+#include <gdbus.h>
#include <glib.h>
#include <ofono.h>
@@ -139,10 +140,67 @@ static void dun_remove(struct ofono_modem *modem)
ofono_modem_set_data(modem, NULL);
}
+static void dun_connect_reply(DBusPendingCall *call, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct dun_data *data = ofono_modem_get_data(modem);
+ const char *dev;
+ DBusError derr;
+ DBusMessage *reply, *msg;
+
+ reply = dbus_pending_call_steal_reply(call);
+
+ if (ofono_modem_get_powered(modem))
+ goto done;
+
+ if (!dbus_message_get_args(reply, NULL, DBUS_TYPE_STRING, &dev,
+ DBUS_TYPE_INVALID))
+ goto done;
+
+ data->rfcomm = g_strdup(dev);
+
+ dbus_error_init(&derr);
+ if (!dbus_set_error_from_message(&derr, reply)) {
+ ofono_modem_set_powered(modem, TRUE);
+ goto done;
+ }
+
+ DBG("Connect reply: %s", derr.message);
+
+ if (dbus_error_has_name(&derr, DBUS_ERROR_NO_REPLY)) {
+ msg = dbus_message_new_method_call(BLUEZ_SERVICE,
+ data->dun_path,
+ BLUEZ_SERIAL_INTERFACE, "Disconnect");
+ if (!msg)
+ ofono_error("Disconnect failed");
+ else
+ g_dbus_send_message(connection, msg);
+ }
+
+ ofono_modem_set_powered(modem, FALSE);
+
+ dbus_error_free(&derr);
+
+done:
+ dbus_message_unref(reply);
+}
+
static int dun_enable(struct ofono_modem *modem)
{
- DBG("%p", modem);
- return 0;
+ struct dun_data *data = ofono_modem_get_data(modem);
+ int status;
+ const char *uuid = DUN_GW_UUID;
+
+ status = bluetooth_send_with_reply(data->dun_path,
+ BLUEZ_SERIAL_INTERFACE, "Connect",
+ dun_connect_reply, modem, NULL,
+ DBUS_TIMEOUT, DBUS_TYPE_STRING, &uuid,
+ DBUS_TYPE_INVALID);
+
+ if (status < 0)
+ return -EINVAL;
+
+ return -EINPROGRESS;
}
static int dun_disable(struct ofono_modem *modem)
--
1.7.3
3:42 p.m.
New subject: [PATCH 3/8] Add dun_disable() to power down the modem
When setting Powered to 0 the link rfcomm is disconnected.
---
plugins/dun.c | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/plugins/dun.c b/plugins/dun.c
index 60d0271..3d1e5c4 100644
--- a/plugins/dun.c
+++ b/plugins/dun.c
@@ -203,10 +203,48 @@ static int dun_enable(struct ofono_modem *modem)
return -EINPROGRESS;
}
+static void dun_power_down(DBusPendingCall *call, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct dun_data *data = ofono_modem_get_data(modem);
+ DBusMessage *reply;
+ DBusError derr;
+
+ reply = dbus_pending_call_steal_reply(call);
+
+ dbus_error_init(&derr);
+ if (dbus_set_error_from_message(&derr, reply)) {
+ DBG("Disconnect reply: %s", derr.message);
+ dbus_error_free(&derr);
+ goto done;
+ }
+
+ ofono_modem_set_powered(modem, FALSE);
+
+done:
+ g_free(data->rfcomm);
+
+ dbus_message_unref(reply);
+}
+
static int dun_disable(struct ofono_modem *modem)
{
- DBG("%p", modem);
- return 0;
+ struct dun_data *data = ofono_modem_get_data(modem);
+ int status;
+
+ if (!ofono_modem_get_powered(modem))
+ return 0;
+
+ status = bluetooth_send_with_reply(data->dun_path,
+ BLUEZ_SERIAL_INTERFACE, "Disconnect",
+ dun_power_down, modem, NULL, DBUS_TIMEOUT,
+ DBUS_TYPE_STRING, &data->rfcomm,
+ DBUS_TYPE_INVALID);
+
+ if (status < 0)
+ return -EINVAL;
+
+ return -EINPROGRESS;
}
static struct ofono_modem_driver dun_driver = {
--
1.7.3
3:42 p.m.
New subject: [PATCH 4/8] dun: Add GAtChat for the rfcomm device
---
drivers/dunmodem/dunmodem.c | 1 +
drivers/dunmodem/dunmodem.h | 1 +
plugins/dun.c | 56 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/drivers/dunmodem/dunmodem.c b/drivers/dunmodem/dunmodem.c
index 5657668..1020dd2 100644
--- a/drivers/dunmodem/dunmodem.c
+++ b/drivers/dunmodem/dunmodem.c
@@ -30,6 +30,7 @@
#include <errno.h>
#include <glib.h>
+#include <gatchat.h>
#define OFONO_API_SUBJECT_TO_CHANGE
#include <ofono/plugin.h>
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
index 6d545c9..f7351b7 100644
--- a/drivers/dunmodem/dunmodem.h
+++ b/drivers/dunmodem/dunmodem.h
@@ -22,4 +22,5 @@
struct dun_data {
char *dun_path;
char *rfcomm;
+ GAtChat *chat;
};
diff --git a/plugins/dun.c b/plugins/dun.c
index 3d1e5c4..488e7a3 100644
--- a/plugins/dun.c
+++ b/plugins/dun.c
@@ -23,11 +23,14 @@
#include <config.h>
#endif
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <gdbus.h>
#include <glib.h>
#include <ofono.h>
+#include <gatchat.h>
+#include <gattty.h>
#define OFONO_API_SUBJECT_TO_CHANGE
#include <ofono/plugin.h>
@@ -47,6 +50,48 @@
static DBusConnection *connection;
static GHashTable *modem_hash = NULL;
+static void dun_debug(const char *str, void *user_data)
+{
+ ofono_info("%s", str);
+}
+
+static GAtChat *create_port(const char *device)
+{
+ GAtSyntax *syntax;
+ GIOChannel *channel;
+ GAtChat *chat;
+
+ channel = g_at_tty_open(device, NULL);
+ if (!channel)
+ return NULL;
+
+ syntax = g_at_syntax_new_gsm_permissive();
+ chat = g_at_chat_new(channel, syntax);
+ g_at_syntax_unref(syntax);
+ g_io_channel_unref(channel);
+
+ if (!chat)
+ return NULL;
+
+ return chat;
+}
+
+static GAtChat *open_device(const char *device, char *debug)
+{
+ GAtChat *chat;
+
+ DBG("%s", device);
+
+ chat = create_port(device);
+ if (chat == NULL)
+ return NULL;
+
+ if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(chat, dun_debug, debug);
+
+ return chat;
+}
+
static int dun_create_modem(const char *device, const char *dev_addr,
const char *adapter_addr, const char *alias)
{
@@ -159,6 +204,10 @@ static void dun_connect_reply(DBusPendingCall *call, gpointer
user_data)
data->rfcomm = g_strdup(dev);
+ data->chat = open_device(dev, "Modem:");
+ if (data->chat == NULL)
+ goto done;
+
dbus_error_init(&derr);
if (!dbus_set_error_from_message(&derr, reply)) {
ofono_modem_set_powered(modem, TRUE);
@@ -235,6 +284,13 @@ static int dun_disable(struct ofono_modem *modem)
if (!ofono_modem_get_powered(modem))
return 0;
+ if (data->chat) {
+ g_at_chat_cancel_all(data->chat);
+ g_at_chat_unregister_all(data->chat);
+ g_at_chat_unref(data->chat);
+ data->chat = NULL;
+ }
+
status = bluetooth_send_with_reply(data->dun_path,
BLUEZ_SERIAL_INTERFACE, "Disconnect",
dun_power_down, modem, NULL, DBUS_TIMEOUT,
--
1.7.3
3:42 p.m.
New subject: [PATCH 5/8] dun: add network registration atom
---
Makefile.am | 4 +-
drivers/dunmodem/dunmodem.c | 3 +
drivers/dunmodem/dunmodem.h | 3 +
drivers/dunmodem/network-registration.c | 91 +++++++++++++++++++++++++++++++
plugins/dun.c | 10 ++++
5 files changed, 110 insertions(+), 1 deletions(-)
create mode 100644 drivers/dunmodem/network-registration.c
diff --git a/Makefile.am b/Makefile.am
index 7fcde7f..344fda6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,7 +197,9 @@ builtin_sources += drivers/atmodem/atutil.h \
drivers/hfpmodem/call-volume.c
builtin_modules += dunmodem
-builtin_sources += drivers/dunmodem/dunmodem.h drivers/dunmodem/dunmodem.c
+builtin_sources += drivers/dunmodem/dunmodem.h \
+ drivers/dunmodem/dunmodem.c \
+ drivers/dunmodem/network-registration.c
builtin_modules += mbmmodem
builtin_sources += drivers/atmodem/atutil.h \
diff --git a/drivers/dunmodem/dunmodem.c b/drivers/dunmodem/dunmodem.c
index 1020dd2..565b40e 100644
--- a/drivers/dunmodem/dunmodem.c
+++ b/drivers/dunmodem/dunmodem.c
@@ -40,11 +40,14 @@
static int dunmodem_init(void)
{
+ dun_netreg_init();
+
return 0;
}
static void dunmodem_exit(void)
{
+ dun_netreg_exit();
}
OFONO_PLUGIN_DEFINE(dunmodem, "Dial-up Networking Driver", VERSION,
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
index f7351b7..f4c54dc 100644
--- a/drivers/dunmodem/dunmodem.h
+++ b/drivers/dunmodem/dunmodem.h
@@ -24,3 +24,6 @@ struct dun_data {
char *rfcomm;
GAtChat *chat;
};
+
+void dun_netreg_init();
+void dun_netreg_exit();
diff --git a/drivers/dunmodem/network-registration.c
b/drivers/dunmodem/network-registration.c
new file mode 100644
index 0000000..901aa41
--- /dev/null
+++ b/drivers/dunmodem/network-registration.c
@@ -0,0 +1,91 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2009 ProFUSION embedded systems. 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 <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib.h>
+
+#include <ofono/modem.h>
+#include <ofono/netreg.h>
+
+#include "gatchat.h"
+#include "common.h"
+
+#include "dunmodem.h"
+
+
+static void dun_registration_status(struct ofono_netreg *netreg,
+ ofono_netreg_status_cb_t cb,
+ void *data)
+{
+ struct ofono_error error;
+
+ error.type = OFONO_ERROR_TYPE_NO_ERROR;
+
+ cb(&error, NETWORK_REGISTRATION_STATUS_REGISTERED,
+ -1, -1, -1, data);
+}
+
+static gboolean dun_netreg_register(gpointer user_data)
+{
+ struct ofono_netreg *netreg = user_data;
+
+ ofono_netreg_register(netreg);
+
+ return FALSE;
+}
+
+static int dun_netreg_probe(struct ofono_netreg *netreg, unsigned int vendor,
+ void *user_data)
+{
+ g_idle_add(dun_netreg_register, netreg);
+
+ return 0;
+}
+
+static void dun_netreg_remove(struct ofono_netreg *netreg)
+{
+}
+
+static struct ofono_netreg_driver driver = {
+ .name = "dunmodem",
+ .probe = dun_netreg_probe,
+ .remove = dun_netreg_remove,
+ .registration_status = dun_registration_status,
+};
+
+void dun_netreg_init()
+{
+ ofono_netreg_driver_register(&driver);
+}
+
+void dun_netreg_exit()
+{
+ ofono_netreg_driver_unregister(&driver);
+}
diff --git a/plugins/dun.c b/plugins/dun.c
index 488e7a3..7e0b768 100644
--- a/plugins/dun.c
+++ b/plugins/dun.c
@@ -303,12 +303,22 @@ static int dun_disable(struct ofono_modem *modem)
return -EINPROGRESS;
}
+static void dun_pre_sim(struct ofono_modem *modem)
+{
+ struct dun_data *data = ofono_modem_get_data(modem);
+
+ DBG("%p", modem);
+
+ ofono_netreg_create(modem, 0, "dunmodem", data);
+}
+
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,
};
static struct bluetooth_profile dun_profile = {
--
1.7.3
3:42 p.m.
New subject: [PATCH 6/8] Add gprs-context to DUN
---
drivers/dunmodem/dunmodem.h | 3 +++
plugins/dun.c | 8 ++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
index f4c54dc..3af1fec 100644
--- a/drivers/dunmodem/dunmodem.h
+++ b/drivers/dunmodem/dunmodem.h
@@ -19,10 +19,13 @@
*
*/
+#include <drivers/atmodem/atutil.h>
+
struct dun_data {
char *dun_path;
char *rfcomm;
GAtChat *chat;
+ struct ofono_gprs_context *gc;
};
void dun_netreg_init();
diff --git a/plugins/dun.c b/plugins/dun.c
index 7e0b768..dff0d4c 100644
--- a/plugins/dun.c
+++ b/plugins/dun.c
@@ -312,6 +312,13 @@ static void dun_pre_sim(struct ofono_modem *modem)
ofono_netreg_create(modem, 0, "dunmodem", data);
}
+static void dun_post_sim(struct ofono_modem *modem)
+{
+ struct dun_data *data = ofono_modem_get_data(modem);
+
+ data->gc = ofono_gprs_context_create(modem, 0, "atmodem", data->chat);
+}
+
static struct ofono_modem_driver dun_driver = {
.name = "dun",
.probe = dun_probe,
@@ -319,6 +326,7 @@ static struct ofono_modem_driver dun_driver = {
.enable = dun_enable,
.disable = dun_disable,
.pre_sim = dun_pre_sim,
+ .post_sim = dun_post_sim,
};
static struct bluetooth_profile dun_profile = {
--
1.7.3
3:43 p.m.
New subject: [PATCH 7/8] gprs: Prevent crash due to a NULL pid_map
gprs_drv->probe() may use pid_map, so we set it before call probe()
---
src/gprs.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/gprs.c b/src/gprs.c
index 0f6fb0c..76a4d5f 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -2221,6 +2221,10 @@ struct ofono_gprs *ofono_gprs_create(struct ofono_modem *modem,
gprs->atom = __ofono_modem_add_atom(modem, OFONO_ATOM_TYPE_GPRS,
gprs_remove, gprs);
+ gprs->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+ gprs->netreg_status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
+ gprs->pid_map = idmap_new(MAX_CONTEXTS);
+
for (l = g_drivers; l; l = l->next) {
const struct ofono_gprs_driver *drv = l->data;
@@ -2234,10 +2238,6 @@ struct ofono_gprs *ofono_gprs_create(struct ofono_modem *modem,
break;
}
- gprs->status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
- gprs->netreg_status = NETWORK_REGISTRATION_STATUS_UNKNOWN;
- gprs->pid_map = idmap_new(MAX_CONTEXTS);
-
return gprs;
}
--
1.7.3
3:43 p.m.
New subject: [PATCH 8/8] Add gprs drivers for dunmodem
---
Makefile.am | 3 +-
drivers/dunmodem/dunmodem.c | 2 +
drivers/dunmodem/dunmodem.h | 4 ++
drivers/dunmodem/gprs.c | 110 +++++++++++++++++++++++++++++++++++++++++++
plugins/dun.c | 6 ++
5 files changed, 124 insertions(+), 1 deletions(-)
create mode 100644 drivers/dunmodem/gprs.c
diff --git a/Makefile.am b/Makefile.am
index 344fda6..4dd0da0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -199,7 +199,8 @@ builtin_sources += drivers/atmodem/atutil.h \
builtin_modules += dunmodem
builtin_sources += drivers/dunmodem/dunmodem.h \
drivers/dunmodem/dunmodem.c \
- drivers/dunmodem/network-registration.c
+ drivers/dunmodem/network-registration.c \
+ drivers/dunmodem/gprs.c
builtin_modules += mbmmodem
builtin_sources += drivers/atmodem/atutil.h \
diff --git a/drivers/dunmodem/dunmodem.c b/drivers/dunmodem/dunmodem.c
index 565b40e..3f118f4 100644
--- a/drivers/dunmodem/dunmodem.c
+++ b/drivers/dunmodem/dunmodem.c
@@ -41,6 +41,7 @@
static int dunmodem_init(void)
{
dun_netreg_init();
+ dun_gprs_init();
return 0;
}
@@ -48,6 +49,7 @@ static int dunmodem_init(void)
static void dunmodem_exit(void)
{
dun_netreg_exit();
+ dun_gprs_exit();
}
OFONO_PLUGIN_DEFINE(dunmodem, "Dial-up Networking Driver", VERSION,
diff --git a/drivers/dunmodem/dunmodem.h b/drivers/dunmodem/dunmodem.h
index 3af1fec..690cc13 100644
--- a/drivers/dunmodem/dunmodem.h
+++ b/drivers/dunmodem/dunmodem.h
@@ -26,7 +26,11 @@ struct dun_data {
char *rfcomm;
GAtChat *chat;
struct ofono_gprs_context *gc;
+ struct ofono_gprs *gprs;
};
void dun_netreg_init();
void dun_netreg_exit();
+
+void dun_gprs_init();
+void dun_gprs_exit();
diff --git a/drivers/dunmodem/gprs.c b/drivers/dunmodem/gprs.c
new file mode 100644
index 0000000..24be251
--- /dev/null
+++ b/drivers/dunmodem/gprs.c
@@ -0,0 +1,110 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2010 Gustavo F. Padovan <gustavo(a)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 <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/gprs.h>
+
+#include "gatchat.h"
+
+#include "dunmodem.h"
+
+struct gprs_data {
+ GAtChat *chat;
+ unsigned int vendor;
+};
+
+static void dun_gprs_registration_status(struct ofono_gprs *gprs,
+ ofono_gprs_status_cb_t cb,
+ void *data)
+{
+ struct ofono_error error;
+
+ error.type = OFONO_ERROR_TYPE_NO_ERROR;
+ cb(&error, 1, data);
+}
+
+static void dun_gprs_set_attached(struct ofono_gprs *gprs, int attached,
+ ofono_gprs_cb_t cb, void *data)
+{
+ struct ofono_error error;
+
+ error.type = OFONO_ERROR_TYPE_NO_ERROR;
+ cb(&error, data);
+}
+
+static int dun_gprs_probe(struct ofono_gprs *gprs,
+ unsigned int vendor, void *data)
+{
+ GAtChat *chat = data;
+ struct gprs_data *gd;
+
+ gd = g_new0(struct gprs_data, 1);
+ gd->chat = g_at_chat_clone(chat);
+
+ ofono_gprs_set_data(gprs, gd);
+
+ ofono_gprs_set_cid_range(gprs, 2, 2);
+
+ ofono_gprs_register(gprs);
+
+ return 0;
+}
+
+static void dun_gprs_remove(struct ofono_gprs *gprs)
+{
+ struct gprs_data *gd = ofono_gprs_get_data(gprs);
+
+ ofono_gprs_set_data(gprs, NULL);
+
+ g_at_chat_unref(gd->chat);
+ g_free(gd);
+}
+
+static struct ofono_gprs_driver driver = {
+ .name = "dunmodem",
+ .probe = dun_gprs_probe,
+ .remove = dun_gprs_remove,
+ .set_attached = dun_gprs_set_attached,
+ .attached_status = dun_gprs_registration_status,
+};
+
+void dun_gprs_init()
+{
+ ofono_gprs_driver_register(&driver);
+}
+
+void dun_gprs_exit()
+{
+ ofono_gprs_driver_unregister(&driver);
+}
diff --git a/plugins/dun.c b/plugins/dun.c
index dff0d4c..766f924 100644
--- a/plugins/dun.c
+++ b/plugins/dun.c
@@ -316,7 +316,13 @@ static void dun_post_sim(struct ofono_modem *modem)
{
struct dun_data *data = ofono_modem_get_data(modem);
+ DBG("%p", modem);
+
+ data->gprs = ofono_gprs_create(modem, 0, "dunmodem", data->chat);
data->gc = ofono_gprs_context_create(modem, 0, "atmodem", data->chat);
+
+ if (data->gprs && data->gc)
+ ofono_gprs_add_context(data->gprs, data->gc);
}
static struct ofono_modem_driver dun_driver = {
--
1.7.3
4331
days inactive
4331
days old
8 comments
1 participants
participants (1)
-
Gustavo F. Padovan