May 2015 - ofono - Ml01.01.Org

by Sergey Alirzaev

ifdef away GNU libc extensions and use a POSIXly correct pointer type --- gatchat/ppp_net.c | 2 +- src/log.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gatchat/ppp_net.c b/gatchat/ppp_net.c index 813ed9b..914ca53 100644 --- a/gatchat/ppp_net.c +++ b/gatchat/ppp_net.c @@ -67,7 +67,7 @@ gboolean ppp_net_set_mtu(struct ppp_net *net, guint16 mtu) strncpy(ifr.ifr_name, net->if_name, sizeof(ifr.ifr_name)); ifr.ifr_mtu = mtu; - err = ioctl(sk, SIOCSIFMTU, (caddr_t) &ifr); + err = ioctl(sk, SIOCSIFMTU, (void *) &ifr); close(sk); diff --git a/src/log.c b/src/log.c index febc874..6331b0d 100644 --- a/src/log.c +++ b/src/log.c @@ -30,7 +30,9 @@ #include <stdlib.h> #include <string.h> #include <syslog.h> +#ifdef __GLIBC__ #include <execinfo.h> +#endif #include <dlfcn.h> #include "ofono.h" @@ -113,6 +115,7 @@ void ofono_debug(const char *format, ...) va_end(ap); } +#ifdef __GLIBC__ static void print_backtrace(unsigned int offset) { void *frames[99]; @@ -240,6 +243,7 @@ static void signal_setup(sighandler_t handler) sigaction(SIGABRT, &sa, NULL); sigaction(SIGPIPE, &sa, NULL); } +#endif extern struct ofono_debug_desc __start___debug[]; extern struct ofono_debug_desc __stop___debug[]; @@ -305,7 +309,9 @@ int __ofono_log_init(const char *program, const char *debug, if (detach == FALSE) option |= LOG_PERROR; +#ifdef __GLIBC__ signal_setup(signal_handler); +#endif openlog(basename(program), option, LOG_DAEMON); @@ -320,7 +326,9 @@ void __ofono_log_cleanup(void) closelog(); +#ifdef __GLIBC__ signal_setup(SIG_DFL); +#endif g_strfreev(enabled); } -- 2.4.1

4 years, 11 months

2
1
0 / 0

RE: Query on ppp0 interface for HE910 device

by Mike Williams

