[PATCH_v4 0/5] Private network request to ConnMan
by Guillaume Zajac
Hi,
Changelog from v3 is:
- Add private-network source/include
- ConnMan plugin is independant from emulator
- Each application that need VPN will pass a callback as argument
when private network is requested. This callback will contain the
private network settings.
Guillaume Zajac (5):
gatppp: Add new contructor to use external fd
private-network: add callback typedef drivers and settings
private-network: add request/release functions and new feature to
Makefile.am
emulator: add request/release private network calls
connman: add plugin in oFono to request request/release private
network
Makefile.am | 10 +-
gatchat/gatppp.c | 33 +++++-
gatchat/gatppp.h | 1 +
gatchat/ppp.h | 2 +-
gatchat/ppp_net.c | 40 ++++---
include/private-network.h | 59 +++++++++
plugins/connman.c | 297 +++++++++++++++++++++++++++++++++++++++++++++
src/emulator.c | 49 ++++++--
src/ofono.h | 6 +
src/private-network.c | 89 ++++++++++++++
10 files changed, 556 insertions(+), 30 deletions(-)
create mode 100644 include/private-network.h
create mode 100644 plugins/connman.c
create mode 100644 src/private-network.c
2 months, 1 week
ofono with sim5320 module
by David Ashley
Hello, I'm at my wits' end trying to get ofono working with the
sim5320 module. I'm using the plugins/sim900.c module as a starting
point. I think the issue has something to do with the difference
between the MUX functionality between the 900 and the 5320. The sim900
supports the elaborate parameters sent on the
AT+CMUX=0,x,x,x,x, etc.
but the SIM5320 only supports
AT+CMUX=0
There's that... but also the way the sim900 plugin creates a
SETUP_DLC, initiates muxing, then deletes the setup DLC and creates 4
new DLC's... it didn't work for the sim5320 until I remapped the DLC's
somewhat like this:
#define NUM_DLC 4
#define VOICE_DLC 2
#define NETREG_DLC 1
//#define SMS_DLC 2
#define GPRS_DLC 3
#define SETUP_DLC 0
static char *dlc_prefixes[NUM_DLC] = {
[VOICE_DLC]="Voice: ",
[NETREG_DLC]="Net: ",
// [SMS_DLC]= "SMS: ",
[GPRS_DLC]= "GPRS: " ,
[SETUP_DLC]= "Setup: ",
};
Note I have to eliminate the SMS_DLC usage later in sim5320_post_sim:
// ofono_sms_create(modem, OFONO_VENDOR_SIMCOM, "atmodem",
// data->dlcs[SMS_DLC]);
OK everything is *ALMOST* working. ofonod interacts fine with
connmand, connmand tells ofonod to activate the sim5320, which
actually establishes a ppp connection and sets up a ppp device:
ppp0 Link encap:UNSPEC HWaddr 00-00-00-00-00-00-00-00-00-00-00-00-00-00-0
inet addr:30.97.132.47 P-t-P:30.97.132.47 Mask:255.255.255.255
UP POINTOPOINT RUNNING NOARP MULTICAST MTU:1500 Metric:1
RX packets:0 errors:0 dropped:0 overruns:0 frame:0
TX packets:2 errors:0 dropped:0 overruns:0 carrier:0
collisions:0 txqueuelen:500
RX bytes:0 (0.0 B) TX bytes:124 (124.0 B)
Here's the rub: No matter what I do, I never get any RX packets from
that ppp device, and even when it appears to TX packets (I'm trying to
ping out) the machine on the internet isn't actually receiving them.
I'm running on a beaglebone with a custom board with a sim5320 module on it.
I have no idea what to try... Any advice would be appreciated...
Thanks very much!!!!
-Dave
3 years, 9 months
Add Support for Sierra MC73xx
by Martin Chaplet
Hi everybody,
I'm trying to use MC7304 chip with ofono (yes, exactly like Dirk Meul
few months ago).
It's a QMI-interfaced GSM.
I've used Bjørn Mork's patches and with a little hack in setup_sierra
(forcing qmi device name), the modem is "detected" and initialized.
... But the "gprs" feature is not detected !
I'm a newbie on ofono project ... Can anyone can explain me how the
features detection is done please ?
FYI, Please find below ofono debug log :
ofonod[1110]: src/modem.c:ofono_modem_create() name: (null), type: sierra
ofonod[1110]: plugins/udevng.c:setup_sierra()
/sys/devices/soc0/soc.0/2100000.aips-bus/2184000.usb/ci_hdrc.0/usb1/1-1
ofonod[1110]: plugins/udevng.c:setup_sierra() /dev/ttyUSB0 255/255/255
00 (null)
ofonod[1110]: plugins/udevng.c:setup_sierra() /dev/ttyUSB1 255/0/0 02 (null)
ofonod[1110]: plugins/udevng.c:setup_sierra() /dev/ttyUSB2 255/0/0 03 (null)
ofonod[1110]: plugins/udevng.c:setup_sierra() wwan0 255/255/255 08 (null)
ofonod[1110]: plugins/udevng.c:setup_sierra() wwan1 255/255/255 0a (null)
ofonod[1110]: plugins/udevng.c:setup_sierra() wwan2 255/255/255 0b (null)
ofonod[1110]: src/modem.c:ofono_modem_set_driver() type: gobi
ofonod[1110]: plugins/udevng.c:setup_sierra() modem=/dev/ttyUSB2
app=(null) net=wwan0 diag=/dev/ttyUSB0 qmi=/dev/cdc-wdm1
ofonod[1110]: src/modem.c:set_modem_property() modem 0x20d4d28 property
Device
ofonod[1110]: src/modem.c:set_modem_property() modem 0x20d4d28 property
Modem
ofonod[1110]: src/modem.c:set_modem_property() modem 0x20d4d28 property App
ofonod[1110]: src/modem.c:set_modem_property() modem 0x20d4d28 property Diag
ofonod[1110]: src/modem.c:set_modem_property() modem 0x20d4d28 property
NetworkInterface
ofonod[1110]: src/modem.c:ofono_modem_register() 0x20d4d28
ofonod[1110]: plugins/gobi.c:gobi_probe() 0x20d4d28
ofonod[1110]: src/modem.c:emit_modem_added() 0x20d4d28
ofonod[1110]: src/modem.c:call_modemwatches() 0x20d4d28 added:1
ofonod[1110]: plugins/smart-messaging.c:modem_watch() modem: 0x20d4d28,
added: 1
ofonod[1110]: plugins/push-notification.c:modem_watch() modem:
0x20d4d28, added: 1
ofonod[1110]: plugins/gobi.c:gobi_enable() 0x20d4d28
ofonod[1110]: src/modem.c:get_modem_property() modem 0x20d4d28 property
Device
ofonod[1110]: plugins/gobi.c:discover_cb()
ofonod[1110]: plugins/gobi.c:discover_cb() WDS 1.36
ofonod[1110]: plugins/gobi.c:discover_cb() DMS 1.14
ofonod[1110]: plugins/gobi.c:discover_cb() NAS 1.25
ofonod[1110]: plugins/gobi.c:discover_cb() QOS 1.3
ofonod[1110]: plugins/gobi.c:discover_cb() WMS 1.10
ofonod[1110]: plugins/gobi.c:discover_cb() PDS 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() AUTH 1.2
ofonod[1110]: plugins/gobi.c:discover_cb() AT 1.2
ofonod[1110]: plugins/gobi.c:discover_cb() VOICE 2.1
ofonod[1110]: plugins/gobi.c:discover_cb() CAT 2.16
ofonod[1110]: plugins/gobi.c:discover_cb() UIM 1.25
ofonod[1110]: plugins/gobi.c:discover_cb() PBM 1.4
ofonod[1110]: plugins/gobi.c:discover_cb() SAR 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() TS 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() TMS 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.10
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:discover_cb() (null) 1.0
ofonod[1110]: plugins/gobi.c:create_dms_cb()
ofonod[1110]: plugins/gobi.c:get_caps_cb()
ofonod[1110]: plugins/gobi.c:get_caps_cb() service capabilities 4
ofonod[1110]: plugins/gobi.c:get_caps_cb() sim supported 2
ofonod[1110]: plugins/gobi.c:get_caps_cb() radio = 4
ofonod[1110]: plugins/gobi.c:get_caps_cb() radio = 5
ofonod[1110]: plugins/gobi.c:get_caps_cb() radio = 8
ofonod[1110]: plugins/gobi.c:get_oper_mode_cb()
ofonod[1110]: src/modem.c:modem_change_state() old state: 0, new state: 1
ofonod[1110]: plugins/gobi.c:gobi_pre_sim() 0x20d4d28
ofonod[1110]: drivers/qmimodem/devinfo.c:qmi_devinfo_probe()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_sim_probe()
ofonod[1110]: drivers/qmimodem/voicecall.c:qmi_voicecall_probe()
ofonod[1110]:
drivers/qmimodem/location-reporting.c:qmi_location_reporting_probe()
ofonod[1110]: drivers/qmimodem/devinfo.c:create_dms_cb()
ofonod[1110]: drivers/qmimodem/devinfo.c:qmi_query_manufacturer()
ofonod[1110]: drivers/qmimodem/voicecall.c:create_voice_cb()
ofonod[1110]: drivers/qmimodem/sim.c:create_uim_cb()
ofonod[1110]: drivers/qmimodem/location-reporting.c:create_pds_cb()
ofonod[1110]: drivers/qmimodem/devinfo.c:string_cb()
ofonod[1110]: drivers/qmimodem/devinfo.c:qmi_query_model()
ofonod[1110]: drivers/qmimodem/sim.c:event_registration_cb()
ofonod[1110]: drivers/qmimodem/sim.c:event_registration_cb() event mask
0x0003
ofonod[1110]: drivers/qmimodem/location-reporting.c:set_event_cb()
ofonod[1110]: drivers/qmimodem/devinfo.c:string_cb()
ofonod[1110]: drivers/qmimodem/devinfo.c:qmi_query_revision()
ofonod[1110]: drivers/qmimodem/sim.c:get_card_status_cb()
ofonod[1110]: src/sim.c:ofono_sim_add_state_watch() 0x20d9aa0
ofonod[1110]: src/sim.c:ofono_sim_add_state_watch() 0x20d9aa0
ofonod[1110]: src/sim.c:ofono_sim_add_state_watch() 0x20d9aa0
ofonod[1110]: drivers/qmimodem/sim.c:get_card_status_cb()
ofono_sim_register OK
ofonod[1110]: drivers/qmimodem/sim.c:get_card_status_cb() exit func
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6fb7 path len 0
ofonod[1110]: drivers/qmimodem/devinfo.c:string_cb()
ofonod[1110]: drivers/qmimodem/devinfo.c:qmi_query_serial()
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: src/voicecall.c:ecc_g2_read_cb() 0
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6fb7 path len 0
ofonod[1110]: drivers/qmimodem/devinfo.c:get_ids_cb()
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: src/voicecall.c:ecc_g3_read_cb() 0
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x2fe2 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_transparent() file id
0x2fe2 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:read_generic_cb()
ofonod[1110]: src/simfs.c:sim_fs_op_read_block_cb() bufoff: 0, dataoff:
0, tocopy: 10
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6f05 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x2f05 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_transparent() file id
0x2f05 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:read_generic_cb()
ofonod[1110]: src/simfs.c:sim_fs_op_read_block_cb() bufoff: 0, dataoff:
0, tocopy: 10
ofonod[1110]: drivers/qmimodem/sim.c:qmi_query_passwd_state() passwd state 0
ofonod[1110]: src/sim.c:sim_pin_query_cb() sim->pin_type: 0, pin_type: 0
ofonod[1110]: drivers/qmimodem/sim.c:qmi_query_pin_retries() passwd state 0
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6fae path len 0
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6fad path len 0
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6f16 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_attributes() file id
0x6f38 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:get_file_attributes_cb()
ofonod[1110]: drivers/qmimodem/sim.c:qmi_read_transparent() file id
0x6f07 path len 0
ofonod[1110]: drivers/qmimodem/sim.c:read_generic_cb()
ofonod[1110]: Unable to read IMSI, emergency calls only
and the result of list-modem test script :
/usr/lib/ofono/test # ./list-modems
[ /sierra_1 ]
Features = sim gps
Emergency = 0
Powered = 1
Lockdown = 0
Interfaces = org.ofono.SimManager org.ofono.LocationReporting
org.ofono.VoiceCallManager
Online = 0
Model = MC7304
Revision = SWI9X15C_05.05.58.00 r27038 carmd-fwbuild1 2015/03/04
21:30:23
Type = hardware
Serial = 0
Manufacturer = Sierra Wireless, Incorporated
[ org.ofono.SimManager ]
Retries = [pin2 = 2] [puk2 = 10] [pin = 3] [puk = 10]
FixedDialing = 0
SubscriberNumbers =
PreferredLanguages = fr en de es it
BarredDialing = 0
CardIdentifier = 89331037150919602451
LockedPins =
PinRequired = none
Present = 1
[ org.ofono.LocationReporting ]
Type = nmea
Enabled = 0
[ org.ofono.VoiceCallManager ]
EmergencyNumbers = 08 000 999 110 112 911 118 119
Thanks for your help,
--
*Martin*
5 years, 5 months
[PATCH] rilmodem/stk: add STK support for rilmodem
by caiwen.zhang＠intel.com
From: Caiwen Zhang <caiwen.zhang(a)intel.com>
---
Makefile.am | 1 +
drivers/rilmodem/rilmodem.c | 2 +
drivers/rilmodem/rilmodem.h | 3 +
drivers/rilmodem/stk.c | 237 ++++++++++++++++++++++++++++++++++++++++++++
plugins/ril.c | 1 +
5 files changed, 244 insertions(+)
create mode 100644 drivers/rilmodem/stk.c
diff --git a/Makefile.am b/Makefile.am
index 5215b2e..8ab9851 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -151,6 +151,7 @@ builtin_sources += drivers/rilmodem/rilmodem.h \
drivers/rilmodem/radio-settings.c \
drivers/rilmodem/call-barring.c \
drivers/rilmodem/netmon.c \
+ drivers/rilmodem/stk.c \
drivers/infineonmodem/infineon_constants.h
endif
diff --git a/drivers/rilmodem/rilmodem.c b/drivers/rilmodem/rilmodem.c
index e4de3c2..9a063a2 100644
--- a/drivers/rilmodem/rilmodem.c
+++ b/drivers/rilmodem/rilmodem.c
@@ -52,6 +52,7 @@ static int rilmodem_init(void)
ril_radio_settings_init();
ril_call_barring_init();
ril_netmon_init();
+ ril_stk_init();
return 0;
}
@@ -74,6 +75,7 @@ static void rilmodem_exit(void)
ril_radio_settings_exit();
ril_call_barring_exit();
ril_netmon_exit();
+ ril_stk_exit();
}
OFONO_PLUGIN_DEFINE(rilmodem, "RIL modem driver", VERSION,
diff --git a/drivers/rilmodem/rilmodem.h b/drivers/rilmodem/rilmodem.h
index f838b6b..7e47573 100644
--- a/drivers/rilmodem/rilmodem.h
+++ b/drivers/rilmodem/rilmodem.h
@@ -72,3 +72,6 @@ extern void ril_phonebook_exit(void);
extern void ril_netmon_init(void);
extern void ril_netmon_exit(void);
+
+extern void ril_stk_init(void);
+extern void ril_stk_exit(void);
diff --git a/drivers/rilmodem/stk.c b/drivers/rilmodem/stk.c
new file mode 100644
index 0000000..9082683
--- /dev/null
+++ b/drivers/rilmodem/stk.c
@@ -0,0 +1,237 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2016 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
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdio.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/stk.h>
+#include "util.h"
+
+#include <gril.h>
+#include <parcel.h>
+
+#include "rilmodem.h"
+#include "vendor.h"
+
+struct stk_data {
+ GRil *ril;
+ unsigned int vendor;
+};
+
+static void ril_stk_terminal_response_cb(struct ril_msg *message,
+ gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_stk_generic_cb_t cb = cbd->cb;
+ struct stk_data *sd = cbd->user;
+
+ g_ril_print_response(sd->ril, message);
+
+ if (message->error == RIL_E_SUCCESS) {
+ CALLBACK_WITH_SUCCESS(cb, cbd->data);
+ } else {
+ ofono_error("%s RILD reply failure: %s",
+ g_ril_request_id_to_string(sd->ril, message->req),
+ ril_error_to_string(message->error));
+ CALLBACK_WITH_FAILURE(cb, cbd->data);
+ }
+}
+
+static void ril_stk_terminal_response(struct ofono_stk *stk, int len,
+ const unsigned char *data,
+ ofono_stk_generic_cb_t cb, void *user_data)
+{
+ struct stk_data *sd = ofono_stk_get_data(stk);
+ struct cb_data *cbd = cb_data_new(cb, user_data, sd);
+ struct parcel rilp;
+ char *buf = alloca(len * 2 + 1);
+ int size = 0;
+
+ for (; len; len--)
+ size += sprintf(buf + size, "%02hhX", *data++);
+
+ parcel_init(&rilp);
+ parcel_w_string(&rilp, buf);
+
+ if (g_ril_send(sd->ril, RIL_REQUEST_STK_SEND_TERMINAL_RESPONSE, &rilp,
+ ril_stk_terminal_response_cb, cbd, g_free) > 0)
+ return;
+
+ g_free(cbd);
+ CALLBACK_WITH_FAILURE(cb, user_data);
+}
+
+static void ril_stk_envelope_cb(struct ril_msg *message, gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_stk_envelope_cb_t cb = cbd->cb;
+ struct stk_data *sd = cbd->user;
+ struct parcel rilp;
+ unsigned char *response = NULL;
+ long len = 0;
+ char *pdu;
+
+ g_ril_print_response(sd->ril, message);
+
+ if (message->error == RIL_E_SUCCESS) {
+ g_ril_init_parcel(message, &rilp);
+ pdu = parcel_r_string(&rilp);
+ if (pdu)
+ response = decode_hex(pdu, -1, &len, -1);
+
+ CALLBACK_WITH_SUCCESS(cb, response, len, cbd->data);
+ g_free(response);
+ } else {
+ ofono_error("%s RILD reply failure: %s",
+ g_ril_request_id_to_string(sd->ril, message->req),
+ ril_error_to_string(message->error));
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, cbd->data);
+ }
+}
+
+static void ril_stk_envelope(struct ofono_stk *stk, int len,
+ const unsigned char *cmd,
+ ofono_stk_envelope_cb_t cb, void *user_data)
+{
+ struct stk_data *sd = ofono_stk_get_data(stk);
+ struct cb_data *cbd = cb_data_new(cb, user_data, sd);
+ struct parcel rilp;
+ char *buf = alloca(len * 2 + 1);
+ int size = 0;
+
+ for (; len; len--)
+ size += sprintf(buf + size, "%02hhX", *cmd++);
+
+ parcel_init(&rilp);
+ parcel_w_string(&rilp, buf);
+
+ if (g_ril_send(sd->ril, RIL_REQUEST_STK_SEND_ENVELOPE_COMMAND, &rilp,
+ ril_stk_envelope_cb, cbd, g_free) > 0)
+ return;
+
+ g_free(cbd);
+ CALLBACK_WITH_FAILURE(cb, NULL, 0, user_data);
+}
+
+static void ril_stk_proactive_cmd_noti(struct ril_msg *message,
+ gpointer user_data)
+{
+ struct ofono_stk *stk = user_data;
+ struct parcel rilp;
+ long pdulen;
+ unsigned char *pdu;
+
+ DBG("");
+
+ g_ril_init_parcel(message, &rilp);
+ pdu = decode_hex(parcel_r_string(&rilp), -1, &pdulen, -1);
+
+ ofono_stk_proactive_command_notify(stk, pdulen, pdu);
+ g_free(pdu);
+}
+
+static void ril_stk_event_noti(struct ril_msg *message, gpointer user_data)
+{
+ struct ofono_stk *stk = user_data;
+ struct parcel rilp;
+ long pdulen;
+ unsigned char *pdu;
+
+ DBG("");
+
+ g_ril_init_parcel(message, &rilp);
+ pdu = decode_hex(parcel_r_string(&rilp), -1, &pdulen, -1);
+
+ ofono_stk_proactive_command_handled_notify(stk, pdulen, pdu);
+ g_free(pdu);
+}
+
+static void ril_stk_session_end_noti(struct ril_msg *message,
+ gpointer user_data)
+{
+ struct ofono_stk *stk = user_data;
+
+ DBG("");
+ ofono_stk_proactive_session_end_notify(stk);
+}
+
+static int ril_stk_probe(struct ofono_stk *stk, unsigned int vendor,
+ void *user)
+{
+ GRil *ril = user;
+ struct stk_data *data;
+
+ data = g_new0(struct stk_data, 1);
+ data->ril = g_ril_clone(ril);
+ data->vendor = vendor;
+
+ ofono_stk_set_data(stk, data);
+
+ g_ril_register(ril, RIL_UNSOL_STK_PROACTIVE_COMMAND,
+ ril_stk_proactive_cmd_noti, stk);
+
+ g_ril_register(ril, RIL_UNSOL_STK_SESSION_END,
+ ril_stk_session_end_noti, stk);
+
+ g_ril_register(ril, RIL_UNSOL_STK_EVENT_NOTIFY,
+ ril_stk_event_noti, stk);
+
+ ofono_stk_register(stk);
+
+ return 0;
+}
+
+static void ril_stk_remove(struct ofono_stk *stk)
+{
+ struct stk_data *data = ofono_stk_get_data(stk);
+
+ ofono_stk_set_data(stk, NULL);
+
+ g_ril_unref(data->ril);
+ g_free(data);
+}
+
+static struct ofono_stk_driver driver = {
+ .name = RILMODEM,
+ .probe = ril_stk_probe,
+ .remove = ril_stk_remove,
+ .envelope = ril_stk_envelope,
+ .terminal_response = ril_stk_terminal_response,
+};
+
+void ril_stk_init(void)
+{
+ ofono_stk_driver_register(&driver);
+}
+
+void ril_stk_exit(void)
+{
+ ofono_stk_driver_unregister(&driver);
+}
diff --git a/plugins/ril.c b/plugins/ril.c
index b66664a..833fd99 100644
--- a/plugins/ril.c
+++ b/plugins/ril.c
@@ -230,6 +230,7 @@ void ril_post_sim(struct ofono_modem *modem)
ofono_call_forwarding_create(modem, rd->vendor, RILMODEM, rd->ril);
+ ofono_stk_create(modem, rd->vendor, RILMODEM, rd->ril);
ofono_phonebook_create(modem, rd->vendor, RILMODEM, modem);
}
--
1.9.1
5 years, 5 months
Question: How to activate a specific profile?
by Enrico Sau
Hi all,
I have a Telit HE910 and I want to activate profile 3.
I know oFono stores context internally, not in the modem, but I don't
understand if I can activate a specific profile in the modem.
Thank you.
Enrico
5 years, 5 months
[PATCH] Radio-setting: Fix to init pending band
by Antara Borwankar
From: Antara Borwankar <antara.borwankar(a)gmail.com>
Initialiing rs->pending_band_gsm and rs->pending_band_umts
---
src/radio-settings.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/radio-settings.c b/src/radio-settings.c
index 5ab4e7b..8cb3d41 100644
--- a/src/radio-settings.c
+++ b/src/radio-settings.c
@@ -855,6 +855,8 @@ static void radio_load_settings(struct ofono_radio_settings *rs,
"GsmBand", rs->band_gsm);
}
+ rs->pending_band_gsm = rs->band_gsm;
+
error = NULL;
rs->band_umts = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
"UmtsBand", &error);
@@ -865,6 +867,8 @@ static void radio_load_settings(struct ofono_radio_settings *rs,
"UmtsBand", rs->band_umts);
}
+ rs->pending_band_umts = rs->band_umts;
+
error = NULL;
rs->mode = g_key_file_get_integer(rs->settings, SETTINGS_GROUP,
"TechnologyPreference", &error);
@@ -890,10 +894,8 @@ void ofono_radio_settings_register(struct ofono_radio_settings *rs)
radio_load_settings(rs, ofono_sim_get_imsi(sim));
- if (rs->driver->set_band == NULL)
- goto finish;
-
- rs->driver->set_band(rs, rs->band_gsm, rs->band_umts,
+ if (rs->driver->set_band != NULL)
+ rs->driver->set_band(rs, rs->band_gsm, rs->band_umts,
radio_band_set_callback_at_reg, rs);
if (rs->driver->set_rat_mode == NULL)
--
1.9.1
5 years, 5 months
[PATCH] sim: rilmodem driver changes for query facility lock
by Samrat Guha Niyogi
---
drivers/rilmodem/sim.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/drivers/rilmodem/sim.c b/drivers/rilmodem/sim.c
index 02399ff..ba31446 100644
--- a/drivers/rilmodem/sim.c
+++ b/drivers/rilmodem/sim.c
@@ -1405,6 +1405,54 @@ static int ril_sim_probe(struct ofono_sim *sim, unsigned int vendor,
return 0;
}
+static void ril_query_facility_lock_cb(struct ril_msg *message, gpointer user_data)
+{
+ struct cb_data *cbd = user_data;
+ ofono_query_facility_lock_cb_t cb = cbd->cb;
+ struct sim_data *sd = cbd->user;
+ struct parcel rilp;
+ ofono_bool_t status;
+
+ if (message->error != RIL_E_SUCCESS)
+ goto error;
+
+ g_ril_init_parcel(message, &rilp);
+
+ status = (ofono_bool_t)parcel_r_int32(&rilp);
+
+ g_ril_append_print_buf(sd->ril, "{%d}", status);
+ g_ril_print_response(sd->ril, message);
+
+ CALLBACK_WITH_SUCCESS(cb, status, cbd->data);
+ return;
+
+error:
+ CALLBACK_WITH_FAILURE(cb, 0, cbd->data);
+}
+
+static void ril_query_facility_lock(struct ofono_sim *sim,
+ enum ofono_sim_password_type lock,
+ ofono_query_facility_lock_cb_t cb, void *data)
+{
+ struct sim_data *sd = ofono_sim_get_data(sim);
+ struct cb_data *cbd = cb_data_new(cb, data, sim);
+ struct parcel rilp;
+
+ parcel_init(&rilp);
+ parcel_w_int32(&rilp, 4); /* # of strings */
+ parcel_w_string(&rilp, clck_cpwd_fac[lock]);
+ parcel_w_string(&rilp, ""); /* Password is empty when not needed */
+ parcel_w_string(&rilp, "0"); /* Class is "0" */
+ parcel_w_string(&rilp, NULL); /* AID value is NULL */
+
+ if (g_ril_send(sd->ril, RIL_REQUEST_QUERY_FACILITY_LOCK, &rilp,
+ ril_query_facility_lock_cb, cbd, g_free) > 0)
+ return;
+
+ g_free(cbd);
+ CALLBACK_WITH_FAILURE(cb, 0, data);
+}
+
static void ril_sim_remove(struct ofono_sim *sim)
{
struct sim_data *sd = ofono_sim_get_data(sim);
@@ -1434,6 +1482,7 @@ static struct ofono_sim_driver driver = {
.reset_passwd = ril_pin_send_puk,
.change_passwd = ril_change_passwd,
.lock = ril_pin_change_state,
+ .query_facility_lock = ril_query_facility_lock,
/*
* TODO: Implmenting PIN/PUK support requires defining
* the following driver methods.
--
1.9.1
5 years, 5 months
[PATCH] sim: trigger changes for query facility lock
by Samrat Guha Niyogi
---
src/sim.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/src/sim.c b/src/sim.c
index 94d8840..aedc617 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2449,6 +2449,60 @@ static void sim_free_state(struct ofono_sim *sim)
sim_free_main_state(sim);
}
+static void sim_query_fac_imsilock_cb(const struct ofono_error *error,
+ ofono_bool_t status,
+ void *data)
+{
+ struct ofono_sim *sim = data;
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(sim->atom);
+ char **locked_pins;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ ofono_error("Querying Facility Lock for IMSI Lock failed");
+ return;
+ }
+
+ sim->locked_pins[OFONO_SIM_PASSWORD_PHSIM_PIN] = status;
+
+ locked_pins = get_locked_pins(sim);
+
+ ofono_dbus_signal_array_property_changed(conn,
+ path,
+ OFONO_SIM_MANAGER_INTERFACE,
+ "LockedPins", DBUS_TYPE_STRING,
+ &locked_pins);
+
+ g_strfreev(locked_pins);
+}
+
+static void sim_query_fac_networklock_cb(const struct ofono_error *error,
+ ofono_bool_t status,
+ void *data)
+{
+ struct ofono_sim *sim = data;
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(sim->atom);
+ char **locked_pins;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ ofono_error("Querying Facility Lock for Network Lock failed");
+ return;
+ }
+
+ sim->locked_pins[OFONO_SIM_PASSWORD_PHNET_PIN] = status;
+
+ locked_pins = get_locked_pins(sim);
+
+ ofono_dbus_signal_array_property_changed(conn,
+ path,
+ OFONO_SIM_MANAGER_INTERFACE,
+ "LockedPins", DBUS_TYPE_STRING,
+ &locked_pins);
+
+ g_strfreev(locked_pins);
+}
+
void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
{
if (sim->state == OFONO_SIM_STATE_RESETTING && inserted) {
@@ -2475,6 +2529,14 @@ void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
call_state_watches(sim);
if (inserted) {
+ sim->driver->query_facility_lock(sim,
+ OFONO_SIM_PASSWORD_PHSIM_PIN,
+ sim_query_fac_imsilock_cb, sim);
+
+ sim->driver->query_facility_lock(sim,
+ OFONO_SIM_PASSWORD_PHNET_PIN,
+ sim_query_fac_networklock_cb, sim);
+
sim_initialize(sim);
} else {
sim->pin_type = OFONO_SIM_PASSWORD_NONE;
--
1.9.1
5 years, 5 months
[PATCH] sim: Add support for query facility lock
by Samrat Guha Niyogi
---
include/sim.h | 6 ++++++
src/sim.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 68 insertions(+)
diff --git a/include/sim.h b/include/sim.h
index ed850f9..9470d4d 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -121,6 +121,9 @@ typedef void (*ofono_sim_lock_unlock_cb_t)(const struct ofono_error *error,
typedef void (*ofono_sim_locked_cb_t)(const struct ofono_error *error,
int locked, void *data);
+typedef void (*ofono_query_facility_lock_cb_t)(const struct ofono_error *error,
+ ofono_bool_t status, void *data);
+
struct ofono_sim_driver {
const char *name;
int (*probe)(struct ofono_sim *sim, unsigned int vendor, void *data);
@@ -173,6 +176,9 @@ struct ofono_sim_driver {
void (*query_locked)(struct ofono_sim *sim,
enum ofono_sim_password_type type,
ofono_sim_locked_cb_t cb, void *data);
+ void (*query_facility_lock)(struct ofono_sim *sim,
+ enum ofono_sim_password_type lock,
+ ofono_query_facility_lock_cb_t cb, void *data);
};
int ofono_sim_driver_register(const struct ofono_sim_driver *d);
diff --git a/src/sim.c b/src/sim.c
index 94d8840..aedc617 100644
--- a/src/sim.c
+++ b/src/sim.c
@@ -2449,6 +2449,60 @@ static void sim_free_state(struct ofono_sim *sim)
sim_free_main_state(sim);
}
+static void sim_query_fac_imsilock_cb(const struct ofono_error *error,
+ ofono_bool_t status,
+ void *data)
+{
+ struct ofono_sim *sim = data;
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(sim->atom);
+ char **locked_pins;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ ofono_error("Querying Facility Lock for IMSI Lock failed");
+ return;
+ }
+
+ sim->locked_pins[OFONO_SIM_PASSWORD_PHSIM_PIN] = status;
+
+ locked_pins = get_locked_pins(sim);
+
+ ofono_dbus_signal_array_property_changed(conn,
+ path,
+ OFONO_SIM_MANAGER_INTERFACE,
+ "LockedPins", DBUS_TYPE_STRING,
+ &locked_pins);
+
+ g_strfreev(locked_pins);
+}
+
+static void sim_query_fac_networklock_cb(const struct ofono_error *error,
+ ofono_bool_t status,
+ void *data)
+{
+ struct ofono_sim *sim = data;
+ DBusConnection *conn = ofono_dbus_get_connection();
+ const char *path = __ofono_atom_get_path(sim->atom);
+ char **locked_pins;
+
+ if (error->type != OFONO_ERROR_TYPE_NO_ERROR) {
+ ofono_error("Querying Facility Lock for Network Lock failed");
+ return;
+ }
+
+ sim->locked_pins[OFONO_SIM_PASSWORD_PHNET_PIN] = status;
+
+ locked_pins = get_locked_pins(sim);
+
+ ofono_dbus_signal_array_property_changed(conn,
+ path,
+ OFONO_SIM_MANAGER_INTERFACE,
+ "LockedPins", DBUS_TYPE_STRING,
+ &locked_pins);
+
+ g_strfreev(locked_pins);
+}
+
void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
{
if (sim->state == OFONO_SIM_STATE_RESETTING && inserted) {
@@ -2475,6 +2529,14 @@ void ofono_sim_inserted_notify(struct ofono_sim *sim, ofono_bool_t inserted)
call_state_watches(sim);
if (inserted) {
+ sim->driver->query_facility_lock(sim,
+ OFONO_SIM_PASSWORD_PHSIM_PIN,
+ sim_query_fac_imsilock_cb, sim);
+
+ sim->driver->query_facility_lock(sim,
+ OFONO_SIM_PASSWORD_PHNET_PIN,
+ sim_query_fac_networklock_cb, sim);
+
sim_initialize(sim);
} else {
sim->pin_type = OFONO_SIM_PASSWORD_NONE;
--
1.9.1
5 years, 5 months
[PATCH] sim: include changes for query facility lock
by Samrat Guha Niyogi
---
include/sim.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/sim.h b/include/sim.h
index ed850f9..9470d4d 100644
--- a/include/sim.h
+++ b/include/sim.h
@@ -121,6 +121,9 @@ typedef void (*ofono_sim_lock_unlock_cb_t)(const struct ofono_error *error,
typedef void (*ofono_sim_locked_cb_t)(const struct ofono_error *error,
int locked, void *data);
+typedef void (*ofono_query_facility_lock_cb_t)(const struct ofono_error *error,
+ ofono_bool_t status, void *data);
+
struct ofono_sim_driver {
const char *name;
int (*probe)(struct ofono_sim *sim, unsigned int vendor, void *data);
@@ -173,6 +176,9 @@ struct ofono_sim_driver {
void (*query_locked)(struct ofono_sim *sim,
enum ofono_sim_password_type type,
ofono_sim_locked_cb_t cb, void *data);
+ void (*query_facility_lock)(struct ofono_sim *sim,
+ enum ofono_sim_password_type lock,
+ ofono_query_facility_lock_cb_t cb, void *data);
};
int ofono_sim_driver_register(const struct ofono_sim_driver *d);
--
1.9.1
5 years, 5 months
