[PATCH -v3 1/7] bluetooth: Add bluetooth server support

[PATCH -v3 1/7] bluetooth: Add bluetooth server support

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 10253 bytes --]

From: Frédéric Danis <frederic.danis@linux.intel.com>

---
 Makefile.am         |    1 +
 plugins/bluetooth.c |  247 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 plugins/bluetooth.h |    9 ++
 3 files changed, 254 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 758fb10..e402de4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -321,6 +321,7 @@ builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
 builtin_modules += hfp
 builtin_sources += plugins/hfp.c plugins/bluetooth.h
 
+builtin_sources += $(btio_sources)
 builtin_cflags += @BLUEZ_CFLAGS@
 builtin_libadd += @BLUEZ_LIBS@
 endif
diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index 13f3b3b..d17e056 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -35,12 +35,30 @@
 
 #include <ofono/dbus.h>
 
+#include <btio.h>
 #include "bluetooth.h"
 
 static DBusConnection *connection;
 static GHashTable *uuid_hash = NULL;
 static GHashTable *adapter_address_hash = NULL;
 static gint bluetooth_refcount;
+static GSList *server_list = NULL;
+
+struct server {
+	guint8 channel;
+	char *sdp_record;
+	GIOChannel *io;
+	GHashTable *adapter_hash;
+	ConnectFunc connect_cb;
+	gpointer user_data;
+	GSList *client_list;
+};
+
+struct cb_data {
+	struct server *server;
+	char *path;
+	guint source;
+};
 
 void bluetooth_create_path(const char *dev_addr, const char *adapter_addr,
 				char *buf, int size)
@@ -417,6 +435,166 @@ static void get_adapter_properties(const char *path, const char *handle,
 			g_strdup(path), g_free, -1, DBUS_TYPE_INVALID);
 }
 
+static void remove_record(char *path, guint handle, struct server *server)
+{
+	DBusMessage *msg;
+
+	msg = dbus_message_new_method_call(BLUEZ_SERVICE, path,
+					BLUEZ_SERVICE_INTERFACE,
+					"RemoveRecord");
+	if (msg == NULL) {
+		ofono_error("Unable to allocate D-Bus RemoveRecord message");
+		return;
+	}
+
+	dbus_message_append_args(msg, DBUS_TYPE_UINT32, &handle,
+					DBUS_TYPE_INVALID);
+	g_dbus_send_message(connection, msg);
+
+	ofono_info("Unregistered handle for %s, channel %d: 0x%x", path,
+			server->channel, handle);
+}
+
+static void server_stop(struct server *server)
+{
+	/* Remove all client sources related to server */
+	while (server->client_list) {
+		g_source_remove(GPOINTER_TO_UINT(server->client_list->data));
+		server->client_list = g_slist_remove(server->client_list,
+						server->client_list->data);
+	}
+
+	g_hash_table_foreach_remove(server->adapter_hash,
+					(GHRFunc) remove_record, server);
+
+	if (server->io != NULL) {
+		g_io_channel_shutdown(server->io, TRUE, NULL);
+		g_io_channel_unref(server->io);
+		server->io = NULL;
+	}
+}
+
+static void cb_data_destroy(gpointer data)
+{
+	struct cb_data *cb_data = data;
+
+	if (cb_data->path != NULL)
+		g_free(cb_data->path);
+	g_free(cb_data);
+}
+
+static gboolean client_event(GIOChannel *chan, GIOCondition cond, gpointer data)
+{
+	struct cb_data *cb_data = data;
+	struct server *server = cb_data->server;
+
+	server->client_list = g_slist_remove(server->client_list,
+					GUINT_TO_POINTER(cb_data->source));
+
+	cb_data_destroy(cb_data);
+
+	return FALSE;
+}
+
+static void new_connection(GIOChannel *io, gpointer user_data)
+{
+	struct server *server = user_data;
+	struct cb_data *client_data;
+	GError *err = NULL;
+	char laddress[18], raddress[18];
+	guint8 channel;
+
+	bt_io_get(io, BT_IO_RFCOMM, &err, BT_IO_OPT_SOURCE, laddress,
+					BT_IO_OPT_DEST, raddress,
+					BT_IO_OPT_CHANNEL, &channel,
+					BT_IO_OPT_INVALID);
+	if (err) {
+		ofono_error("%s", err->message);
+		g_error_free(err);
+		return;
+	}
+
+	ofono_info("New connection for %s on channel %u from: %s,", laddress,
+							channel, raddress);
+
+	if (!bt_io_accept(io, server->connect_cb, server->user_data,
+						NULL, &err)) {
+		ofono_error("%s", err->message);
+		g_error_free(err);
+		g_io_channel_unref(io);
+		return;
+	}
+
+	client_data = g_try_new0(struct cb_data, 1);
+	if (client_data == NULL) {
+		ofono_error("Unable to allocate client cb_data structure");
+		return;
+	}
+
+	client_data->server = server;
+	client_data->source = g_io_add_watch(io,
+					G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+					client_event, client_data);
+	server->client_list = g_slist_prepend(server->client_list,
+					GUINT_TO_POINTER(client_data->source));
+}
+
+static void add_record_cb(DBusPendingCall *call, gpointer user_data)
+{
+	struct cb_data *cb_data = user_data;
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	DBusError derr;
+	guint32 handle;
+
+	dbus_error_init(&derr);
+
+	if (dbus_set_error_from_message(&derr, reply)) {
+		ofono_error("Replied with an error: %s, %s",
+					derr.name, derr.message);
+		dbus_error_free(&derr);
+		g_free(cb_data->path);
+		goto done;
+	}
+
+	dbus_message_get_args(reply, NULL, DBUS_TYPE_UINT32, &handle,
+					DBUS_TYPE_INVALID);
+
+	g_hash_table_insert(cb_data->server->adapter_hash, cb_data->path,
+				GUINT_TO_POINTER(handle));
+
+	ofono_info("Registered handle for %s, channel %d: 0x%x", cb_data->path,
+			cb_data->server->channel, handle);
+
+done:
+	/* Do not free cb_data->path, it is used in adapter_hash */
+	g_free(cb_data);
+	dbus_message_unref(reply);
+}
+
+static void add_record(gpointer data, gpointer user_data)
+{
+	struct server *server = data;
+	const char *path = user_data;
+	struct cb_data *cb_data;
+
+	if (server->sdp_record == NULL)
+		return;
+
+	cb_data = g_try_new0(struct cb_data, 1);
+	if (cb_data == NULL) {
+		ofono_error("Unable to allocate cb_data structure");
+		return;
+	}
+
+	cb_data->server = server;
+	cb_data->path = g_strdup(path);
+
+	bluetooth_send_with_reply(path, BLUEZ_SERVICE_INTERFACE, "AddRecord",
+				add_record_cb, cb_data, NULL, -1,
+				DBUS_TYPE_STRING, &server->sdp_record,
+				DBUS_TYPE_INVALID);
+}
+
 static gboolean adapter_added(DBusConnection *connection, DBusMessage *message,
 				void *user_data)
 {
@@ -430,6 +608,8 @@ static gboolean adapter_added(DBusConnection *connection, DBusMessage *message,
 			"GetProperties", adapter_properties_cb, g_strdup(path),
 			g_free, -1, DBUS_TYPE_INVALID);
 
+	g_slist_foreach(server_list, add_record,(gpointer) path);
+
 	return TRUE;
 }
 