>Whenever the connman daemon switches from cellular to wifi automatically, ofonod >removes the ppp0 interface. >On the oterhway round the ofono daemon is not doing the addition of the ppp0 interface. I can reproduce this on an HE910 I just started testing. Basically, the ofono cellular service never reappears to connman after connman disconnects it. # connmanctl technologies /net/connman/technology/cellular Name = Cellular Type = cellular Powered = True Connected = False Tethering = False /net/connman/technology/ethernet Name = Wired Type = ethernet Powered = True Connected = False Tethering = False # connmanctl services *AR Wired ethernet_001122edb058_cable *A T-Mobile cellular_310260008772362_context1 # connmanctl disable ethernet Disabled ethernet # macb f0028000.ethernet eth0: link down # connmanctl services *AR T-Mobile cellular_310260008772362_context1 # connmanctl enable ethernet IPv6: ADDRCONF(NETDEV_UP): eth0: link is not ready Enabled ethernet # macb f0028000.ethernet eth0: link up (100/Full) IPv6: ADDRCONF(NETDEV_CHANGE): eth0: link becomes ready # connmanctl services *AR Wired ethernet_001122edb058_cable # The cellular service will never reappear. ofono debug log: ofonod[1543]: PPP: lcp: pppcp_process_terminate_ack: current state 4:CLOSING ofonod[1543]: PPP: lcp: pppcp_generate_event: current state 4:CLOSING ofonod[1543]: PPP: event: 11 (RTA), action: 802, new_state: 2 (CLOSED) ofonod[1543]: PPP: lcp: pppcp_this_layer_finished: current state 2:CLOSED ofonod[1543]: PPP: gatchat/gatppp.c:ppp_enter_phase() 0 ofonod[1543]: PPP: gatchat/gatppp.c:ppp_dead() ofonod[1543]: drivers/atmodem/gprs-context.c:ppp_disconnect() Reason: 6 ofonod[1543]: Aux: < \r\n+CGEV: ME DEACT IP, "22.226.202.227", 1\r\n ofonod[1543]: Aux: < \r\n ofonod[1543]: Aux: < +CGREG: 0\r\n\r\n+CGEV: NW DETACH\r\n ofonod[1543]: src/gprs.c:ofono_gprs_status_notify() /he910_0 status 0 ofonod[1543]: src/gprs.c:ofono_gprs_detached_notify() /he910_0 ofonod[1543]: Aux: < \r\n ofonod[1543]: Aux: < +CGREG: 0\r\n\r\n+CREG: 1,"2004","076277F",2\r\n ofonod[1543]: src/gprs.c:ofono_gprs_status_notify() /he910_0 status 0 ofonod[1543]: src/network.c:ofono_netreg_status_notify() /he910_0 status 1 tech 2 ofonod[1543]: src/gprs.c:netreg_status_changed() 1 ofonod[1543]: Aux: > AT+COPS=3,2\r ofonod[1543]: Aux: < \r\nOK\r\n ofonod[1543]: Aux: > AT+COPS?\r ofonod[1543]: Aux: < \r\n ofonod[1543]: Aux: < +COPS: 0,2,"310260",2\r\n\r\nOK\r\n ofonod[1543]: drivers/atmodem/network-registration.c:cops_numeric_cb() Cops numeric got mcc: 310, mnc: 260 ofonod[1543]: Aux: > AT+CIND?\r ofonod[1543]: Aux: < \r\n ofonod[1543]: Aux: < +CIND: 0,3,1,0,0,0,0,0,2\r\n\r\nOK\r\n ofonod[1543]: Aux: > AT+COPS=3,0\r ofonod[1543]: Aux: < \r\nOK\r\n ofonod[1543]: Aux: > AT+COPS?\r ofonod[1543]: Aux: < \r\n ofonod[1543]: Aux: < +COPS: 0,0,"T-Mobile",2\r\n\r\nOK\r\n ofonod[1543]: drivers/atmodem/network-registration.c:cops_cb() cops_cb: T-Mobile, 310 260 2 ofonod[1543]: src/network.c:current_operator_callback() 0xcb600, 0xd0cb0 Contexts for that modem still appear when when listing them via dbus: dbus-send --system --print-reply --dest=org.ofono /he910_0 org.ofono.ConnectionManager.GetContexts method return sender=:1.36 -> dest=:1.48 reply_serial=2 array [ struct { object path "/he910_0/context1" array [ dict entry( string "Name" variant string "LTE" ) dict entry( string "Active" variant boolean false ) dict entry( string "Type" variant string "internet" ) <Truncated> Manually trying to activate that context fails: # dbus-send --system --print-reply --dest=org.ofono /he910_0/context1 org.ofono. ConnectionContext.SetProperty string:Active variant:boolean:true Error org.ofono.Error.NotAttached: GPRS is not attached Thanks, Mike

5 years

3
3
0 / 0

bug reactivating primary context?

by Mike Williams

All, Using connman/ofono to connect to a cellular network, the first time activating the GPRS context works. After deactivation, the next activation fails with an unknown error. I believe this is related to this issue: https://lists.01.org/pipermail/ofono/2015-May/015745.html Looking through the code, it looks like at_gprs_activate_primary() fails at: if (g_at_chat_send(gcd->chat, buf, none_prefix, at_cgdcont_cb, gc, NULL) > 0) return; g_at_chat_send() is returning NULL from at_chat_send_common() because the chat command_queue is NULL. See ofono debug trace below with OFONO_PPP_DEBUG and OFONO_AT_DEBUG enabled: ofonod[1366]: PPP: gatchat/gatppp.c:ppp_enter_phase() 4 ofonod[1366]: drivers/atmodem/gprs-context.c:ppp_connect() ofonod[1366]: IP: 21.186.242.106 ofonod[1366]: DNS: 10.177.0.34, 10.168.187.116 ofonod[1366]: src/gprs.c:pri_activate_callback() 0xcd5b0 ofonod[1366]: plugins/udev.c:udev_event() subsystem net add ofonod[1366]: plugins/udev.c:udev_event() subsystem net finished ofonod[1366]: PCUI: < \r\n^MODE: 5,7\r\n ofonod[1366]: plugins/udevng.c:check_modem_list() ofonod[1366]: PCUI: < \r\n^DSFLOWRPT:00000002,000000BB,00000041,0000000000000177,0000000000000082,0010E000,001F4000\r\n ofonod[1366]: drivers/atmodem/gprs-context.c:at_gprs_deactivate_primary() cid 1 ofonod[1366]: PPP: lcp: pppcp_generate_event: current state 9:OPENED ofonod[1366]: PPP: event: 3 (Close), action: 8224, new_state: 4 (CLOSING) ofonod[1366]: PPP: lcp: pppcp_initialize_restart_count: current state 9:OPENED ofonod[1366]: PPP: lcp: pppcp_send_terminate_request: current state 9:OPENED ofonod[1366]: PPP: ipcp: pppcp_generate_event: current state 9:OPENED ofonod[1366]: PPP: event: 1 (Down), action: 201, new_state: 1 (STARTING) ofonod[1366]: PPP: gatchat/gatppp.c:ppp_enter_phase() 5 ofonod[1366]: plugins/udevng.c:remove_device() /sys/devices/virtual/net/ppp0 ofonod[1366]: plugins/udev.c:udev_event() subsystem net remove ofonod[1366]: plugins/udev.c:remove_modem() /devices/virtual/net/ppp0 ofonod[1366]: plugins/udev.c:udev_event() subsystem net finished ofonod[1366]: PPP: lcp: pppcp_process_terminate_ack: current state 4:CLOSING ofonod[1366]: PPP: lcp: pppcp_generate_event: current state 4:CLOSING ofonod[1366]: PPP: event: 11 (RTA), action: 802, new_state: 2 (CLOSED) ofonod[1366]: PPP: lcp: pppcp_this_layer_finished: current state 2:CLOSED ofonod[1366]: PPP: gatchat/gatppp.c:ppp_enter_phase() 0 ofonod[1366]: PCUI: < \r\n^MODE: 5,4\r\n ofonod[1366]: PPP: gatchat/gatppp.c:ppp_dead() ofonod[1366]: drivers/atmodem/gprs-context.c:ppp_disconnect() Reason: 6 ofonod[1366]: drivers/atmodem/gprs-context.c:at_gprs_activate_primary() cid 1 ofonod[1366]: src/gprs.c:pri_activate_callback() 0xcd5b0 ofonod[1366]: src/gprs.c:pri_activate_callback() Activating context failed with error: Unknown error type ofonod[1366]: PCUI: < \r\n^RSSI: 3\r\n ofonod[1366]: src/network.c:ofono_netreg_strength_notify() strength 9 I have a test script that can reproduce this issue 100%. If necessary, I can send it along. This is using ofono 1.16 and connman 1.29 on a custom embedded system generated by buildroot. I have three small patches applied, one for ofono I got from the mailing list to support the e173, another for ofono to allow duplicate APNs, and a third for connman to allow autoconnecting cellular modems by specifying 'cellular' in DefaultAutoConnectTechnologies. Unfortunately, I need all three to enable my setup so I cannot test a pure source release. Thanks, Mike

