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

[Guillaume Zajac <guillaume.zajac@linux.intel.com>]

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

Hi Gustavo,

Thanks for clarification.

Kind regards,
Guillaume

On 07/02/2011 19:19, Gustavo F. Padovan wrote:
> Hi Guillaume,
>
> * Guillaume Zajac<guillaume.zajac@linux.intel.com>  [2011-02-07 10:21:58 +0100]:
>
>> Hi Padovan,
>>
>> One comment below.
>>
>> Kind regards,
>> Guillaume
>>
>> On 04/02/2011 22:46, 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);
>> I don't understand why you put a second level of watcher here as we
>> already register a disconnect function when we create the GAtServer.
> I had problems if I do not ref the io_channel before call
> ofono_emulator_enable(), then I put the callback to unref it on disconnect.
>
> This will all be fixed when add a proper API to BlueZ. ;-)
>