@@ -437,11 +617,19 @@ static gboolean adapter_removed(DBusConnection *connection,
 				DBusMessage *message, void *user_data)
 {
 	const char *path;
+	GSList *l;
 
 	if (dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &path,
 				DBUS_TYPE_INVALID) == TRUE)
 		g_hash_table_remove(adapter_address_hash, path);
 
+	for (l = server_list; l; l = l->next) {
+		struct server *server = l->data;
+
+		/* Handle have already been removed, so removing related path */
+		g_hash_table_remove(server->adapter_hash, path);
+	}
+
 	return TRUE;
 }
 
@@ -468,6 +656,8 @@ static void parse_adapters(DBusMessageIter *array, gpointer user_data)
 				"GetProperties", adapter_properties_cb,
 				g_strdup(path), g_free, -1, DBUS_TYPE_INVALID);
 
+		g_slist_foreach(server_list, add_record, (gpointer) path);
+
 		dbus_message_iter_next(&value);
 	}
 }
@@ -583,9 +773,6 @@ int bluetooth_register_uuid(const char *uuid, struct bluetooth_profile *profile)
 {
 	bluetooth_ref();
 
-	if (bluetooth_refcount == 0)
-		return -EIO;
-
 	g_hash_table_insert(uuid_hash, g_strdup(uuid), profile);
 
 	g_hash_table_foreach(adapter_address_hash,
@@ -601,5 +788,59 @@ void bluetooth_unregister_uuid(const char *uuid)
 	bluetooth_unref();
 }
 
+struct server *bluetooth_register_server(guint8 channel, const char *sdp_record,
+					ConnectFunc cb, gpointer user_data)
+{
+	struct server *server;
+	GError *err;
+	GHashTableIter iter;
+	gpointer key, value;
+
+	server = g_try_new0(struct server, 1);
+	if (!server)
+		return NULL;
+
+
+	server->channel = channel;
+	server->io = bt_io_listen(BT_IO_RFCOMM, NULL, new_connection,
+					server, NULL, &err,
+					BT_IO_OPT_CHANNEL, server->channel,
+					BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
+					BT_IO_OPT_INVALID);
+	if (server->io == NULL) {
+		g_error_free(err);
+		g_free(server);
+		return NULL;
+	}
+
+	bluetooth_ref();
+
+	if (sdp_record != NULL)
+		server->sdp_record = g_strdup(sdp_record);
+	server->connect_cb = cb;
+	server->user_data = user_data;
+	server->adapter_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+						g_free, NULL);
+
+	g_hash_table_iter_init(&iter, adapter_address_hash);
+	while (g_hash_table_iter_next(&iter, &key, &value))
+		add_record(server, key);
+
+	server_list = g_slist_prepend(server_list, server);
+
+	return server;
+}
+
+void bluetooth_unregister_server(struct server *server)
+{
+	server_list = g_slist_remove(server_list, server);
+	server_stop(server);
+	g_hash_table_destroy(server->adapter_hash);
+	g_free(server->sdp_record);
+	g_free(server);
+
+	bluetooth_unref();
+}
+
 OFONO_PLUGIN_DEFINE(bluetooth, "Bluetooth Utils Plugins", VERSION,
 			OFONO_PLUGIN_PRIORITY_DEFAULT, NULL, NULL)
diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
index 42b0d13..505d908 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_SERVICE_INTERFACE		BLUEZ_SERVICE ".Service"
 
 #define DBUS_TIMEOUT 15
 
@@ -39,10 +40,18 @@ struct bluetooth_profile {
 	void (*set_alias)(const char *device, const char *);
 };
 
+struct server;
+
+typedef void (*ConnectFunc)(GIOChannel *io, GError *err, gpointer user_data);
+
 int bluetooth_register_uuid(const char *uuid,
 				struct bluetooth_profile *profile);
 void bluetooth_unregister_uuid(const char *uuid);
 
+struct server *bluetooth_register_server(guint8 channel, const char *sdp_record,
+					ConnectFunc cb, gpointer user_data);
+void bluetooth_unregister_server(struct server *server);
+
 void bluetooth_create_path(const char *dev_addr, const char *adapter_addr,
 							char *buf, int size);
 
-- 
1.7.4

[PATCH -v3 2/7] bluetooth: Add Bluetooth service authorization support

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 5252 bytes --]

From: Frédéric Danis <frederic.danis@linux.intel.com>

---
 plugins/bluetooth.c |  125 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 115 insertions(+), 10 deletions(-)

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index d17e056..7edf4a7 100644
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -44,6 +44,8 @@ static GHashTable *adapter_address_hash = NULL;
 static gint bluetooth_refcount;
 static GSList *server_list = NULL;
 