5 years

3
10
0 / 0

[PATCH] Connecting a phone with mpty call does not trigger CLCC polling

by Kuba Pawlak

If there is more then one active or held call, we are in mpty calls. We won't get indicator update if any of them is released by CHLD=1x. So we have to poll it. --- drivers/hfpmodem/voicecall.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/hfpmodem/voicecall.c b/drivers/hfpmodem/voicecall.c index afeb35f..5d044a9 100644 --- a/drivers/hfpmodem/voicecall.c +++ b/drivers/hfpmodem/voicecall.c @@ -1134,6 +1134,10 @@ static void hfp_clcc_cb(gboolean ok, GAtResult *result, gpointer user_data) struct ofono_voicecall *vc = user_data; struct voicecall_data *vd = ofono_voicecall_get_data(vc); unsigned int mpty_ids; + GSList *n; + struct ofono_call *nc; + unsigned int num_active = 0; + unsigned int num_held = 0; if (!ok) return; @@ -1142,6 +1146,22 @@ static void hfp_clcc_cb(gboolean ok, GAtResult *result, gpointer user_data) g_slist_foreach(vd->calls, voicecall_notify, vc); ofono_voicecall_mpty_hint(vc, mpty_ids); + + n = vd->calls; + + while (n) { + nc = n ? n->data : NULL; + if (nc && (nc->status == CALL_STATUS_ACTIVE)) + num_active++; + + if (nc && (nc->status == CALL_STATUS_HELD)) + num_held++; + + n = n->next; + } + + if ((num_active > 1 || num_held > 1) && !vd->clcc_source) + vd->clcc_source = g_timeout_add(POLL_CLCC_INTERVAL, poll_clcc, vc); } static void hfp_voicecall_initialized(gboolean ok, GAtResult *result, -- 1.7.11.7 Intel GmbH Dornacher Strasse 1 85622 Feldkirchen/Muenchen, Deutschland Sitz der Gesellschaft: Feldkirchen bei Muenchen Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk Registergericht: Muenchen HRB 47456 Ust.-IdNr./VAT Registration No.: DE129385895 Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052

5 years

2
1
0 / 0

[PATCH] gprs: Add comment to gprs_reset_contexts

by Alfonso Sanchez-Beato

