[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, 2 weeks
Read/Write EFcfis/EFcphs-cff files
by Jeevaka Badrappan
Hi,
This patch reads and writes the call forwarding unconditional status
from and to the SIM depending on the SIM file availability.
New property needs to be added due to the fact that number won't be
available from the cphs-cff file.
Incase of SIM, EFcphs-cff file holds call forwarding status and it
is represented as a flag. In case of USIM(EFcfis), we have the status
flag and also number.So, adding new property for status and using the
existing VoiceUnconditional with number will work for both SIM and USIM cases.
Other option is to have 2 properties, "VoiceUnconditional" and "Number".
"VoiceUnconditional" will have the status of the call forwarding( "enabled",
"disabled") whereas the "Number" property will have the call forwared number.
offline-online state transitions results in caching the call forwaring status
every time. To avoid this, call forwarding atom is moved to the post sim and
its moved also due to the fact that call forwarding status doesn't change in
roaming.
Regards,
Jeevaka
Jeevaka Badrappan (7):
call-forwarding: Read/Write cfis/cphs-cff
ifx: Move call forwarding to post sim
isigen: Move call forwarding to post sim
plugins/n900: Move call forwarding to post sim
phonesim: Move call forwarding to post sim
doc: Add new property to call forwarding
TODO: Marking the Read/Write EFcfis task as done
TODO | 9 --
doc/call-forwarding-api.txt | 5 +
doc/features.txt | 5 +
plugins/ifx.c | 2 +-
plugins/isigen.c | 2 +-
plugins/n900.c | 2 +-
plugins/phonesim.c | 3 +-
src/call-forwarding.c | 242 ++++++++++++++++++++++++++++++++++++++++++-
8 files changed, 256 insertions(+), 14 deletions(-)
3 months, 1 week
[PATCH] Simcom support
by Anthony Viallard
Add SIMCOM support.
I developped this with the SIM5216E chipset and ofono 1.12.
- SMS and GPRS work (in the same time) ;
- SIM card presence check ;
- No voice part because I can't test it ;
- Use default characters set instead GSM because it works like that
for what I'm doing (SMS+GPRS) (by default, the set is IRA for SIM5216E).
Also, the SIMCOM doc affraids me about problems when using GSM
(this setting causes easily software flow control (XON /XOFF) problems.).
Signed-off-by: Anthony Viallard <homer242 at gmail.com>
--- ofono-1.12.orig/Makefile.am 2012-04-20 21:06:29.000000000 +0200
+++ ofono-1.12/Makefile.am 2013-01-21 17:17:48.089627277 +0100
@@ -371,6 +371,9 @@ builtin_sources += plugins/samsung.c
builtin_modules += sim900
builtin_sources += plugins/sim900.c
+builtin_modules += simcom
+builtin_sources += plugins/simcom.c
+
if BLUETOOTH
builtin_modules += bluetooth
builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
--- ofono-1.12.orig/drivers/atmodem/sms.c 2012-04-20 21:06:29.000000000 +0200
+++ ofono-1.12/drivers/atmodem/sms.c 2013-01-21 16:48:44.460627485 +0100
@@ -805,6 +807,7 @@ static gboolean build_cnmi_string(char *
case OFONO_VENDOR_NOVATEL:
case OFONO_VENDOR_HUAWEI:
case OFONO_VENDOR_ZTE:
+ case OFONO_VENDOR_SIMCOM:
/* MSM devices advertise support for mode 2, but return an
* error if we attempt to actually use it. */
mode = "1";
diff -pruN ofono-1.12.orig/drivers/atmodem/sim.c ofono-1.12/drivers/atmodem/sim.c
--- ofono-1.12.orig/drivers/atmodem/sim.c 2013-01-23 11:38:22.959609087 +0100
+++ ofono-1.12/drivers/atmodem/sim.c 2013-01-23 11:57:52.602608948 +0100
@@ -1023,12 +1023,18 @@ static void at_pin_send_cb(gboolean ok,
FALSE, cbd, g_free);
return;
case OFONO_VENDOR_ZTE:
case OFONO_VENDOR_ALCATEL:
case OFONO_VENDOR_HUAWEI:
+ case OFONO_VENDOR_SIMCOM:
/*
* On ZTE modems, after pin is entered, SIM state is checked
* by polling CPIN as their modem doesn't provide unsolicited
* notification of SIM readiness.
+ *
+ * On SIMCOM modems, SIM is busy after pin is entered (we've
+ * got an "+CME ERROR: 14" at "AT+CPIN?" request) and ofono
+ * don't catch the "+CPIN: READY" message sent by the modem
+ * when SIM is ready. So, use extra CPIN to check the state.
*/
sd->sim_state_query = at_util_sim_state_query_new(sd->chat,
2, 20, sim_state_cb, cbd,
diff -purN ofono-1.12/drivers/atmodem/network-registration.c ofono-patched/drivers/atmodem/network-registration.c
--- ofono-1.12/drivers/atmodem/network-registration.c 2013-01-18 15:04:03.598659165 +0100
+++ ofono-patched/drivers/atmodem/network-registration.c 2013-01-18 14:54:03.256659236 +0100
@@ -1411,6 +1411,14 @@ static void at_creg_set_cb(gboolean ok,
}
switch (nd->vendor) {
+ case OFONO_VENDOR_SIMCOM:
+ /* Register for CSQ changes */
+ g_at_chat_send(nd->chat, "AT+AUTOCSQ=1,1", none_prefix,
+ NULL, NULL, NULL);
+
+ g_at_chat_register(nd->chat, "+CSQ:",
+ csq_notify, FALSE, netreg, NULL);
+ break;
case OFONO_VENDOR_PHONESIM:
g_at_chat_register(nd->chat, "+CSQ:",
csq_notify, FALSE, netreg, NULL);
@@ -1534,7 +1537,6 @@ static void at_creg_set_cb(gboolean ok,
break;
case OFONO_VENDOR_NOKIA:
case OFONO_VENDOR_SAMSUNG:
- case OFONO_VENDOR_SIMCOM:
/* Signal strength reporting via CIND is not supported */
break;
default:
--- /dev/null 2013-01-28 10:34:59.843091650 +0100
+++ ofono-1.12/plugins/simcom.c 2013-02-15 16:16:38.058552544 +0100
@@ -0,0 +1,401 @@
+/*
+ *
+ * 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 <stdio.h>
+
+#include <glib.h>
+#include <gatchat.h>
+#include <gattty.h>
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include <ofono/plugin.h>
+#include <ofono/modem.h>
+#include <ofono/devinfo.h>
+#include <ofono/netreg.h>
+#include <ofono/sim.h>
+#include <ofono/cbs.h>
+#include <ofono/sms.h>
+#include <ofono/ussd.h>
+#include <ofono/gprs.h>
+#include <ofono/gprs-context.h>
+#include <ofono/radio-settings.h>
+#include <ofono/phonebook.h>
+#include <ofono/log.h>
+
+#include <drivers/atmodem/atutil.h>
+#include <drivers/atmodem/vendor.h>
+
+#define MAX_IGNITION_POOL_CALL 7
+
+#define CMEERR_SIMBUSY 14
+
+static const char *none_prefix[] = { NULL };
+
+struct simcom_data {
+ GAtChat *modem;
+ GAtChat *data;
+ guint ignition_pool;
+ unsigned int ignition_pool_call;
+ unsigned int at_ignition_pending;
+ ofono_bool_t have_sim;
+};
+
+/* Callback and helpers functions */
+static void simcom_debug(const char *str, void *user_data)
+{
+ const char *prefix = user_data;
+
+ ofono_info("%s%s", prefix, str);
+}
+
+static gboolean simcom_ignition(gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ ++data->ignition_pool_call;
+
+ if(data->at_ignition_pending > 0)
+ {
+ if(data->ignition_pool_call > MAX_IGNITION_POOL_CALL)
+ {
+ ofono_error("Ignition timeout");
+ return FALSE;
+ }
+
+ /* Waiting reply of AT commands */
+ DBG("Waiting AT reply...");
+ return TRUE;
+ }
+
+ ofono_modem_set_powered(modem, TRUE);
+
+ return FALSE;
+}
+
+static void simcom_sim_status(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct ofono_error error;
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ --data->at_ignition_pending;
+
+ if(!ok)
+ {
+ decode_at_error(&error, g_at_result_final_response(result));
+ if(error.type == OFONO_ERROR_TYPE_CME)
+ {
+ if(error.error == CMEERR_SIMBUSY)
+ {
+ DBG("System is busy. Retry...");
+ g_at_chat_send(data->data, "AT+CPIN?",
+ none_prefix,
+ simcom_sim_status, modem,
+ NULL);
+ ++data->at_ignition_pending;
+ return;
+ }
+ }
+
+ data->have_sim = FALSE;
+ return;
+ }
+
+ /* If doesn't have an "fatal" error on AT+CPIN request,
+ * we can guess there a SIM card ...
+ */
+ data->have_sim = TRUE;
+}
+
+static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ if (!ok) {
+ g_at_chat_unref(data->modem);
+ data->modem = NULL;
+
+ g_at_chat_unref(data->data);
+ data->data = NULL;
+
+ ofono_modem_set_powered(modem, FALSE);
+ return;
+ }
+
+ /* Get model and sim card status */
+ data->at_ignition_pending = 0;
+
+ g_at_chat_send(data->data, "AT+CPIN?", none_prefix,
+ simcom_sim_status, modem, NULL);
+ ++data->at_ignition_pending;
+
+ data->ignition_pool = g_timeout_add_seconds(1,
+ simcom_ignition,
+ modem);
+}
+
+static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_modem *modem = user_data;
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ DBG("");
+
+ g_at_chat_unref(data->data);
+ data->data = NULL;
+
+ if (ok)
+ ofono_modem_set_powered(modem, FALSE);
+}
+
+static GAtChat *open_device(struct ofono_modem *modem,
+ const char *key,
+ char *debug)
+{
+ const char *device;
+ GIOChannel *channel;
+ GAtSyntax *syntax;
+ GAtChat *chat;
+ /* GHashTable *options; */
+
+ device = ofono_modem_get_string(modem, key);
+ if (device == NULL)
+ {
+ ofono_error("Failed to get modem '%s'", key);
+ return NULL;
+ }
+
+ DBG("%s %s", key, device);
+
+ /* options = g_hash_table_new(g_str_hash, g_str_equal); */
+ /* if (options == NULL) */
+ /* return NULL; */
+
+ /* g_hash_table_insert(options, "Baud", "115200"); */
+ /* g_hash_table_insert(options, "Parity", "none"); */
+ /* g_hash_table_insert(options, "StopBits", "1"); */
+ /* g_hash_table_insert(options, "DataBits", "8"); */
+ /* 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, NULL);
+
+ /* g_hash_table_destroy(options); */
+
+ if (channel == NULL)
+ {
+ ofono_error("Failed to get tty for '%s'", key);
+ return NULL;
+ }
+
+ 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)
+ {
+ ofono_error("Failed to get chat for '%s'", key);
+ return NULL;
+ }
+
+ //if (getenv("OFONO_AT_DEBUG"))
+ g_at_chat_set_debug(chat, simcom_debug, debug);
+
+ return chat;
+}
+
+/* Modem interface function */
+static int simcom_probe(struct ofono_modem *modem)
+{
+ struct simcom_data *data;
+
+ DBG("%p", modem);
+
+ data = g_try_new0(struct simcom_data, 1);
+ if (data == NULL)
+ return -ENOMEM;
+
+ ofono_modem_set_data(modem, data);
+
+ return 0;
+}
+
+static void simcom_remove(struct ofono_modem *modem)
+{
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ DBG("%p", modem);
+
+ if(data->ignition_pool > 0)
+ {
+ g_source_remove(data->ignition_pool);
+ data->ignition_pool = 0;
+ }
+
+ ofono_modem_set_data(modem, NULL);
+
+ /* Cleanup after hot-unplug */
+ g_at_chat_unref(data->data);
+
+ g_free(data);
+}
+
+static int simcom_enable(struct ofono_modem *modem)
+{
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ DBG("%p", modem);
+
+ data->modem = open_device(modem, "Modem", "Modem: ");
+ if (data->modem == NULL)
+ return -EINVAL;
+
+ data->data = open_device(modem, "Data", "Data: ");
+ if (data->data == NULL) {
+ g_at_chat_unref(data->modem);
+ data->modem = NULL;
+ return -EIO;
+ }
+
+ g_at_chat_set_slave(data->modem, data->data);
+
+ g_at_chat_blacklist_terminator(data->data,
+ G_AT_CHAT_TERMINATOR_NO_CARRIER);
+
+ /* init modem */
+ g_at_chat_send(data->modem, "ATE0 +CMEE=1", NULL, NULL, NULL, NULL);
+ g_at_chat_send(data->data, "ATE0 +CMEE=1", NULL, NULL, NULL, NULL);
+
+ g_at_chat_send(data->data, "AT+CFUN=1", none_prefix,
+ cfun_enable, modem, NULL);
+
+ return -EINPROGRESS;
+}
+
+static int simcom_disable(struct ofono_modem *modem)
+{
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ DBG("%p", modem);
+
+ g_at_chat_cancel_all(data->modem);
+ g_at_chat_unregister_all(data->modem);
+
+ g_at_chat_unref(data->modem);
+ data->modem = NULL;
+
+ g_at_chat_cancel_all(data->data);
+ g_at_chat_unregister_all(data->data);
+
+ g_at_chat_send(data->data, "AT+CFUN=4", none_prefix,
+ cfun_disable, modem, NULL);
+
+ return -EINPROGRESS;
+}
+
+static void simcom_pre_sim(struct ofono_modem *modem)
+{
+ struct simcom_data *data = ofono_modem_get_data(modem);
+ struct ofono_sim *sim;
+
+ DBG("%p", modem);
+
+ ofono_devinfo_create(modem, 0, "atmodem", data->data);
+ sim = ofono_sim_create(modem, OFONO_VENDOR_SIMCOM, "atmodem",
+ data->data);
+
+ if (sim)
+ ofono_sim_inserted_notify(sim, data->have_sim);
+}
+
+static void simcom_post_sim(struct ofono_modem *modem)
+{
+ struct simcom_data *data = ofono_modem_get_data(modem);
+ struct ofono_message_waiting *mw;
+ struct ofono_gprs *gprs;
+ struct ofono_gprs_context *gc;
+
+ DBG("%p", modem);
+
+ ofono_phonebook_create(modem, 0, "atmodem", data->data);
+
+ ofono_sms_create(modem, OFONO_VENDOR_SIMCOM, "atmodem",
+ data->data);
+
+ /* gprs things */
+ gprs = ofono_gprs_create(modem, 0, "atmodem", data->data);
+ gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
+
+ if(gprs && gc)
+ {
+ ofono_gprs_add_context(gprs, gc);
+ }
+}
+
+static void simcom_post_online(struct ofono_modem *modem)
+{
+ struct simcom_data *data = ofono_modem_get_data(modem);
+
+ DBG("%p", modem);
+
+ ofono_netreg_create(modem, OFONO_VENDOR_SIMCOM, "atmodem", data->data);
+ ofono_cbs_create(modem, 0, "atmodem", data->data);
+ ofono_ussd_create(modem, 0, "atmodem", data->data);
+}
+
+static struct ofono_modem_driver simcom_driver = {
+ .name = "simcom",
+ .probe = simcom_probe,
+ .remove = simcom_remove,
+ .enable = simcom_enable,
+ .disable = simcom_disable,
+ .pre_sim = simcom_pre_sim,
+ .post_sim = simcom_post_sim,
+ .post_online = simcom_post_online,
+};
+
+static int simcom_init(void)
+{
+ return ofono_modem_driver_register(&simcom_driver);
+}
+
+static void simcom_exit(void)
+{
+ ofono_modem_driver_unregister(&simcom_driver);
+}
+
+OFONO_PLUGIN_DEFINE(simcom, "SIMCOM modem driver", VERSION,
+ OFONO_PLUGIN_PRIORITY_DEFAULT,
+ simcom_init, simcom_exit)
3 months, 1 week
Reject SCO: Agent not registered
by Bruno Bruzzano
Hello,
Hi, I'm trying to use the HFP with oFono 1.14. I'm currently using BlueZ5
5.13 on Debian system. After the installation which went fine, I was able
to enable the modem of my device (before I paired it), and then I tried a
call (using the ./dial-number script), but in ofonod debug during the call
I see the following:
ofonod[9700]: Reject SCO: Agent not registered
ofonod[9700]: Reject SCO: Agent not registered
ofonod[9700]: Reject SCO: Agent not registered
ofonod[9700]: Reject SCO: Agent not registered
ofonod[9700]: Reject SCO: Agent not registered
So, What means that? What did I messed?
Regards
Bruno
8 years, 8 months
[PATCH] gprs: Use "internet" apn for auto-created context
by Slava Monich
Such an access point has a pretty good chance to actually work.
---
src/gprs.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/gprs.c b/src/gprs.c
index e379f7b..01ff875 100644
--- a/src/gprs.c
+++ b/src/gprs.c
@@ -2992,8 +2992,13 @@ static void ofono_gprs_finish_register(struct ofono_gprs *gprs)
struct ofono_modem *modem = __ofono_atom_get_modem(gprs->atom);
const char *path = __ofono_atom_get_path(gprs->atom);
- if (gprs->contexts == NULL) /* Automatic provisioning failed */
- add_context(gprs, NULL, OFONO_GPRS_CONTEXT_TYPE_INTERNET);
+ if (gprs->contexts == NULL) { /* Automatic provisioning failed */
+ struct pri_context *context = add_context(gprs, NULL,
+ OFONO_GPRS_CONTEXT_TYPE_INTERNET);
+ if (context) {
+ strcpy(context->context.apn, "internet");
+ }
+ }
if (!g_dbus_register_interface(conn, path,
OFONO_CONNECTION_MANAGER_INTERFACE,
--
1.8.3.2
8 years, 8 months
oFono upstream test results_20140114
by Nicolas Paccou
Hello all,
Please find the test report of oFono v1.14 commit c2e5840.
During this testing, we ran 32 functional positive cases. 32 cases
passed, 0 failed and 0 blocked.
The Pass Rate is 100% (no change vs previous session). No regression has
been found.
If you want to be removed from this mailing list or if you have any
comment about this report, tell me please.If you have any comment about
this report, tell me please.
-----------------------------------------------
*Test Objective *
The aim of this session was to validate the state of oFono upstream by
testing only major tests of most important features over all material we
had (according to what feature was supported and by priority order: 3G
dongle, Smartphone connected through HFP). oFono has been installed and
tested on Ubuntu 13.04 device.
-----------------------------------------------
*Test Environment *
For all Setup:
oFono: v1.14 (updated to commit c2e5840)
-Laptop + 3G Dongle:
usb_modeswitch: v1.2.3
modeswitch data: 20120815-2
Hardware: Laptop
Ubuntu: v13.04
Modem: Huawei E173u-2 - Operator & SIM Card: SFR SIM Card -- Phone
number +33623312183, Bouygues SIM Card -- Phone number +33663999052
-Laptop + HFP
HF:
Hardware: Laptop
Ubuntu: v13.04
Bluez 4.101 (current version running on Ubuntu 13.04)
oFono has been installed with "--enable-bluez4" option
AG:
Android KK device
-----------------------------------------------
*Issue Summary *
New bug: 0
Known bug: 1
OF-162 - Going back from a select item list releases the session
https://01.org/jira/browse/OF-162
Closed bug: 0
-----------------------------------------------
*Test Result *
*Result Summary -- Basic Features*
Total Test Case
*32*
Passed
32
Failed
0
Blocked
0
TCs completed
*100,0%*
Run rate
*100%*
Pass rate total
*100%*
Blocked rate total
*0%*
Pass rate of executed
*100%*
*Test Result by feature
*
*Features (and their status in color)*
*Total*
*Pass*
*Fail*
*Blocked*
*Pass %*
*Modem Used*
Modem
*5*
5
0
0
*100%*
Tested on Laptop using 3G Dongle with a real SIM
SIM
*4*
4
0
0
*100%*
Tested on Laptop using 3G Dongle with a real SIM
Network
*2*
2
0
0
*100%*
Tested on Laptop using 3G Dongle with a real SIM
Connectivity
*8*
8
0
0
*100%*
Tested on Laptop using 3G Dongle with a real SIM
Voice Calls
*10*
10
0
0
*100%*
Tested on Laptop + HFP connected with a smartphone with a real SIM
Messaging
*2*
2
0
0
*100%*
Tested on Laptop using 3G Dongle with a real SIM
Message Waiting
*1*
1
0
0
*100%*
Tested on Laptop using 3G Dongle with a real SIM
Please find details in the attached file.*
*-----------------------------------------------
*Notes***
Please note that one oFono crash still occurs on the following conditions:
-OF-163 <https://01.org/jira/browse/OF-163>- oFono crashes when doing a
NAA Initialization+File Change Notification after having done a NAA
Initialization+Full File Change Notification with Phonesim.
Best regards,
Nicolas
8 years, 8 months
[PATCH] More const pointers
by Slava Monich
---
include/dbus.h | 12 ++++++------
src/dbus.c | 20 +++++++++++---------
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/include/dbus.h b/include/dbus.h
index e7ccb0b..3d39eff 100644
--- a/include/dbus.h
+++ b/include/dbus.h
@@ -77,29 +77,29 @@ extern "C" {
DBusConnection *ofono_dbus_get_connection(void);
void ofono_dbus_dict_append(DBusMessageIter *dict, const char *key, int type,
- void *value);
+ const void *value);
void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key,
- int type, void *val);
+ int type, const void *val);
void ofono_dbus_dict_append_dict(DBusMessageIter *dict, const char *key,
- int type, void *val);
+ int type, const void *val);
int ofono_dbus_signal_property_changed(DBusConnection *conn, const char *path,
const char *interface, const char *name,
- int type, void *value);
+ int type, const void *value);
int ofono_dbus_signal_array_property_changed(DBusConnection *conn,
const char *path,
const char *interface,
const char *name, int type,
- void *value);
+ const void *value);
int ofono_dbus_signal_dict_property_changed(DBusConnection *conn,
const char *path,
const char *interface,
const char *name, int type,
- void *value);
+ const void *value);
#ifdef __cplusplus
}
diff --git a/src/dbus.c b/src/dbus.c
index 1558a51..45becc1 100644
--- a/src/dbus.c
+++ b/src/dbus.c
@@ -48,7 +48,7 @@ struct error_mapping_entry cme_errors_mapping[] = {
};
static void append_variant(DBusMessageIter *iter,
- int type, void *value)
+ int type, const void *value)
{
char sig[2];
DBusMessageIter valueiter;
@@ -65,7 +65,7 @@ static void append_variant(DBusMessageIter *iter,
}
void ofono_dbus_dict_append(DBusMessageIter *dict,
- const char *key, int type, void *value)
+ const char *key, int type, const void *value)
{
DBusMessageIter keyiter;
@@ -85,7 +85,8 @@ void ofono_dbus_dict_append(DBusMessageIter *dict,
dbus_message_iter_close_container(dict, &keyiter);
}
-static void append_array_variant(DBusMessageIter *iter, int type, void *val)
+static void append_array_variant(DBusMessageIter *iter, int type,
+ const void *val)
{
DBusMessageIter variant, array;
char typesig[2];
@@ -113,7 +114,7 @@ static void append_array_variant(DBusMessageIter *iter, int type, void *val)
}
void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key,
- int type, void *val)
+ int type, const void *val)
{
DBusMessageIter entry;
@@ -127,7 +128,8 @@ void ofono_dbus_dict_append_array(DBusMessageIter *dict, const char *key,
dbus_message_iter_close_container(dict, &entry);
}
-static void append_dict_variant(DBusMessageIter *iter, int type, void *val)
+static void append_dict_variant(DBusMessageIter *iter, int type,
+ const void *val)
{
DBusMessageIter variant, array, entry;
char typesig[5];
@@ -182,7 +184,7 @@ static void append_dict_variant(DBusMessageIter *iter, int type, void *val)
}
void ofono_dbus_dict_append_dict(DBusMessageIter *dict, const char *key,
- int type, void *val)
+ int type, const void *val)
{
DBusMessageIter entry;
@@ -200,7 +202,7 @@ int ofono_dbus_signal_property_changed(DBusConnection *conn,
const char *path,
const char *interface,
const char *name,
- int type, void *value)
+ int type, const void *value)
{
DBusMessage *signal;
DBusMessageIter iter;
@@ -225,7 +227,7 @@ int ofono_dbus_signal_array_property_changed(DBusConnection *conn,
const char *path,
const char *interface,
const char *name,
- int type, void *value)
+ int type, const void *value)
{
DBusMessage *signal;
@@ -251,7 +253,7 @@ int ofono_dbus_signal_dict_property_changed(DBusConnection *conn,
const char *path,
const char *interface,
const char *name,
- int type, void *value)
+ int type, const void *value)
{
DBusMessage *signal;
--
1.8.3.2
8 years, 8 months
How to set 3G card into data mode?
by Dennis Lan (dlan)
Hi all:
I'm using Huawei E173 3G card, and have problem to set current operator.
seems it set to GSM mode by default, COPS query command return "
CHN-CUGSM, 460 01 2"
the commands I'm using here 1) list-modems 2) enable-modem
3)online-modem 4) create-internet-context 5）activate-context
reading the code, it seems possible to manually change operator,
from drivers/atmodem/network-registration.c : at_register_manual()?
any idea? what should I do?
detail log:
ofonod[14119]: PCUI: > AT+CSQ\r
ofonod[14119]: PCUI: < \r\n+CSQ: 23,99\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:csq_cb() csq_cb: 23
ofonod[14119]: PCUI: > AT+COPS=3,0\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,0,"CHN-CUGSM",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_cb()
cops_cb: CHN-CUGSM, 460 01 2
ofonod[14119]: src/network.c:current_operator_callback() 0x772a80, 0x769f50
ofonod[14119]: PCUI: < \r\n+CREG: 1,"A80A","51AF"\r\n\r\n+CGREG:
1,"A80A","51AF"\r\n
ofonod[14119]: src/network.c:ofono_netreg_status_notify() /huawei_0
status 1 tech 2
ofonod[14119]: src/cbs.c:cbs_location_changed() 1, -1, -1, 2, 46001
ofonod[14119]: src/gprs.c:netreg_status_changed() 1
ofonod[14119]: src/gprs.c:ofono_gprs_status_notify() /huawei_0 status 1
ofonod[14119]: PCUI: > AT+COPS=3,2\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,2,"46001",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_numeric_cb()
Cops numeric got mcc: 460, mnc: 01
ofonod[14119]: PCUI: > AT+CSQ\r
ofonod[14119]: PCUI: < \r\n+CSQ: 23,99\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:csq_cb() csq_cb: 23
ofonod[14119]: PCUI: > AT+COPS=3,0\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,0,"CHN-CUGSM",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_cb()
cops_cb: CHN-CUGSM, 460 01 2
ofonod[14119]: src/network.c:current_operator_callback() 0x772a80, 0x769f50
ofonod[14119]: PCUI: < \r\n+CREG: 1,"A80A","517E"\r\n\r\n+CGREG:
1,"A80A","517E"\r\n
ofonod[14119]: src/network.c:ofono_netreg_status_notify() /huawei_0
status 1 tech 2
ofonod[14119]: src/cbs.c:cbs_location_changed() 1, -1, -1, 2, 46001
ofonod[14119]: src/gprs.c:netreg_status_changed() 1
ofonod[14119]: src/gprs.c:ofono_gprs_status_notify() /huawei_0 status 1
ofonod[14119]: PCUI: > AT+COPS=3,2\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,2,"46001",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_numeric_cb()
Cops numeric got mcc: 460, mnc: 01
ofonod[14119]: PCUI: > AT+CSQ\r
ofonod[14119]: PCUI: < \r\n+CSQ: 23,99\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:csq_cb() csq_cb: 23
ofonod[14119]: PCUI: > AT+COPS=3,0\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,0,"CHN-CUGSM",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_cb()
cops_cb: CHN-CUGSM, 460 01 2
ofonod[14119]: src/network.c:current_operator_callback() 0x772a80, 0x769f50
ofonod[14119]: PCUI: < \r\n+CREG: 1,"A80A","51AF"\r\n\r\n+CGREG:
1,"A80A","51AF"\r\n
ofonod[14119]: src/network.c:ofono_netreg_status_notify() /huawei_0
status 1 tech 2
ofonod[14119]: src/cbs.c:cbs_location_changed() 1, -1, -1, 2, 46001
ofonod[14119]: src/gprs.c:netreg_status_changed() 1
ofonod[14119]: src/gprs.c:ofono_gprs_status_notify() /huawei_0 status 1
ofonod[14119]: PCUI: > AT+COPS=3,2\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,2,"46001",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_numeric_cb()
Cops numeric got mcc: 460, mnc: 01
ofonod[14119]: PCUI: > AT+CSQ\r
ofonod[14119]: PCUI: < \r\n+CSQ: 23,99\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:csq_cb() csq_cb: 23
ofonod[14119]: PCUI: > AT+COPS=3,0\r
ofonod[14119]: PCUI: < \r\nOK\r\n
ofonod[14119]: PCUI: > AT+COPS?\r
ofonod[14119]: PCUI: < \r\n+COPS: 1,0,"CHN-CUGSM",2\r\n\r\nOK\r\n
ofonod[14119]: drivers/atmodem/network-registration.c:cops_cb()
cops_cb: CHN-CUGSM, 460 01 2
ofonod[14119]: src/network.c:current_operator_callback() 0x772a80, 0x769f50
ofonod[14119]: PCUI: < \r\n^RSSI: 26\r\n
ofonod[14119]: src/network.c:ofono_netreg_strength_notify() strength 83
ofonod[14119]: drivers/atmodem/gprs-context.c:at_gprs_activate_primary() cid 1
ofonod[14119]: Modem: > AT+CGDCONT=1,"IP","3gnet"\r
ofonod[14119]: Modem: < \r\nOK\r\n
ofonod[14119]: drivers/atmodem/gprs-context.c:at_cgdcont_cb() ok 1
ofonod[14119]: Modem: > AT+CGDATA="PPP",1\r
ofonod[14119]: Modem: < \r\n+CME ERROR: 50\r\n
ofonod[14119]: drivers/atmodem/gprs-context.c:at_cgdata_cb() ok 0
ofonod[14119]: Unable to enter data state
ofonod[14119]: src/gprs.c:pri_activate_callback() 0x782e30
ofonod[14119]: src/gprs.c:pri_activate_callback() Activating context
failed with error: Incorrect parameters
8 years, 8 months
oFono issue: Reject SCO: Agent not registered
by Ignazio Chiappone
Hello everyone,
my goal is to use the bluetooth HFP to make/receive a call, however I have
a problem with oFono.
Actually I'm working on Fedora 20 with blueZ 5.12 and oFono 1.14 .
When I start ofonod I see this: http://pastebin.com/AsukjcXx .
Using test script enable-modem, after pair my device with linux, everything
seems to work fine, on ofonod in debug mode, I see this:
http://pastebin.com/2GBmZERk .
Now, using my device I try to make/receive a call, but I see in both cases
this error:
Reject SCO: Agent not registered
Reject SCO: Agent not registered
Reject SCO: Agent not registered .
I don't understand if that kind of problem is related to oFono or blueZ,
because I think it's blueZ duty to establish the SCO link, but the agent
reported on the error message is a particular blueZ agent or an oFono agent?
Have anyone an idea to solve my problem?
Please if you need more details let me know.
Thanks in advance
Ignazio
8 years, 8 months