+#define TIMEOUT 60 /* Timeout for user response (seconds) */
+
 struct server {
 	guint8 channel;
 	char *sdp_record;
@@ -58,6 +60,8 @@ struct cb_data {
 	struct server *server;
 	char *path;
 	guint source;
+	GIOChannel *io;
+	gboolean pending_auth;
 };
 
 void bluetooth_create_path(const char *dev_addr, const char *adapter_addr,
@@ -483,26 +487,104 @@ static void cb_data_destroy(gpointer data)
 	g_free(cb_data);
 }
 
+static void cancel_authorization(struct cb_data *user_data)
+{
+	DBusMessage *msg;
+
+	if (user_data->path == NULL)
+		return;
+
+	msg = dbus_message_new_method_call(BLUEZ_SERVICE, user_data->path,
+						BLUEZ_SERVICE_INTERFACE,
+						"CancelAuthorization");
+
+	if (msg == NULL) {
+		ofono_error("Unable to allocate D-Bus CancelAuthorization"
+				" message");
+		return;
+	}
+
+	g_dbus_send_message(connection, msg);
+}
+
 static gboolean client_event(GIOChannel *chan, GIOCondition cond, gpointer data)
 {
 	struct cb_data *cb_data = data;
 	struct server *server = cb_data->server;
 
+	if (cb_data->pending_auth == TRUE) {
+		cancel_authorization(cb_data);
+
+		cb_data->pending_auth = FALSE;
+	} else {
+
+		server->client_list = g_slist_remove(server->client_list,
+					GUINT_TO_POINTER(cb_data->source));
+		cb_data_destroy(cb_data);
+	}
+
+	return FALSE;
+}
+
+static void auth_cb(DBusPendingCall *call, gpointer user_data)
+{
+	struct cb_data *cb_data = user_data;
+	struct server *server = cb_data->server;
+	DBusMessage *reply = dbus_pending_call_steal_reply(call);
+	DBusError derr;
+	GError *err = NULL;
+
+	dbus_error_init(&derr);
+
+	cb_data->pending_auth = FALSE;
+
+	if (dbus_set_error_from_message(&derr, reply)) {
+		ofono_error("RequestAuthorization error: %s, %s",
+				derr.name, derr.message);
+
+		if (dbus_error_has_name(&derr, DBUS_ERROR_NO_REPLY))
+			cancel_authorization(cb_data);
+
+		dbus_error_free(&derr);
+
+		dbus_message_unref(reply);
+
+		goto failed;
+	}
+
+	dbus_message_unref(reply);
+
+	ofono_info("RequestAuthorization succeeded");
+
+	if (!bt_io_accept(cb_data->io, server->connect_cb, server->user_data,
+						NULL, &err)) {
+		ofono_error("%s", err->message);
+		g_error_free(err);
+		goto failed;
+	}
+
+	return;
+
+failed:
+	g_source_remove(cb_data->source);
 	server->client_list = g_slist_remove(server->client_list,
 					GUINT_TO_POINTER(cb_data->source));
 
 	cb_data_destroy(cb_data);
-
-	return FALSE;
 }
 
 static void new_connection(GIOChannel *io, gpointer user_data)
 {
 	struct server *server = user_data;
 	struct cb_data *client_data;
+	guint handle;
+	const char *addr;
+	int ret;
 	GError *err = NULL;
 	char laddress[18], raddress[18];
 	guint8 channel;
+	GHashTableIter iter;
+	gpointer key, value;
 
 	bt_io_get(io, BT_IO_RFCOMM, &err, BT_IO_OPT_SOURCE, laddress,
 					BT_IO_OPT_DEST, raddress,
@@ -517,14 +599,6 @@ static void new_connection(GIOChannel *io, gpointer user_data)
 	ofono_info("New connection for %s on channel %u from: %s,", laddress,
 							channel, raddress);
 
-	if (!bt_io_accept(io, server->connect_cb, server->user_data,
-						NULL, &err)) {
-		ofono_error("%s", err->message);
-		g_error_free(err);
-		g_io_channel_unref(io);
-		return;
-	}
-
 	client_data = g_try_new0(struct cb_data, 1);
 	if (client_data == NULL) {
 		ofono_error("Unable to allocate client cb_data structure");
@@ -532,11 +606,42 @@ static void new_connection(GIOChannel *io, gpointer user_data)
 	}
 
 	client_data->server = server;
+
+	g_hash_table_iter_init(&iter, adapter_address_hash);
+
+	while (g_hash_table_iter_next(&iter, &key, &value)) {
+		if (g_strcmp0(laddress, value) == 0) {
+			client_data->path = g_strdup(key);
+			DBG("adapter path : %s", client_data->path);
+			break;
+		}
+	}
+
+	client_data->io = io;
+
+	handle = GPOINTER_TO_UINT(g_hash_table_lookup(server->adapter_hash,
+						client_data->path));
+	addr = raddress;
+	ret = bluetooth_send_with_reply(client_data->path,
+					BLUEZ_SERVICE_INTERFACE,
+					"RequestAuthorization",
+					auth_cb, client_data, NULL, TIMEOUT,
+					DBUS_TYPE_STRING, &addr,
+					DBUS_TYPE_UINT32, &handle,
+					DBUS_TYPE_INVALID);
+	if (ret < 0) {
+		ofono_error("Request Bluetooth authorization failed");
+		return;
+	}
+
+	ofono_info("RequestAuthorization(%s, 0x%x)", raddress, handle);
+
 	client_data->source = g_io_add_watch(io,
 					G_IO_HUP | G_IO_ERR | G_IO_NVAL,
 					client_event, client_data);
 	server->client_list = g_slist_prepend(server->client_list,
 					GUINT_TO_POINTER(client_data->source));
+	client_data->pending_auth = TRUE;
 }
 
 static void add_record_cb(DBusPendingCall *call, gpointer user_data)
-- 
1.7.4

[PATCH -v3 3/7] include: add public headed to emulator atom

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 2102 bytes --]

---
 include/emulator.h |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 insertions(+), 0 deletions(-)
 create mode 100644 include/emulator.h

diff --git a/include/emulator.h b/include/emulator.h
new file mode 100644
index 0000000..1287b47
--- /dev/null
+++ b/include/emulator.h
@@ -0,0 +1,55 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2010  Intel Corporation. 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
+ *
+ */
+
+#ifndef __OFONO_EMULATOR_H
+#define __OFONO_EMULATOR_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <ofono/types.h>
+
+struct ofono_emulator;
+
+struct ofono_emulator_driver {
+	const char *name;
+	enum ofono_atom_type type;
+	int (*probe)(struct ofono_emulator *emulator,
+			struct ofono_modem *modem);
+	void (*remove)();
+};
+
+int ofono_emulator_enable(struct ofono_emulator *emulator, int fd);
+void ofono_emulator_disable(struct ofono_emulator *emulator);
+void ofono_emulator_remove(struct ofono_emulator *emulator);
+struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
+					struct ofono_emulator_driver *driver);
+
+int ofono_emulator_driver_register(const struct ofono_emulator_driver *driver);
+void ofono_emulator_driver_unregister(
+				const struct ofono_emulator_driver *driver);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __OFONO_EMULATOR_H */
-- 
1.7.4

[PATCH -v3 4/7] emulator: Add emulator atom in oFono

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 6924 bytes --]

Create emulator atom when modem state changes to online. The emulator
driver probes each driver to create specific emulator like DUN, HFP AG,
etc. Once get client connection request, create GAtServer to talk AT
commands with client side.