--- src/gprs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/gprs.c b/src/gprs.c index 9c15abf..f21fe6e 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -2318,6 +2318,11 @@ static DBusMessage *gprs_reset_contexts(DBusConnection *conn, if (gprs->pending) return __ofono_error_busy(msg); + /* + * We want __ofono_error_busy to take precedence over + * __ofono_error_not_allowed errors, so we check it first. + */ + for (l = gprs->contexts; l; l = l->next) { struct pri_context *ctx = l->data; -- 2.1.4

5 years

2
1
0 / 0

[PATCH 0/3] Add method to force re-provisioning of contexts

by Alfonso Sanchez-Beato

This series of patches implement a way to force re-provisioning of the ConnectionManager contexts. Although the idea is similar to a previous approach which was posted to the list, it is quite different as it wipes all existing contexts and then runs the provisioning code. The implemented method checks different conditions to make the reset safe for clients. Alfonso Sanchez-Beato (3): gprs: Add DBus method to reset contexts doc: Add description for ResetContexts method test: Add script for resetting contexts doc/connman-api.txt | 10 ++++ src/gprs.c | 144 +++++++++++++++++++++++++++++++++++++++++++--------- test/reset-contexts | 20 ++++++++ 3 files changed, 150 insertions(+), 24 deletions(-) create mode 100644 test/reset-contexts -- 2.1.4

5 years

2
7
0 / 0

[PATCH 1/4] gprs: Add DBus method to reset contexts

by Alfonso Sanchez-Beato

Add DBus method that removes the current contexts and re-provisions using the APN database. --- src/gprs.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 118 insertions(+), 24 deletions(-) diff --git a/src/gprs.c b/src/gprs.c index 05ab499..64fa6f1 100644 --- a/src/gprs.c +++ b/src/gprs.c @@ -149,6 +149,8 @@ struct pri_context { static void gprs_netreg_update(struct ofono_gprs *gprs); static void gprs_deactivate_next(struct ofono_gprs *gprs); +static void provision_contexts(struct ofono_gprs *gprs, const char *mcc, + const char *mnc, const char *spn); static GSList *g_drivers = NULL; static GSList *g_context_drivers = NULL; @@ -1885,6 +1887,36 @@ static struct pri_context *add_context(struct ofono_gprs *gprs, return context; } +static void send_context_added_signal(struct ofono_gprs *gprs, + struct pri_context *context, + DBusConnection *conn) +{ + const char *path; + DBusMessage *signal; + DBusMessageIter iter; + DBusMessageIter dict; + + path = __ofono_atom_get_path(gprs->atom); + signal = dbus_message_new_signal(path, + OFONO_CONNECTION_MANAGER_INTERFACE, + "ContextAdded"); + if (!signal) + return; + + dbus_message_iter_init_append(signal, &iter); + + path = context->path; + dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, &path); + + dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, + OFONO_PROPERTIES_ARRAY_SIGNATURE, + &dict); + append_context_properties(context, &dict); + dbus_message_iter_close_container(&iter, &dict); + + g_dbus_send_message(conn, signal); +} + static DBusMessage *gprs_add_context(DBusConnection *conn, DBusMessage *msg, void *data) { @@ -1894,7 +1926,6 @@ static DBusMessage *gprs_add_context(DBusConnection *conn, const char *name; const char *path; enum ofono_gprs_context_type type; - DBusMessage *signal; if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_STRING, &typestr, DBUS_TYPE_INVALID)) @@ -1916,29 +1947,7 @@ static DBusMessage *gprs_add_context(DBusConnection *conn, g_dbus_send_reply(conn, msg, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID); - path = __ofono_atom_get_path(gprs->atom); - signal = dbus_message_new_signal(path, - OFONO_CONNECTION_MANAGER_INTERFACE, - "ContextAdded"); - - if (signal) { - DBusMessageIter iter; - DBusMessageIter dict; - - dbus_message_iter_init_append(signal, &iter); - - path = context->path; - dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH, - &path); - - dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, - OFONO_PROPERTIES_ARRAY_SIGNATURE, - &dict); - append_context_properties(context, &dict); - dbus_message_iter_close_container(&iter, &dict); - - g_dbus_send_message(conn, signal); - } + send_context_added_signal(gprs, context, conn); return NULL; } @@ -2173,6 +2182,89 @@ static DBusMessage *gprs_get_contexts(DBusConnection *conn, return reply; } +static void remove_non_active_context(struct ofono_gprs *gprs, + struct pri_context *ctx, DBusConnection *conn) +{ + char *path; + const char *atompath; + + if (gprs->settings) { + g_key_file_remove_group(gprs->settings, ctx->key, NULL); + storage_sync(gprs->imsi, SETTINGS_STORE, gprs->settings); + } + + /* Make a backup copy of path for signal emission below */ + path = g_strdup(ctx->path); + + context_dbus_unregister(ctx); + gprs->contexts = g_slist_remove(gprs->contexts, ctx); + + atompath = __ofono_atom_get_path(gprs->atom); + g_dbus_emit_signal(conn, atompath, OFONO_CONNECTION_MANAGER_INTERFACE, + "ContextRemoved", DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_INVALID); + g_free(path); +} + +static DBusMessage *gprs_reset_contexts(DBusConnection *conn, + DBusMessage *msg, void *data) +{ + struct ofono_gprs *gprs = data; + struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom); + struct ofono_sim *sim = __ofono_atom_find(OFONO_ATOM_TYPE_SIM, modem); + DBusMessage *reply; + GSList *l; + + if (gprs->pending) + return __ofono_error_busy(msg); + + for (l = gprs->contexts; l; l = l->next) { + struct pri_context *ctx = l->data; + + if (ctx->pending) + return __ofono_error_busy(msg); + } + + if (!dbus_message_get_args(msg, NULL, DBUS_TYPE_INVALID)) + return __ofono_error_invalid_args(msg); + + if (gprs->powered) + return __ofono_error_not_allowed(msg); + + for (l = gprs->contexts; l; l = l->next) { + struct pri_context *ctx = l->data; + + if (ctx->active) + return __ofono_error_not_allowed(msg); + } + + reply = dbus_message_new_method_return(msg); + if (reply == NULL) + return NULL; + + /* Remove first the current contexts, re-provision after */ + + while (gprs->contexts != NULL) { + struct pri_context *ctx = gprs->contexts->data; + remove_non_active_context(gprs, ctx, conn); + } + + gprs->last_context_id = 0; + + provision_contexts(gprs, ofono_sim_get_mcc(sim), + ofono_sim_get_mnc(sim), ofono_sim_get_spn(sim)); + + if (gprs->contexts == NULL) /* Automatic provisioning failed */ + add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET); + + for (l = gprs->contexts; l; l = l->next) { + struct pri_context *ctx = l->data; + send_context_added_signal(gprs, ctx, conn); + } + + return reply; +} + static const GDBusMethodTable manager_methods[] = { { GDBUS_METHOD("GetProperties", NULL, GDBUS_ARGS({ "properties", "a{sv}" }), @@ -2192,6 +2284,8 @@ static const GDBusMethodTable manager_methods[] = { { GDBUS_METHOD("GetContexts", NULL, GDBUS_ARGS({ "contexts_with_properties", "a(oa{sv})" }), gprs_get_contexts) }, + { GDBUS_ASYNC_METHOD("ResetContexts", NULL, NULL, + gprs_reset_contexts) }, { } }; -- 2.1.4

5 years

2
4
0 / 0

Query on ppp0 interface for HE910 device

by Kallumari Nagaraja Rao, RammohanX

Dear Sir, We are using CONNMAN/OFONO for wireless communication and network management. Whenever the connman daemon switches from cellular to wifi automatically, ofonod removes the ppp0 interface. On the oterhway round the ofono daemon is not doing the addition of the ppp0 interface. I have been manually activating the context for get it right. I am using HE910 modem with ofono version 1.16. Regards, Ram

5 years

2
1
0 / 0

[PATCH] cinterion: Correct use of freed structure

by Alex J Lennon

On error struct cb_data *cbd was used after in cinterion_set_online after already being freed. --- plugins/cinterion.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/cinterion.c b/plugins/cinterion.c index 6d85189..a18b9fe 100644 --- a/plugins/cinterion.c +++ b/plugins/cinterion.c @@ -166,9 +166,9 @@ static void cinterion_set_online(struct ofono_modem *modem, ofono_bool_t online, if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free)) return; - g_free(cbd); - CALLBACK_WITH_FAILURE(cb, cbd->data); + + g_free(cbd); } static void cinterion_pre_sim(struct ofono_modem *modem) -- 1.9.1

5 years

2
1
0 / 0

[PATCH 1/4] tc65: Replace tc65 plugin with cinterion plugin

by Alex J Lennon

On the basis that tc6x and other Cinterion devices will likely have similar firmware requirements, provide a generic Cinterion plugin which is functionally identical to the replaced tc65 plugin. The udev implementation retains support for "tc65" name for backwards compatibility, and adds support for the new "cinterion" name. --- Makefile.am | 4 +- plugins/cinterion.c | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/tc65.c | 245 --------------------------------------------------- plugins/udev.c | 9 +- 4 files changed, 256 insertions(+), 250 deletions(-) create mode 100644 plugins/cinterion.c delete mode 100644 plugins/tc65.c diff --git a/Makefile.am b/Makefile.am index 22249c4..113a2d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -390,8 +390,8 @@ builtin_sources += plugins/stemgr.c builtin_modules += caif builtin_sources += plugins/caif.c -builtin_modules += tc65 -builtin_sources += plugins/tc65.c +builtin_modules += cinterion +builtin_sources += plugins/cinterion.c builtin_modules += nokia builtin_sources += plugins/nokia.c diff --git a/plugins/cinterion.c b/plugins/cinterion.c new file mode 100644 index 0000000..7f14fa0 --- /dev/null +++ b/plugins/cinterion.c @@ -0,0 +1,248 @@ +/* + * + * 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 <glib.h> +#include <gatchat.h> +#include <gattty.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/call-barring.h> +#include <ofono/call-forwarding.h> +#include <ofono/call-meter.h> +#include <ofono/call-settings.h> +#include <ofono/devinfo.h> +#include <ofono/message-waiting.h> +#include <ofono/netreg.h> +#include <ofono/phonebook.h> +#include <ofono/sim.h> +#include <ofono/sms.h> +#include <ofono/ussd.h> +#include <ofono/voicecall.h> + +#include <drivers/atmodem/atutil.h> + +#include <ofono/gprs.h> +#include <ofono/gprs-context.h> + +static int cinterion_probe(struct ofono_modem *modem) +{ + return 0; +} + +static void cinterion_remove(struct ofono_modem *modem) +{ +} + +static void cinterion_debug(const char *str, void *user_data) +{ + const char *prefix = user_data; + + ofono_info("%s%s", prefix, str); +} + +static int cinterion_enable(struct ofono_modem *modem) +{ + GAtChat *chat; + GIOChannel *channel; + GAtSyntax *syntax; + GHashTable *options; + const char *device; + + DBG("%p", modem); + + options = g_hash_table_new(g_str_hash, g_str_equal); + if (options == NULL) + return -ENOMEM; + + device = ofono_modem_get_string(modem, "Device"); + if (device == NULL) + return -EINVAL; + + g_hash_table_insert(options, "Baud", "115200"); + g_hash_table_insert(options, "StopBits", "1"); + g_hash_table_insert(options, "DataBits", "8"); + g_hash_table_insert(options, "Parity", "none"); + g_hash_table_insert(options, "XonXoff", "off"); + g_hash_table_insert(options, "RtsCts", "on"); + g_hash_table_insert(options, "Local", "on"); + g_hash_table_insert(options, "Read", "on"); + + channel = g_at_tty_open(device, options); + g_hash_table_destroy(options); + + if (channel == NULL) + return -EIO; + + /* + * (Cinterion plugin is based on tc65 plugin. Comment left in but may + * not be applicable in the general case) + * + * TC65 works almost as the 27.007 says. But for example after + * AT+CRSM the modem replies with the data in the queried EF and + * writes three pairs of <CR><LF> after the data and before OK. + */ + 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 == NULL) + return -ENOMEM; + + if (getenv("OFONO_AT_DEBUG")) + g_at_chat_set_debug(chat, cinterion_debug, ""); + + ofono_modem_set_data(modem, chat); + + return 0; +} + +static int cinterion_disable(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_modem_set_data(modem, NULL); + + g_at_chat_send(chat, "AT+CFUN=7", NULL, NULL, NULL, NULL); + + g_at_chat_unref(chat); + + return 0; +} + +static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data) +{ + struct cb_data *cbd = user_data; + ofono_modem_online_cb_t cb = cbd->cb; + struct ofono_error error; + + decode_at_error(&error, g_at_result_final_response(result)); + + cb(&error, cbd->data); +} + +static void cinterion_set_online(struct ofono_modem *modem, ofono_bool_t online, + ofono_modem_online_cb_t cb, void *user_data) +{ + GAtChat *chat = ofono_modem_get_data(modem); + struct cb_data *cbd = cb_data_new(cb, user_data); + char const *command = online ? "AT+CFUN=1" : "AT+CFUN=7"; + + DBG("modem %p %s", modem, online ? "online" : "offline"); + + if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free)) + return; + + g_free(cbd); + + CALLBACK_WITH_FAILURE(cb, cbd->data); +} + +static void cinterion_pre_sim(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + struct ofono_sim *sim; + + DBG("%p", modem); + + ofono_devinfo_create(modem, 0, "atmodem", chat); + sim = ofono_sim_create(modem, 0, "atmodem", chat); + ofono_voicecall_create(modem, 0, "atmodem", chat); + + if (sim) + ofono_sim_inserted_notify(sim, TRUE); +} + +static void cinterion_post_sim(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + + DBG("%p", modem); + + ofono_phonebook_create(modem, 0, "atmodem", chat); + + ofono_sms_create(modem, 0, "atmodem", chat); +} + +static void cinterion_post_online(struct ofono_modem *modem) +{ + GAtChat *chat = ofono_modem_get_data(modem); + struct ofono_message_waiting *mw; + struct ofono_gprs *gprs; + struct ofono_gprs_context *gc; + + DBG("%p", modem); + + ofono_ussd_create(modem, 0, "atmodem", chat); + ofono_call_forwarding_create(modem, 0, "atmodem", chat); + ofono_call_settings_create(modem, 0, "atmodem", chat); + ofono_netreg_create(modem, 0, "atmodem", chat); + ofono_call_meter_create(modem, 0, "atmodem", chat); + ofono_call_barring_create(modem, 0, "atmodem", chat); + + gprs = ofono_gprs_create(modem, 0, "atmodem", chat); + gc = ofono_gprs_context_create(modem, 0, "atmodem", chat); + + if (gprs && gc) + ofono_gprs_add_context(gprs, gc); + + mw = ofono_message_waiting_create(modem); + if (mw) + ofono_message_waiting_register(mw); +} + +static struct ofono_modem_driver cinterion_driver = { + .name = "cinterion", + .probe = cinterion_probe, + .remove = cinterion_remove, + .enable = cinterion_enable, + .disable = cinterion_disable, + .set_online = cinterion_set_online, + .pre_sim = cinterion_pre_sim, + .post_sim = cinterion_post_sim, + .post_online = cinterion_post_online, +}; + +static int cinterion_init(void) +{ + return ofono_modem_driver_register(&cinterion_driver); +} + +static void cinterion_exit(void) +{ + ofono_modem_driver_unregister(&cinterion_driver); +} + +OFONO_PLUGIN_DEFINE(cinterion, "Cinterion driver plugin", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, cinterion_init, cinterion_exit) diff --git a/plugins/tc65.c b/plugins/tc65.c deleted file mode 100644 index eb64b89..0000000 --- a/plugins/tc65.c +++ /dev/null @@ -1,245 +0,0 @@ -/* - * - * 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 <glib.h> -#include <gatchat.h> -#include <gattty.h> - -#define OFONO_API_SUBJECT_TO_CHANGE -#include <ofono/plugin.h> -#include <ofono/log.h> -#include <ofono/modem.h> -#include <ofono/call-barring.h> -#include <ofono/call-forwarding.h> -#include <ofono/call-meter.h> -#include <ofono/call-settings.h> -#include <ofono/devinfo.h> -#include <ofono/message-waiting.h> -#include <ofono/netreg.h> -#include <ofono/phonebook.h> -#include <ofono/sim.h> -#include <ofono/sms.h> -#include <ofono/ussd.h> -#include <ofono/voicecall.h> - -#include <drivers/atmodem/atutil.h> - -#include <ofono/gprs.h> -#include <ofono/gprs-context.h> - -static int tc65_probe(struct ofono_modem *modem) -{ - return 0; -} - -static void tc65_remove(struct ofono_modem *modem) -{ -} - -static void tc65_debug(const char *str, void *user_data) -{ - const char *prefix = user_data; - - ofono_info("%s%s", prefix, str); -} - -static int tc65_enable(struct ofono_modem *modem) -{ - GAtChat *chat; - GIOChannel *channel; - GAtSyntax *syntax; - GHashTable *options; - const char *device; - - DBG("%p", modem); - - options = g_hash_table_new(g_str_hash, g_str_equal); - if (options == NULL) - return -ENOMEM; - - device = ofono_modem_get_string(modem, "Device"); - if (device == NULL) - return -EINVAL; - - g_hash_table_insert(options, "Baud", "115200"); - g_hash_table_insert(options, "StopBits", "1"); - g_hash_table_insert(options, "DataBits", "8"); - g_hash_table_insert(options, "Parity", "none"); - g_hash_table_insert(options, "XonXoff", "off"); - g_hash_table_insert(options, "RtsCts", "on"); - g_hash_table_insert(options, "Local", "on"); - g_hash_table_insert(options, "Read", "on"); - - channel = g_at_tty_open(device, options); - g_hash_table_destroy(options); - - if (channel == NULL) - return -EIO; - - /* - * TC65 works almost as the 27.007 says. But for example after - * AT+CRSM the modem replies with the data in the queried EF and - * writes three pairs of <CR><LF> after the data and before OK. - */ - 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 == NULL) - return -ENOMEM; - - if (getenv("OFONO_AT_DEBUG")) - g_at_chat_set_debug(chat, tc65_debug, ""); - - ofono_modem_set_data(modem, chat); - - return 0; -} - -static int tc65_disable(struct ofono_modem *modem) -{ - GAtChat *chat = ofono_modem_get_data(modem); - - DBG("%p", modem); - - ofono_modem_set_data(modem, NULL); - - g_at_chat_send(chat, "AT+CFUN=7", NULL, NULL, NULL, NULL); - - g_at_chat_unref(chat); - - return 0; -} - -static void set_online_cb(gboolean ok, GAtResult *result, gpointer user_data) -{ - struct cb_data *cbd = user_data; - ofono_modem_online_cb_t cb = cbd->cb; - struct ofono_error error; - - decode_at_error(&error, g_at_result_final_response(result)); - - cb(&error, cbd->data); -} - -static void tc65_set_online(struct ofono_modem *modem, ofono_bool_t online, - ofono_modem_online_cb_t cb, void *user_data) -{ - GAtChat *chat = ofono_modem_get_data(modem); - struct cb_data *cbd = cb_data_new(cb, user_data); - char const *command = online ? "AT+CFUN=1" : "AT+CFUN=7"; - - DBG("modem %p %s", modem, online ? "online" : "offline"); - - if (g_at_chat_send(chat, command, NULL, set_online_cb, cbd, g_free)) - return; - - g_free(cbd); - - CALLBACK_WITH_FAILURE(cb, cbd->data); -} - -static void tc65_pre_sim(struct ofono_modem *modem) -{ - GAtChat *chat = ofono_modem_get_data(modem); - struct ofono_sim *sim; - - DBG("%p", modem); - - ofono_devinfo_create(modem, 0, "atmodem", chat); - sim = ofono_sim_create(modem, 0, "atmodem", chat); - ofono_voicecall_create(modem, 0, "atmodem", chat); - - if (sim) - ofono_sim_inserted_notify(sim, TRUE); -} - -static void tc65_post_sim(struct ofono_modem *modem) -{ - GAtChat *chat = ofono_modem_get_data(modem); - - DBG("%p", modem); - - ofono_phonebook_create(modem, 0, "atmodem", chat); - - ofono_sms_create(modem, 0, "atmodem", chat); -} - -static void tc65_post_online(struct ofono_modem *modem) -{ - GAtChat *chat = ofono_modem_get_data(modem); - struct ofono_message_waiting *mw; - struct ofono_gprs *gprs; - struct ofono_gprs_context *gc; - - DBG("%p", modem); - - ofono_ussd_create(modem, 0, "atmodem", chat); - ofono_call_forwarding_create(modem, 0, "atmodem", chat); - ofono_call_settings_create(modem, 0, "atmodem", chat); - ofono_netreg_create(modem, 0, "atmodem", chat); - ofono_call_meter_create(modem, 0, "atmodem", chat); - ofono_call_barring_create(modem, 0, "atmodem", chat); - - gprs = ofono_gprs_create(modem, 0, "atmodem", chat); - gc = ofono_gprs_context_create(modem, 0, "atmodem", chat); - - if (gprs && gc) - ofono_gprs_add_context(gprs, gc); - - mw = ofono_message_waiting_create(modem); - if (mw) - ofono_message_waiting_register(mw); -} - -static struct ofono_modem_driver tc65_driver = { - .name = "tc65", - .probe = tc65_probe, - .remove = tc65_remove, - .enable = tc65_enable, - .disable = tc65_disable, - .set_online = tc65_set_online, - .pre_sim = tc65_pre_sim, - .post_sim = tc65_post_sim, - .post_online = tc65_post_online, -}; - -static int tc65_init(void) -{ - return ofono_modem_driver_register(&tc65_driver); -} - -static void tc65_exit(void) -{ - ofono_modem_driver_unregister(&tc65_driver); -} - -OFONO_PLUGIN_DEFINE(tc65, "Cinterion TC65 driver plugin", VERSION, - OFONO_PLUGIN_PRIORITY_DEFAULT, tc65_init, tc65_exit) diff --git a/plugins/udev.c b/plugins/udev.c index a78cd41..6330228 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -192,7 +192,7 @@ static void add_wavecom(struct ofono_modem *modem, ofono_modem_register(modem); } -static void add_tc65(struct ofono_modem *modem, +static void add_cinterion(struct ofono_modem *modem, struct udev_device *udev_device) { const char *devnode; @@ -243,6 +243,9 @@ static void add_modem(struct udev_device *udev_device) if (devpath == NULL) return; + if(g_strcmp0(driver, "tc65") == 0) + driver = "cinterion"; + modem = ofono_modem_create(NULL, driver); if (modem == NULL) return; @@ -305,8 +308,8 @@ done: add_isi(modem, udev_device); else if (g_strcmp0(driver, "calypso") == 0) add_calypso(modem, udev_device); - else if (g_strcmp0(driver, "tc65") == 0) - add_tc65(modem, udev_device); + else if (g_strcmp0(driver, "cinterion") == 0) + add_cinterion(modem, udev_device); else if (g_strcmp0(driver, "nokiacdma") == 0) add_nokiacdma(modem, udev_device); else if (g_strcmp0(driver, "sim900") == 0) -- 1.9.1

5 years

3
10
0 / 0

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

ofono May 2015