--- gatchat/gatppp.c | 43 ++++++++++++++++++++++++++++++++++++++++--- gatchat/gatppp.h | 2 ++ gatchat/ppp.h | 2 +- gatchat/ppp_net.c | 46 ++++++++++++++++++++++++++++------------------ 4 files changed, 71 insertions(+), 22 deletions(-) diff --git a/gatchat/gatppp.c b/gatchat/gatppp.c index 993b5ea..d59f69b 100644 --- a/gatchat/gatppp.c +++ b/gatchat/gatppp.c @@ -76,6 +76,7 @@ struct _GAtPPP { gpointer debug_data; gboolean sta_pending; guint ppp_dead_source; + int fd; }; void ppp_debug(GAtPPP *ppp, const char *str) @@ -288,7 +289,7 @@ void ppp_auth_notify(GAtPPP *ppp, gboolean success) void ppp_ipcp_up_notify(GAtPPP *ppp, const char *local, const char *peer, const char *dns1, const char *dns2) { - ppp->net = ppp_net_new(ppp); + ppp->net = ppp_net_new(ppp, ppp->fd); if (ppp->net == NULL) { ppp->disconnect_reason = G_AT_PPP_REASON_NET_FAIL; @@ -296,8 +297,14 @@ void ppp_ipcp_up_notify(GAtPPP *ppp, const char *local, const char *peer, return; } - if (ppp_net_set_mtu(ppp->net, ppp->mtu) == FALSE) - DBG(ppp, "Unable to set MTU"); + /* + * If we have opened the tun interface locally, + * we have to set a MTU value. + */ + if (ppp->fd < 0) { + if (ppp_net_set_mtu(ppp->net, ppp->mtu) == FALSE) + DBG(ppp, "Unable to set MTU"); + } ppp_enter_phase(ppp, PPP_PHASE_LINK_UP); @@ -541,6 +548,9 @@ static GAtPPP *ppp_init_common(GAtHDLC *hdlc, gboolean is_server, guint32 ip) ppp->ref_count = 1; + /* Default value of fd is -1 */ + ppp->fd = -1; + /* set options to defaults */ ppp->mru = DEFAULT_MRU; ppp->mtu = DEFAULT_MTU; @@ -629,6 +639,33 @@ GAtPPP *g_at_ppp_server_new_from_io(GAtIO *io, const char *local) return NULL; ppp = ppp_init_common(hdlc, TRUE, ip); + + g_at_hdlc_unref(hdlc); + + return ppp; +} + +GAtPPP *g_at_ppp_server_new_from_io_with_fd(GAtIO *io, + const char *local, int fd) +{ + GAtHDLC *hdlc; + GAtPPP *ppp; + guint32 ip; + + if (local == NULL) + ip = 0; + else if (inet_pton(AF_INET, local, &ip) != 1) + return NULL; + + hdlc = g_at_hdlc_new_from_io(io); + if (hdlc == NULL) + return NULL; + + ppp = ppp_init_common(hdlc, TRUE, ip); + + /* Set the fd value returned by ConnMan */ + ppp->fd = fd; + g_at_hdlc_unref(hdlc); return ppp; diff --git a/gatchat/gatppp.h b/gatchat/gatppp.h index fb5de4c..4ed4cde 100644 --- a/gatchat/gatppp.h +++ b/gatchat/gatppp.h @@ -54,6 +54,8 @@ GAtPPP *g_at_ppp_new(GIOChannel *modem); GAtPPP *g_at_ppp_new_from_io(GAtIO *io); GAtPPP *g_at_ppp_server_new(GIOChannel *modem, const char *local); GAtPPP *g_at_ppp_server_new_from_io(GAtIO *io, const char *local); +GAtPPP *g_at_ppp_server_new_from_io_with_fd(GAtIO *io, + const char *local, int fd); void g_at_ppp_open(GAtPPP *ppp); void g_at_ppp_set_connect_function(GAtPPP *ppp, GAtPPPConnectFunc callback, diff --git a/gatchat/ppp.h b/gatchat/ppp.h index d2786d7..8107820 100644 --- a/gatchat/ppp.h +++ b/gatchat/ppp.h @@ -102,7 +102,7 @@ void ppp_chap_free(struct ppp_chap *chap); void ppp_chap_process_packet(struct ppp_chap *chap, const guint8 *new_packet); /* TUN / Network related functions */ -struct ppp_net *ppp_net_new(GAtPPP *ppp); +struct ppp_net *ppp_net_new(GAtPPP *ppp, int fd); const char *ppp_net_get_interface(struct ppp_net *net); void ppp_net_process_packet(struct ppp_net *net, const guint8 *packet); void ppp_net_free(struct ppp_net *net); diff --git a/gatchat/ppp_net.c b/gatchat/ppp_net.c index 1a6cdf7..59c4b5e 100644 --- a/gatchat/ppp_net.c +++ b/gatchat/ppp_net.c @@ -123,12 +123,12 @@ const char *ppp_net_get_interface(struct ppp_net *net) return net->if_name; } -struct ppp_net *ppp_net_new(GAtPPP *ppp) +struct ppp_net *ppp_net_new(GAtPPP *ppp, int fd) { struct ppp_net *net; GIOChannel *channel = NULL; struct ifreq ifr; - int fd, err; + int fdesc, err; net = g_try_new0(struct ppp_net, 1); if (net == NULL) @@ -140,23 +140,33 @@ struct ppp_net *ppp_net_new(GAtPPP *ppp) return NULL; } - /* open a tun interface */ - fd = open("/dev/net/tun", O_RDWR); - if (fd < 0) - goto error; - - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_flags = IFF_TUN | IFF_NO_PI; - strcpy(ifr.ifr_name, "ppp%d"); - - err = ioctl(fd, TUNSETIFF, (void *) &ifr); - if (err < 0) - goto error; - - net->if_name = strdup(ifr.ifr_name); + /* + * If the fd value is still the default one, + * open the tun interface and configure it. + */ + if (fd< 0) { + /* open a tun interface */ + fdesc = open("/dev/net/tun", O_RDWR); + if (fdesc < 0) + goto error; + + memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_flags = IFF_TUN | IFF_NO_PI; + strcpy(ifr.ifr_name, "ppp%d"); + + err = ioctl(fdesc, TUNSETIFF, (void *) &ifr); + if (err < 0) + goto error; + + net->if_name = strdup(ifr.ifr_name); + /* create a channel for reading and writing to this interface */ + channel = g_io_channel_unix_new(fdesc); + } else { + net->if_name = strdup("Server ppp"); + /* create a channel for reading and writing to this interface */ + channel = g_io_channel_unix_new(fd); + } - /* create a channel for reading and writing to this interface */ - channel = g_io_channel_unix_new(fd); if (channel == NULL) goto error; -- 1.7.1

--- plugins/connman.c | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 239 insertions(+), 0 deletions(-) create mode 100644 plugins/connman.c diff --git a/plugins/connman.c b/plugins/connman.c new file mode 100644 index 0000000..eec0940 --- /dev/null +++ b/plugins/connman.c @@ -0,0 +1,239 @@ +/* + * + * oFono - Open Source Telephony + * + * Copyright (C) 2008-2011 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 <errno.h> +#include <stdlib.h> + +#include <gdbus.h> +#include <string.h> + +#include <ofono.h> +#include <emulator.h> + +#define CONNMAN_SERVICE "net.connman" +#define CONNMAN_PATH "/net/connman" + +#define CONNMAN_DEBUG_INTERFACE CONNMAN_SERVICE ".Debug" +#define CONNMAN_ERROR_INTERFACE CONNMAN_SERVICE ".Error" +#define CONNMAN_AGENT_INTERFACE CONNMAN_SERVICE ".Agent" +#define CONNMAN_COUNTER_INTERFACE CONNMAN_SERVICE ".Counter" + +#define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager" +#define CONNMAN_MANAGER_PATH "/" + +#define CONNMAN_TASK_INTERFACE CONNMAN_SERVICE ".Task" +#define CONNMAN_PROFILE_INTERFACE CONNMAN_SERVICE ".Profile" +#define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service" +#define CONNMAN_PROVIDER_INTERFACE CONNMAN_SERVICE ".Provider" +#define CONNMAN_TECHNOLOGY_INTERFACE CONNMAN_SERVICE ".Technology" +#define CONNMAN_SESSION_INTERFACE CONNMAN_SERVICE ".Session" +#define CONNMAN_NOTIFICATION_INTERFACE CONNMAN_SERVICE ".Notification" + +static DBusConnection *connection; +static guint modemwatch_id; +static GList *modems; + +static void request_pn(struct ofono_error *error, int *out_fd, + const char **out_server_ip, + const char **out_peer_ip, + const char **out_primary_dns, + const char **out_secondary_dns) +{ + DBusMessageIter array, dict, entry; + DBusMessage *message, *reply; + DBusError dbus_error; + + DBG(""); + + error->type = OFONO_ERROR_TYPE_NO_ERROR; + + message = dbus_message_new_method_call(CONNMAN_SERVICE, + CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, + "RequestPrivateNetwork"); + + if (message == NULL) + goto error; + + dbus_error_init(&dbus_error); + + reply = dbus_connection_send_with_reply_and_block(connection, message, + -1, &dbus_error); + + dbus_message_unref(message); + + if (!reply) { + if (dbus_error_is_set(&dbus_error)) { + g_print("1. %s\n", dbus_error.message); + dbus_error_free(&dbus_error); + } else { + g_print("Request() failed"); + } + + goto error; + } + + if (dbus_message_iter_init(reply, &array) == FALSE) + goto error; + + if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_UNIX_FD) + goto error; + + dbus_message_iter_get_basic(&array, out_fd); + g_print("Fildescriptor = %d\n", *out_fd); + + dbus_message_iter_next(&array); + + if (dbus_message_iter_get_arg_type(&array) != DBUS_TYPE_ARRAY) + goto error; + + dbus_message_iter_recurse(&array, &dict); + + while (dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) { + DBusMessageIter iter; + const char *key; + int type; + + dbus_message_iter_recurse(&dict, &entry); + + dbus_message_iter_get_basic(&entry, &key); + + g_print("key %s", key); + + dbus_message_iter_next(&entry); + dbus_message_iter_recurse(&entry, &iter); + + type = dbus_message_iter_get_arg_type(&iter); + if (type != DBUS_TYPE_STRING) + break; + + if (g_str_equal(key, "ServerIPv4") + && type == DBUS_TYPE_STRING) { + dbus_message_iter_get_basic(&iter, out_server_ip); + g_print(" = %s\n", *out_server_ip); + + } else if (g_str_equal(key, "PeerIPv4") + && type == DBUS_TYPE_STRING) { + dbus_message_iter_get_basic(&iter, out_peer_ip); + g_print(" = %s\n", *out_peer_ip); + + } else if (g_str_equal(key, "PrimaryDNS") + && type == DBUS_TYPE_STRING) { + dbus_message_iter_get_basic(&iter, out_primary_dns); + g_print(" = %s\n", *out_primary_dns); + + } else if (g_str_equal(key, "SecondaryDNS") + && type == DBUS_TYPE_STRING) { + dbus_message_iter_get_basic(&iter, out_secondary_dns); + g_print(" = %s\n", *out_secondary_dns); + } + + dbus_message_iter_next(&dict); + } + + return; +error: + error->type = OFONO_ERROR_TYPE_FAILURE; + return; +} + +static void release_pn(void) +{ + DBusMessage *message; + + DBG(""); + + message = dbus_message_new_method_call(CONNMAN_SERVICE, + CONNMAN_MANAGER_PATH, + CONNMAN_MANAGER_INTERFACE, + "ReleasePrivateNetwork"); + + if (message == NULL) + return; + + dbus_connection_send(connection, message, NULL); + + dbus_message_unref(message); +} + +static void dun_emulator_watch(struct ofono_atom *atom, + enum ofono_atom_watch_condition cond, + void *data) +{ + struct ofono_modem *modem = data; + struct ofono_emulator *em = __ofono_atom_get_data(atom); + + if (cond == OFONO_ATOM_WATCH_CONDITION_REGISTERED) { + modems = g_list_append(modems, modem); + + if (modems->next == NULL) + ofono_emulator_add_network_request_cb(em, request_pn); + ofono_emulator_add_network_release_cb(em, release_pn); + } else { + modems = g_list_remove(modems, 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_EMULATOR_DUN, + dun_emulator_watch, modem, NULL); +} + +static void call_modemwatch(struct ofono_modem *modem, void *user) +{ + modem_watch(modem, TRUE, user); +} + +static int connman_init(void) +{ + int err; + + DBG(""); + + connection = ofono_dbus_get_connection(); + + modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL); + + __ofono_modem_foreach(call_modemwatch, NULL); + + return 0; + return err; + + return 0; +} + +static void connman_exit(void) +{ + __ofono_modemwatch_remove(modemwatch_id); +} + +OFONO_PLUGIN_DEFINE(connman, "ConnMan plugin", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, connman_init, connman_exit) -- 1.7.1

Hi Frederic, Please remember to not French top post :) Bertrand. -- Bertrand Aygon Engineering Manager Bertrand.Aygon(a)Intel.com Open Source Technology Center, Intel Corporation Great thoughts come from reason. Domie So -----Original Message----- From: ofono-bounces(a)ofono.org [mailto:ofono-bounces@ofono.org] On Behalf Of Frédéric Dalleau Sent: Friday, April 22, 2011 1:02 PM To: ofono(a)ofono.org Subject: Re: [PATCH 3/4] connman: add plugin in oFono to request request/release private network 2 remarques à vue de nez On 04/22/2011 12:02 PM, Guillaume Zajac wrote: il te manquerait pas des accolades? petit souci là _______________________________________________ ofono mailing list ofono(a)ofono.org http://lists.ofono.org/listinfo/ofono --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.