Based on a patch from Zhenhua Zhang <zhenhua.zhang@intel.com>
---
 Makefile.am        |    5 +-
 include/emulator.h |    6 +-
 src/emulator.c     |  173 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/ofono.h        |    5 ++
 4 files changed, 183 insertions(+), 6 deletions(-)
 create mode 100644 src/emulator.c

diff --git a/Makefile.am b/Makefile.am
index e402de4..047a85f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,7 @@ pkginclude_HEADERS = include/log.h include/plugin.h include/history.h \
 			include/audio-settings.h include/nettime.h \
 			include/ctm.h include/cdma-voicecall.h \
 			include/cdma-sms.h include/sim-auth.h \
-			include/gprs-provision.h
+			include/gprs-provision.h include/emulator.h
 
 nodist_pkginclude_HEADERS = include/version.h
 
@@ -363,7 +363,8 @@ src_ofonod_SOURCES = $(gdbus_sources) $(builtin_sources) src/ofono.ver \
 			src/simfs.c src/simfs.h src/audio-settings.c \
 			src/smsagent.c src/smsagent.h src/ctm.c \
 			src/cdma-voicecall.c src/sim-auth.c \
-			src/message.h src/message.c src/gprs-provision.c
+			src/message.h src/message.c src/gprs-provision.c \
+			src/emulator.c
 
 src_ofonod_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ @CAPNG_LIBS@ -ldl
 
diff --git a/include/emulator.h b/include/emulator.h
index 1287b47..2de2069 100644
--- a/include/emulator.h
+++ b/include/emulator.h
@@ -33,13 +33,11 @@ struct ofono_emulator;
 struct ofono_emulator_driver {
 	const char *name;
 	enum ofono_atom_type type;
-	int (*probe)(struct ofono_emulator *emulator,
-			struct ofono_modem *modem);
-	void (*remove)();
+	int (*probe)(struct ofono_emulator *emulator);
+	void (*remove)(void);
 };
 
 int ofono_emulator_enable(struct ofono_emulator *emulator, int fd);
-void ofono_emulator_disable(struct ofono_emulator *emulator);
 void ofono_emulator_remove(struct ofono_emulator *emulator);
 struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
 					struct ofono_emulator_driver *driver);
diff --git a/src/emulator.c b/src/emulator.c
new file mode 100644
index 0000000..49b129b
--- /dev/null
+++ b/src/emulator.c
@@ -0,0 +1,173 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2010  Intel Corporation. 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 <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <glib.h>
+#include <gdbus.h>
+
+#include "ofono.h"
+#include "common.h"
+#include "gatserver.h"
+
+struct ofono_emulator {
+	struct ofono_modem *modem;
+	struct ofono_atom *atom;
+	GAtServer *server;
+	struct ofono_emulator_driver *driver;
+};
+
+static GSList *emulator_drivers = NULL;
+
+static void ofono_emulator_debug(const char *str, void *data)
+{
+	g_print("%s: %s\n", (char *)data, str);
+}
+
+void ofono_emulator_remove(struct ofono_emulator *emulator)
+{
+	if (emulator == NULL)
+		return;
+
+	__ofono_atom_free(emulator->atom);
+}
+
+static void emulator_disable(struct ofono_emulator *e)
+{
+	DBG("");
+
+	g_at_server_shutdown(e->server);
+	g_at_server_unref(e->server);
+	e->server = NULL;
+}
+
+static void emulator_disconnect_cb(gpointer user_data)
+{
+	struct ofono_emulator *e = user_data;
+
+	if (e == NULL)
+		return;
+
+	emulator_disable(e);
+}
+
+int ofono_emulator_enable(struct ofono_emulator *e, int fd)
+{
+	GIOChannel *io;
+
+	if (fd < 0)
+		return -EIO;
+
+	io = g_io_channel_unix_new(fd);
+
+	e->server = g_at_server_new(io);
+	if (!e->server) {
+		g_free(e);
+		return -ENOMEM;
+	}
+
+	g_at_server_set_debug(e->server, ofono_emulator_debug, "Server");
+	g_at_server_set_disconnect_function(e->server,
+						emulator_disconnect_cb, e);
+
+	return 0;
+}
+
+static void emulator_remove(struct ofono_atom *atom)
+{
+	struct ofono_emulator *e =  __ofono_atom_get_data(atom);
+
+	DBG("");
+
+	if (e->server)
+		emulator_disable(e);
+
+	if (e->driver->remove)
+		e->driver->remove();
+
+	g_free(e);
+}
+
+struct ofono_emulator *ofono_emulator_create(struct ofono_modem *modem,
+					struct ofono_emulator_driver *driver)
+{
+	struct ofono_emulator *e;
+
+	DBG("");
+
+	if (driver->probe == NULL)
+		return NULL;
+
+	e = g_try_new0(struct ofono_emulator, 1);
+	if (!e)
+		return NULL;
+
+	e->modem = modem;
+	e->driver = driver;
+
+	if (driver->probe(e) < 0) {
+		g_free(e);
+		return NULL;
+	}
+
+	return e;
+}
+
+void __ofono_emulator_probe_drivers(struct ofono_modem *modem)
+{
+	struct ofono_emulator_driver *driver;
+	GSList *l;
+
+	for (l = emulator_drivers; l; l = l->next) {
+		struct ofono_emulator *e;
+
+		driver = l->data;
+
+		e = ofono_emulator_create(modem, driver);
+		if (!e)
+			continue;
+
+		e->atom = __ofono_modem_add_atom(modem, driver->type,
+							emulator_remove, e);
+	}
+}
+
+int ofono_emulator_driver_register(const struct ofono_emulator_driver *driver)
+{
+	DBG("driver: %p name: %s", driver, driver->name);
+
+	emulator_drivers = g_slist_prepend(emulator_drivers, (void *)driver);
+
+	return 0;
+}
+
+void ofono_emulator_driver_unregister(
+				const struct ofono_emulator_driver *driver)
+{
+	DBG("driver: %p name: %s", driver, driver->name);
+
+	emulator_drivers = g_slist_remove(emulator_drivers, driver);
+}
diff --git a/src/ofono.h b/src/ofono.h
index 4f0b7c2..e334df1 100644
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -128,6 +128,7 @@ enum ofono_atom_type {
 	OFONO_ATOM_TYPE_CTM,
 	OFONO_ATOM_TYPE_CDMA_VOICECALL_MANAGER,
 	OFONO_ATOM_TYPE_SIM_AUTH,
+	OFONO_ATOM_TYPE_EMULATOR_DUN,
 };
 
 enum ofono_atom_watch_condition {
@@ -435,3 +436,7 @@ ofono_bool_t __ofono_gprs_provision_get_settings(const char *mcc,
 void __ofono_gprs_provision_free_settings(
 				struct ofono_gprs_provision_data *settings,
 				int count);
+
+#include <ofono/emulator.h>
+
+void __ofono_emulator_probe_drivers(struct ofono_modem *modem);
-- 
1.7.4

[PATCH -v3 5/7] dun_gw: Add DUN server plugin for oFono

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 7869 bytes --]

DUN server is probed when modem state changes to online. It registers
DUN record to Bluetooth adapter and wait for incoming DUN connection.

Based on a patch from Zhenhua Zhang <zhenhua.zhang@intel.com>
---
 Makefile.am         |    3 +
 plugins/bluetooth.h |    3 +
 plugins/dun_gw.c    |  189 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 195 insertions(+), 0 deletions(-)
 create mode 100644 plugins/dun_gw.c

diff --git a/Makefile.am b/Makefile.am
index 047a85f..8a845fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -321,6 +321,9 @@ builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
 builtin_modules += hfp
 builtin_sources += plugins/hfp.c plugins/bluetooth.h
 
+builtin_modules += dun_gw
+builtin_sources += plugins/dun_gw.c plugins/bluetooth.h
+
 builtin_sources += $(btio_sources)
 builtin_cflags += @BLUEZ_CFLAGS@
 builtin_libadd += @BLUEZ_LIBS@
diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
index 505d908..79e1a4a 100644
--- a/plugins/bluetooth.h
+++ b/plugins/bluetooth.h
@@ -32,6 +32,9 @@
 /* Profiles bitfield */
 #define HFP_AG 0x01
 
+/* Server bitfield */
+#define DUN_GW 0x01
+
 struct bluetooth_profile {
 	const char *name;
 	int (*create)(const char *device, const char *dev_addr,
diff --git a/plugins/dun_gw.c b/plugins/dun_gw.c
new file mode 100644
index 0000000..32c199e
--- /dev/null
+++ b/plugins/dun_gw.c
@@ -0,0 +1,189 @@
+/*
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2010  Intel Corporation. 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 <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 <gdbus.h>
+
+#include "bluetooth.h"
+
+#define DUN_GW_CHANNEL	1
+
+static struct server *server;
+static guint modemwatch_id;
+static guint channel_watch;
+
+static const gchar *dun_record = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>  \
+<record>                                                                       \
+  <attribute id=\"0x0001\">                                                    \
+    <sequence>                                                                 \
+      <uuid value=\"0x1103\"/>                                                 \
+    </sequence>                                                                \
+  </attribute>                                                                 \
+                                                                               \
+  <attribute id=\"0x0004\">                                                    \
+    <sequence>                                                                 \
+      <sequence>                                                               \
+        <uuid value=\"0x0100\"/>                                               \
+      </sequence>                                                              \
+      <sequence>                                                               \
+        <uuid value=\"0x0003\"/>                                               \
+        <uint8 value=\"1\" name=\"channel\"/>                                 \
+      </sequence>                                                              \
+    </sequence>                                                                \
+  </attribute>                                                                 \
+                                                                               \
+  <attribute id=\"0x0009\">                                                    \
+    <sequence>                                                                 \
+      <sequence>                                                               \
+        <uuid value=\"0x1103\"/>                                               \
+        <uint16 value=\"0x0100\" name=\"version\"/>                            \
+      </sequence>                                                              \
+    </sequence>                                                                \
+  </attribute>                                                                 \
+                                                                               \
+  <attribute id=\"0x0100\">                                                    \
+    <text value=\"Dial-up Networking\" name=\"name\"/>                         \
+  </attribute>                                                                 \
+</record>";
+
+
+static gboolean dun_gw_disconnect_cb(GIOChannel *io, GIOCondition cond,
+							gpointer user_data)
+{
+	g_io_channel_unref(io);
+
+	return FALSE;
+}
+
+static void dun_gw_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
+{
+	struct ofono_emulator *emulator = user_data;
+	int fd;
+
+	DBG("");
+
+	if (err) {
+		DBG("%s", err->message);
+		return;
+	}
+
+	fd = g_io_channel_unix_get_fd(io);
+	io = g_io_channel_ref(io);
+
+	if (ofono_emulator_enable(emulator, fd) < 0)
+		goto failed;
+
+	channel_watch = g_io_add_watch(io, G_IO_NVAL | G_IO_HUP | G_IO_ERR,
+					dun_gw_disconnect_cb, NULL);
+
+	return;
+
+failed:
+	g_io_channel_shutdown(io, TRUE, NULL);
+}
+
+static int dun_gw_probe(struct ofono_emulator *emulator)
+{
+	if (server)
+		return -EEXIST;
+
+	DBG("");
+
+	server = bluetooth_register_server(DUN_GW_CHANNEL, dun_record,
+						dun_gw_connect_cb, emulator);
+
+	return 0;
+}
+
+static void dun_gw_remove(void)
+{
+	if (server == NULL)
+		return;
+
+	DBG("");
+
+	bluetooth_unregister_server(server);
+	server = NULL;
+}
+
+static void gprs_watch(struct ofono_atom *atom,
+				enum ofono_atom_watch_condition cond,
+				void *data)
+{
+	struct ofono_modem *modem = data;
+
+	if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED)
+		return;
+
+	__ofono_emulator_probe_drivers(modem);
+}
+
+static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
+{
+	DBG("modem: %p, added: %d", modem, added);
+
+	if (added == FALSE)
+		return;
+
+	__ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_GPRS,
+					gprs_watch, modem, NULL);
+}
+
+static void call_modemwatch(struct ofono_modem *modem, void *user)
+{
+	modem_watch(modem, TRUE, user);
+}
+
+static struct ofono_emulator_driver emulator_driver = {
+	.name = "Dial-Up Networking",
+	.type = OFONO_ATOM_TYPE_EMULATOR_DUN,
+	.probe = dun_gw_probe,
+	.remove = dun_gw_remove,
+};
+
+static int dun_gw_init(void)
+{
+	modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
+	__ofono_modem_foreach(call_modemwatch, NULL);
+
+	return ofono_emulator_driver_register(&emulator_driver);
+}
+
+static void dun_gw_exit(void)
+{
+	__ofono_modemwatch_remove(modemwatch_id);
+
+	ofono_emulator_driver_unregister(&emulator_driver);
+}
+
+OFONO_PLUGIN_DEFINE(dun_gw, "Dial-up Networking Profile Plugins", VERSION,
+			OFONO_PLUGIN_PRIORITY_DEFAULT, dun_gw_init, dun_gw_exit)
-- 
1.7.4

[PATCH -v3 6/7] emulator: Implement dialing up for DUN

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 4028 bytes --]

It handles client ATD*99# request and then initiate the PPP negotiation.
IP forward through the new ppp interface is not done yet.

Initially based on patches from Zhenhua Zhang <zhenhua.zhang@intel.com>
---
 src/emulator.c |  123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 123 insertions(+), 0 deletions(-)

diff --git a/src/emulator.c b/src/emulator.c
index 49b129b..f1a079d 100644
--- a/src/emulator.c
+++ b/src/emulator.c
@@ -32,11 +32,18 @@
 #include "ofono.h"
 #include "common.h"
 #include "gatserver.h"
+#include "gatppp.h"
+
+#define DUN_SERVER_ADDRESS	"192.168.1.1"
+#define DUN_PEER_ADDRESS	"192.168.1.2"
+#define DUN_DNS_SERVER_1	"10.10.10.10"
+#define DUN_DNS_SERVER_2	"10.10.10.11"
 
 struct ofono_emulator {
 	struct ofono_modem *modem;
 	struct ofono_atom *atom;
 	GAtServer *server;
+	GAtPPP *ppp;
 	struct ofono_emulator_driver *driver;
 };
 
@@ -55,10 +62,124 @@ void ofono_emulator_remove(struct ofono_emulator *emulator)
 	__ofono_atom_free(emulator->atom);
 }
 
+static void ppp_connect(const char *iface, const char *local,
+			const char *remote,
+			const char *dns1, const char *dns2,
+			gpointer user_data)
+{
+	DBG("Network Device: %s\n", iface);
+	DBG("IP Address: %s\n", local);
+	DBG("Remote IP Address: %s\n", remote);
+	DBG("Primary DNS Server: %s\n", dns1);
+	DBG("Secondary DNS Server: %s\n", dns2);
+}
+
+static void ppp_disconnect(GAtPPPDisconnectReason reason, gpointer user_data)
+{
+	struct ofono_emulator *e = user_data;
+
+	DBG("");
+
+	g_at_ppp_unref(e->ppp);
+	e->ppp = NULL;
+
+	if (e->server == NULL)
+		return;
+
+	g_at_server_resume(e->server);
+
+	g_at_server_send_final(e->server, G_AT_SERVER_RESULT_NO_CARRIER);
+}
+
+static gboolean setup_ppp(gpointer user_data)
+{
+	struct ofono_emulator *e = user_data;
+	GAtServer *server = e->server;
+	GAtIO *io;
+
+	DBG("");
+
+	io = g_at_server_get_io(server);
+
+	g_at_server_suspend(server);
+
+	e->ppp = g_at_ppp_server_new_from_io(io, DUN_SERVER_ADDRESS);
+	if (e->ppp == NULL) {
+		g_at_server_resume(server);
+		return FALSE;
+	}
+
+	g_at_ppp_set_server_info(e->ppp, DUN_PEER_ADDRESS,
+					DUN_DNS_SERVER_1, DUN_DNS_SERVER_2);
+
+	g_at_ppp_set_credentials(e->ppp, "", "");
+	g_at_ppp_set_debug(e->ppp, ofono_emulator_debug, "PPP");
+
+	g_at_ppp_set_connect_function(e->ppp, ppp_connect, e);
+	g_at_ppp_set_disconnect_function(e->ppp, ppp_disconnect, e);
+
+	return FALSE;
+}
+
+static gboolean dial_call(struct ofono_emulator *e, const char *dial_str)
+{
+	char c = *dial_str;
+
+	DBG("dial call %s", dial_str);
+
+	if (c == '*' || c == '#' || c == 'T' || c == 't') {
+
+		g_at_server_send_intermediate(e->server, "CONNECT");
+		g_idle_add(setup_ppp, e);
+	}
+
+	return TRUE;
+}
+
+static void dial_cb(GAtServerRequestType type, GAtResult *result,
+					gpointer user_data)
+{
+	struct ofono_emulator *e = user_data;
+	GAtServer *server = e->server;
+	GAtResultIter iter;
+	const char *dial_str;
+
+	DBG("");
+
+	if (type != G_AT_SERVER_REQUEST_TYPE_SET)
+		goto error;
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "D"))
+		goto error;
+
+	dial_str = g_at_result_iter_raw_line(&iter);
+	if (!dial_str)
+		goto error;
+
+	if (e->ppp)
+		goto error;
+
+	if (!dial_call(e, dial_str))
+		goto error;
+
+	return;
+
+error:
+	g_at_server_send_final(server, G_AT_SERVER_RESULT_ERROR);
+}
+
 static void emulator_disable(struct ofono_emulator *e)
 {
 	DBG("");
 
+	if (e->ppp) {
+		g_at_ppp_shutdown(e->ppp);
+		g_at_ppp_unref(e->ppp);
+		e->ppp = NULL;
+	}
+
 	g_at_server_shutdown(e->server);
 	g_at_server_unref(e->server);
 	e->server = NULL;
@@ -93,6 +214,8 @@ int ofono_emulator_enable(struct ofono_emulator *e, int fd)
 	g_at_server_set_disconnect_function(e->server,
 						emulator_disconnect_cb, e);
 
+	g_at_server_register(e->server, "D", dial_cb, e, NULL);
+
 	return 0;
 }
 
-- 
1.7.4

[PATCH -v3 7/7] gsmdial: add option for Bluetooth DUN dialing

[Gustavo F. Padovan]

[-- Attachment #1: Type: text/plain, Size: 1825 bytes --]

---
 gatchat/gsmdial.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/gatchat/gsmdial.c b/gatchat/gsmdial.c
index 1be80e3..d54a26e 100644
--- a/gatchat/gsmdial.c
+++ b/gatchat/gsmdial.c
@@ -56,6 +56,7 @@ static gboolean option_legacy = FALSE;
 static gchar *option_username = NULL;
 static gchar *option_password = NULL;
 static gchar *option_pppdump = NULL;
+static gboolean option_bluetooth = 0;
 
 static GAtPPP *ppp;
 static GAtChat *control;
@@ -266,6 +267,9 @@ static void no_carrier_notify(GAtResult *result, gpointer user_data)
 {
 	char buf[64];
 
+	if (option_bluetooth)
+		return;
+
 	sprintf(buf, "AT+CFUN=%u", option_offmode);
 	g_at_chat_send(control, buf, none_prefix, power_down, NULL, NULL);
 }
@@ -612,6 +616,8 @@ static GOptionEntry options[] = {
 				"Specify CFUN offmode" },
 	{ "legacy", 'l', 0, G_OPTION_ARG_NONE, &option_legacy,
 				"Use ATD*99***<cid>#" },
+	{ "bluetooth", 'b', 0, G_OPTION_ARG_NONE, &option_bluetooth,
+				"Use only ATD*99" },
 	{ "username", 'u', 0, G_OPTION_ARG_STRING, &option_username,
 				"Specify PPP username" },
 	{ "password", 'w', 0, G_OPTION_ARG_STRING, &option_password,
@@ -700,9 +706,14 @@ int main(int argc, char **argv)
 
 	event_loop = g_main_loop_new(NULL, FALSE);
 
-	g_at_chat_send(control, "ATE0Q0V1", NULL, NULL, NULL, NULL);
-	g_at_chat_send(control, "AT+CFUN?", cfun_prefix,
-						check_mode, NULL, NULL);
+	if (option_bluetooth) {
+		g_at_chat_send(control, "ATD*99", none_prefix, connect_cb,
+				NULL, NULL);
+	} else {
+		g_at_chat_send(control, "ATE0Q0V1", NULL, NULL, NULL, NULL);
+		g_at_chat_send(control, "AT+CFUN?", cfun_prefix,
+							check_mode, NULL, NULL);
+	}
 
 	g_main_loop_run(event_loop);
 	g_source_remove(signal_source);
-- 
1.7.4

Re: [PATCH -v3 7/7] gsmdial: add option for Bluetooth DUN dialing

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 2059 bytes --]

Hi Gustavo,

On 02/08/2011 04:01 PM, Gustavo F. Padovan wrote:
> ---
>  gatchat/gsmdial.c |   17 ++++++++++++++---
>  1 files changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/gatchat/gsmdial.c b/gatchat/gsmdial.c
> index 1be80e3..d54a26e 100644
> --- a/gatchat/gsmdial.c
> +++ b/gatchat/gsmdial.c
> @@ -56,6 +56,7 @@ static gboolean option_legacy = FALSE;
>  static gchar *option_username = NULL;
>  static gchar *option_password = NULL;
>  static gchar *option_pppdump = NULL;
> +static gboolean option_bluetooth = 0;
>  
>  static GAtPPP *ppp;
>  static GAtChat *control;
> @@ -266,6 +267,9 @@ static void no_carrier_notify(GAtResult *result, gpointer user_data)
>  {
>  	char buf[64];
>  
> +	if (option_bluetooth)
> +		return;
> +

Should the return be quit_eventloop by any chance?

>  	sprintf(buf, "AT+CFUN=%u", option_offmode);
>  	g_at_chat_send(control, buf, none_prefix, power_down, NULL, NULL);
>  }
> @@ -612,6 +616,8 @@ static GOptionEntry options[] = {
>  				"Specify CFUN offmode" },
>  	{ "legacy", 'l', 0, G_OPTION_ARG_NONE, &option_legacy,
>  				"Use ATD*99***<cid>#" },
> +	{ "bluetooth", 'b', 0, G_OPTION_ARG_NONE, &option_bluetooth,
> +				"Use only ATD*99" },
>  	{ "username", 'u', 0, G_OPTION_ARG_STRING, &option_username,
>  				"Specify PPP username" },
>  	{ "password", 'w', 0, G_OPTION_ARG_STRING, &option_password,
> @@ -700,9 +706,14 @@ int main(int argc, char **argv)
>  
>  	event_loop = g_main_loop_new(NULL, FALSE);
>  
> -	g_at_chat_send(control, "ATE0Q0V1", NULL, NULL, NULL, NULL);
> -	g_at_chat_send(control, "AT+CFUN?", cfun_prefix,
> -						check_mode, NULL, NULL);
> +	if (option_bluetooth) {
> +		g_at_chat_send(control, "ATD*99", none_prefix, connect_cb,
> +				NULL, NULL);
> +	} else {
> +		g_at_chat_send(control, "ATE0Q0V1", NULL, NULL, NULL, NULL);
> +		g_at_chat_send(control, "AT+CFUN?", cfun_prefix,
> +							check_mode, NULL, NULL);
> +	}
>  
>  	g_main_loop_run(event_loop);
>  	g_source_remove(signal_source);

Regards,
-Denis

Re: [PATCH -v3 5/7] dun_gw: Add DUN server plugin for oFono

[Guillaume Zajac]

[-- Attachment #1: Type: text/plain, Size: 8999 bytes --]

Hi Gustavo,

On 08/02/2011 23:01, Gustavo F. Padovan wrote:
> DUN server is probed when modem state changes to online. It registers
> DUN record to Bluetooth adapter and wait for incoming DUN connection.
>
> Based on a patch from Zhenhua Zhang<zhenhua.zhang@intel.com>
> ---
>   Makefile.am         |    3 +
>   plugins/bluetooth.h |    3 +
>   plugins/dun_gw.c    |  189 +++++++++++++++++++++++++++++++++++++++++++++++++++
>   3 files changed, 195 insertions(+), 0 deletions(-)
>   create mode 100644 plugins/dun_gw.c
>
> diff --git a/Makefile.am b/Makefile.am
> index 047a85f..8a845fa 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -321,6 +321,9 @@ builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
>   builtin_modules += hfp
>   builtin_sources += plugins/hfp.c plugins/bluetooth.h
>
> +builtin_modules += dun_gw
> +builtin_sources += plugins/dun_gw.c plugins/bluetooth.h
> +
>   builtin_sources += $(btio_sources)
>   builtin_cflags += @BLUEZ_CFLAGS@
>   builtin_libadd += @BLUEZ_LIBS@
> diff --git a/plugins/bluetooth.h b/plugins/bluetooth.h
> index 505d908..79e1a4a 100644
> --- a/plugins/bluetooth.h
> +++ b/plugins/bluetooth.h
> @@ -32,6 +32,9 @@
>   /* Profiles bitfield */
>   #define HFP_AG 0x01
>
> +/* Server bitfield */
> +#define DUN_GW 0x01
> +
>   struct bluetooth_profile {
>   	const char *name;
>   	int (*create)(const char *device, const char *dev_addr,
> diff --git a/plugins/dun_gw.c b/plugins/dun_gw.c
> new file mode 100644
> index 0000000..32c199e
> --- /dev/null
> +++ b/plugins/dun_gw.c
> @@ -0,0 +1,189 @@
> +/*
> + *  oFono - Open Source Telephony
> + *
> + *  Copyright (C) 2010  Intel Corporation. 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<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<gdbus.h>
> +
> +#include "bluetooth.h"
> +
> +#define DUN_GW_CHANNEL	1
> +
> +static struct server *server;
> +static guint modemwatch_id;
> +static guint channel_watch;
> +
> +static const gchar *dun_record = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>   \
> +<record>                                                                        \
> +<attribute id=\"0x0001\">                                                     \
> +<sequence>                                                                  \
> +<uuid value=\"0x1103\"/>                                                  \
> +</sequence>                                                                 \
> +</attribute>                                                                  \
> +                                                                               \
> +<attribute id=\"0x0004\">                                                     \
> +<sequence>                                                                  \
> +<sequence>                                                                \
> +<uuid value=\"0x0100\"/>                                                \
> +</sequence>                                                               \
> +<sequence>                                                                \
> +<uuid value=\"0x0003\"/>                                                \
> +<uint8 value=\"1\" name=\"channel\"/>                                  \
> +</sequence>                                                               \
> +</sequence>                                                                 \
> +</attribute>                                                                  \
> +                                                                               \
> +<attribute id=\"0x0009\">                                                     \
> +<sequence>                                                                  \
> +<sequence>                                                                \
> +<uuid value=\"0x1103\"/>                                                \
> +<uint16 value=\"0x0100\" name=\"version\"/>                             \
> +</sequence>                                                               \
> +</sequence>                                                                 \
> +</attribute>                                                                  \
> +                                                                               \
> +<attribute id=\"0x0100\">                                                     \
> +<text value=\"Dial-up Networking\" name=\"name\"/>                          \
> +</attribute>                                                                  \
> +</record>";
> +
> +
> +static gboolean dun_gw_disconnect_cb(GIOChannel *io, GIOCondition cond,
> +							gpointer user_data)
> +{
> +	g_io_channel_unref(io);
> +
> +	return FALSE;
> +}
> +
> +static void dun_gw_connect_cb(GIOChannel *io, GError *err, gpointer user_data)
> +{
> +	struct ofono_emulator *emulator = user_data;
> +	int fd;
> +
> +	DBG("");
> +
> +	if (err) {
> +		DBG("%s", err->message);
> +		return;
> +	}
> +
> +	fd = g_io_channel_unix_get_fd(io);
> +	io = g_io_channel_ref(io);
> +
> +	if (ofono_emulator_enable(emulator, fd)<  0)
> +		goto failed;
> +
> +	channel_watch = g_io_add_watch(io, G_IO_NVAL | G_IO_HUP | G_IO_ERR,
> +					dun_gw_disconnect_cb, NULL);
> +
> +	return;
> +
> +failed:
> +	g_io_channel_shutdown(io, TRUE, NULL);
> +}
> +
> +static int dun_gw_probe(struct ofono_emulator *emulator)
> +{
> +	if (server)
> +		return -EEXIST;
> +
> +	DBG("");
> +
> +	server = bluetooth_register_server(DUN_GW_CHANNEL, dun_record,
> +						dun_gw_connect_cb, emulator);
> +
> +	return 0;
> +}
> +
> +static void dun_gw_remove(void)
> +{
> +	if (server == NULL)
> +		return;
> +
> +	DBG("");
> +
> +	bluetooth_unregister_server(server);
> +	server = NULL;
> +}
> +
> +static void gprs_watch(struct ofono_atom *atom,
> +				enum ofono_atom_watch_condition cond,
> +				void *data)
> +{
> +	struct ofono_modem *modem = data;
> +
> +	if (cond == OFONO_ATOM_WATCH_CONDITION_UNREGISTERED)
> +		return;
> +
> +	__ofono_emulator_probe_drivers(modem);
> +}
> +
> +static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
> +{
> +	DBG("modem: %p, added: %d", modem, added);
> +
> +	if (added == FALSE)
> +		return;
> +
> +	__ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_GPRS,
> +					gprs_watch, modem, NULL);
> +}

Something is bothering me here, because even if you have no GPRS atom or 
you are not registered on any network, the cell phone should be able to 
answer to a DUN connection request from a computer for instance (and 
return ERROR to ATD*99#...). However you are triggering the emulator 
creation only when the modem is online (GPRS atom is registered).
So it means if we have a DUN request without the GPRS atom there will be 
no answer to the data terminal because we have no emulator.
There is no info into DUN specifications about the recommended behavior 
but on current devices with DUn feature we are able to answer to DUN 
request even with no gprs registration.

> +
> +static void call_modemwatch(struct ofono_modem *modem, void *user)
> +{
> +	modem_watch(modem, TRUE, user);
> +}
> +
> +static struct ofono_emulator_driver emulator_driver = {
> +	.name = "Dial-Up Networking",
> +	.type = OFONO_ATOM_TYPE_EMULATOR_DUN,
> +	.probe = dun_gw_probe,
> +	.remove = dun_gw_remove,
> +};
> +
> +static int dun_gw_init(void)
> +{
> +	modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
> +	__ofono_modem_foreach(call_modemwatch, NULL);
> +
> +	return ofono_emulator_driver_register(&emulator_driver);
> +}
> +
> +static void dun_gw_exit(void)
> +{
> +	__ofono_modemwatch_remove(modemwatch_id);
> +
> +	ofono_emulator_driver_unregister(&emulator_driver);
> +}
> +
> +OFONO_PLUGIN_DEFINE(dun_gw, "Dial-up Networking Profile Plugins", VERSION,
> +			OFONO_PLUGIN_PRIORITY_DEFAULT, dun_gw_init, dun_gw_exit)

Kind regards,
Guillaume

Re: [PATCH -v3 2/7] bluetooth: Add Bluetooth service authorization support

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 153 bytes --]

Hi Gustavo,

This patch has been applied, but I refactored it heavily afterwards.
Can you make sure I didn't screw anything up?

Thanks,
-Denis

Re: [PATCH -v3 1/7] bluetooth: Add bluetooth server support

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 400 bytes --]

Hi Gustavo,

On 02/08/2011 04:00 PM, Gustavo F. Padovan wrote:
> From: Frédéric Danis <frederic.danis@linux.intel.com>
> 
> ---
>  Makefile.am         |    1 +
>  plugins/bluetooth.c |  247 ++++++++++++++++++++++++++++++++++++++++++++++++++-
>  plugins/bluetooth.h |    9 ++
>  3 files changed, 254 insertions(+), 3 deletions(-)
> 

Patch has been applied, thanks.

Regards,
-Denis