[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
4 days, 6 hours
[PATCH 1/2] dundee: export Bluetooth address in as D-Bus property
by Gustavo Padovan
From: Gustavo Padovan <gustavo.padovan(a)collabora.co.uk>
---
dundee/bluez4.c | 1 +
dundee/bluez5.c | 1 +
dundee/device.c | 24 ++++++++++++++++++++++++
dundee/dundee.h | 2 ++
4 files changed, 28 insertions(+)
diff --git a/dundee/bluez4.c b/dundee/bluez4.c
index 58355d3..c9fbee8 100644
--- a/dundee/bluez4.c
+++ b/dundee/bluez4.c
@@ -183,6 +183,7 @@ static int bt_probe(const char *path, const char *dev_addr,
goto free;
dundee_device_set_name(device, bt->name);
+ dundee_device_set_address(device, bt->address);
if (dundee_device_register(device) < 0) {
g_free(device);
diff --git a/dundee/bluez5.c b/dundee/bluez5.c
index 79b5ade..0608e40 100644
--- a/dundee/bluez5.c
+++ b/dundee/bluez5.c
@@ -282,6 +282,7 @@ static struct bluetooth_device *bluetooth_device_register(GDBusProxy *proxy)
dundee_device_set_data(device, bt_device);
dundee_device_set_name(device, bt_device->name);
+ dundee_device_set_address(device, bt_device->address);
if (dundee_device_register(device) < 0) {
g_free(device);
diff --git a/dundee/device.c b/dundee/device.c
index 2d84aaa..76fb692 100644
--- a/dundee/device.c
+++ b/dundee/device.c
@@ -57,6 +57,7 @@ struct dundee_device {
GAtChat *chat;
char *name;
+ char *address;
gboolean active;
struct ipv4_settings settings;
@@ -137,6 +138,9 @@ void __dundee_device_append_properties(struct dundee_device *device,
ofono_dbus_dict_append(dict, "Name", DBUS_TYPE_STRING,
&device->name);
+ ofono_dbus_dict_append(dict, "Address", DBUS_TYPE_STRING,
+ &device->address);
+
ofono_dbus_dict_append(dict, "Active", DBUS_TYPE_BOOLEAN,
&device->active);
}
@@ -586,6 +590,7 @@ static void destroy_device(gpointer user)
g_free(device->path);
g_free(device->name);
+ g_free(device->address);
g_free(device);
}
@@ -666,6 +671,25 @@ int dundee_device_set_name(struct dundee_device *device, const char *name)
return 0;
}
+int dundee_device_set_address(struct dundee_device *device, const char *address)
+{
+ DBusConnection *conn = ofono_dbus_get_connection();
+
+ DBG("%p address %s", device, address);
+
+ g_free(device->address);
+ device->address = g_strdup(address);
+
+ if (device->registered == FALSE)
+ return 0;
+
+ ofono_dbus_signal_property_changed(conn, device->path,
+ DUNDEE_DEVICE_INTERFACE, "Address",
+ DBUS_TYPE_STRING, &device->address);
+
+ return 0;
+}
+
static void device_shutdown(gpointer key, gpointer value, gpointer user_data)
{
struct dundee_device *device = value;
diff --git a/dundee/dundee.h b/dundee/dundee.h
index 1889d84..56c6913 100644
--- a/dundee/dundee.h
+++ b/dundee/dundee.h
@@ -137,6 +137,8 @@ void dundee_device_set_data(struct dundee_device *device, void *data);
void *dundee_device_get_data(struct dundee_device *device);
int dundee_device_set_name(struct dundee_device *device, const char *name);
+int dundee_device_set_address(struct dundee_device *device,
+ const char *address);
typedef void (*dundee_device_foreach_func)(struct dundee_device *device,
void *data);
--
1.8.1.4
8 years
[PATCH v2] atmodem: reset modem if it stops responding.
by Yevhen Kyriukha
I'd tested a lot of ZTE and Huawei modems and noticed that each of them can
hang and become unusable anymore for establishing internet connection.
Some modems may hang right after boot, some of them after connection was
dropped several times.
The problem is that the "Modem" port hangs and doesn't accept any commands.
The only way to bring it to work is to reset the modem.
This is very important issue for devices that needs to be connected through
3G modem all the time and work in automatic mode!
So I created a patch that resolves this issue by checking modem port before
establishing connection.
If we get no answer during some time, we reset the modem and it can be
usable again.
---
drivers/atmodem/gprs-context.c | 84 +++++++++++++++++++++++++++++++++-------
1 file changed, 71 insertions(+), 13 deletions(-)
diff --git a/drivers/atmodem/gprs-context.c b/drivers/atmodem/gprs-context.c
index 3694c27..730ba6e 100644
--- a/drivers/atmodem/gprs-context.c
+++ b/drivers/atmodem/gprs-context.c
@@ -59,6 +59,8 @@ enum state {
struct gprs_context_data {
GAtChat *chat;
unsigned int active_context;
+ guint modem_ready_timeout;
+ char apn[OFONO_GPRS_MAX_APN_LENGTH + 1];
char username[OFONO_GPRS_MAX_USERNAME_LENGTH + 1];
char password[OFONO_GPRS_MAX_PASSWORD_LENGTH + 1];
GAtPPP *ppp;
@@ -219,13 +221,73 @@ static void at_cgdcont_cb(gboolean ok, GAtResult *result, gpointer user_data)
CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
}
+static void activate_primary(struct ofono_gprs_context *gc)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+
+ char buf[OFONO_GPRS_MAX_APN_LENGTH + 128];
+ int len;
+
+ DBG("cid %u", gcd->active_context);
+
+ len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", gcd->active_context);
+
+ if (gcd->apn)
+ snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"", gcd->apn);
+
+ if (g_at_chat_send(gcd->chat, buf, none_prefix, at_cgdcont_cb, gc, NULL) > 0)
+ return;
+
+ CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
+}
+
+static gboolean at_modem_not_ready_cb(gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ GAtChat *chat = g_at_chat_get_slave(gcd->chat);
+
+ gcd->active_context = 0;
+ gcd->state = STATE_IDLE;
+ gcd->modem_ready_timeout = 0;
+
+ ofono_error("Modem not responding");
+ DBG("resetting modem...");
+ CALLBACK_WITH_FAILURE(gcd->cb, gcd->cb_data);
+
+ g_at_chat_send(chat, "AT+CFUN=1,1", none_prefix, NULL, NULL, NULL);
+
+ return FALSE;
+}
+
+static void at_modem_ready_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_gprs_context *gc = user_data;
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ if (gcd->modem_ready_timeout == 0)
+ return; // Too late, modem already been reset
+ DBG("modem is ready");
+ g_source_remove(gcd->modem_ready_timeout);
+ activate_primary(gc);
+}
+
+static void at_activate_primary_with_check(struct ofono_gprs_context *gc)
+{
+ struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
+ gcd->modem_ready_timeout = g_timeout_add_seconds(70, at_modem_not_ready_cb, gc);
+ g_at_chat_send(gcd->chat, "AT", none_prefix, at_modem_ready_cb, gc, NULL);
+}
+
+static void at_gprs_activate_primary_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ at_activate_primary_with_check(user_data);
+}
+
static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
const struct ofono_gprs_primary_context *ctx,
ofono_gprs_context_cb_t cb, void *data)
{
struct gprs_context_data *gcd = ofono_gprs_context_get_data(gc);
- char buf[OFONO_GPRS_MAX_APN_LENGTH + 128];
- int len;
/* IPv6 support not implemented */
if (ctx->proto != OFONO_GPRS_PROTO_IP)
@@ -238,6 +300,7 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
gcd->cb_data = data;
memcpy(gcd->username, ctx->username, sizeof(ctx->username));
memcpy(gcd->password, ctx->password, sizeof(ctx->password));
+ memcpy(gcd->apn, ctx->apn, sizeof(ctx->apn));
gcd->state = STATE_ENABLING;
@@ -258,19 +321,14 @@ static void at_gprs_activate_primary(struct ofono_gprs_context *gc,
* needs to be send on the control port of course.
*
*/
- g_at_chat_send(chat, "AT+ZOPRT?", none_prefix,
- NULL, NULL, NULL);
+ if (g_at_chat_send(chat, "AT+ZOPRT?", none_prefix,
+ at_gprs_activate_primary_cb, gc, NULL) > 0)
+ return;
+ goto error;
}
- len = snprintf(buf, sizeof(buf), "AT+CGDCONT=%u,\"IP\"", ctx->cid);
-
- if (ctx->apn)
- snprintf(buf + len, sizeof(buf) - len - 3, ",\"%s\"",
- ctx->apn);
-
- if (g_at_chat_send(gcd->chat, buf, none_prefix,
- at_cgdcont_cb, gc, NULL) > 0)
- return;
+ at_activate_primary_with_check(gc);
+ return;
error:
CALLBACK_WITH_FAILURE(cb, data);
--
1.7.9.5
8 years
[PATCH 1/2] hfpmodem: Fix ECNR HF feature
by Frederic Danis
---
drivers/hfpmodem/slc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/hfpmodem/slc.c b/drivers/hfpmodem/slc.c
index 40b22a1..38a9b2e 100644
--- a/drivers/hfpmodem/slc.c
+++ b/drivers/hfpmodem/slc.c
@@ -59,7 +59,8 @@ void hfp_slc_info_init(struct hfp_slc_info *info, guint16 version)
info->ag_features = 0;
info->ag_mpty_features = 0;
- info->hf_features = HFP_HF_FEATURE_3WAY;
+ info->hf_features = HFP_HF_FEATURE_ECNR;
+ info->hf_features |= HFP_HF_FEATURE_3WAY;
info->hf_features |= HFP_HF_FEATURE_CLIP;
info->hf_features |= HFP_HF_FEATURE_REMOTE_VOLUME_CONTROL;
--
1.7.9.5
8 years
CDMA voicecall driver
by TengChou Yang
Hi all,
I am currently working on Sierra modem (MC5728V). Looks like CDMA is not
fully supported for the voicecall yet.
What I see from ofono master branch there are only probe, remove, dial,
hangup had been implemented. I am working
on other's method step by step. I am wondering is it worth it to change the
dbus service path from org.ofono.cdma.voicecallmanager
to org.ofono.voicecallmanager? In this case, application doesn't need to
care about it's GSM modem or CDMA modem,
what they need to do is connecting to the same dbus path.
Sincerely,
TengChou Yang
8 years, 1 month
intenet context settings file
by Davide Soldan
Hi to all,
I'd like to replace wvdial with ofono in my arm-powered board with yocto distribution.
I'm playing with the scripts of the package ofono-tests and I'm able to connect with different umts datacards, but I don't understand how I can save the internet settings. I noticed that if I run "create-internet-context APN USER PASSWORD" then ofono remembers that settings. But there's no way to use a settings file? I'll need to load/save some different internet configuration and work with a config file wuold be much better!
Thanks!
8 years, 1 month
GSM patches for Sierra modem
by TengChou Yang
Hi all,
I had made some patches, Which can support Voicecall manager, for Sierra
modem. Please see attached file.
Sincerely,
TengChou Yang
8 years, 1 month
oFono upstream test results_20130603
by Nicolas Paccou
Hello all,
Please find the test report of oFono v1.12 commit 53a0fa8.
During this testing, we ran 197 functional positive cases. 144 cases passed,
1 failed and 52 are blocked due to missing software/missing hardware/Feature
not supported. No new issue has been found.
If you have any comment about this report, contact me please.
Test Objective
As there was only few changes (3) since the previous tests cycle, the aim of
this session was to validate the state of oFono upstream by testing only
major tests of most important features and all tests of features impacted by
last commits (GSM shortcut of Supplementary Services and STK) over all
material we had (according to what feature was supported and by priority
order: PR3, Network Simulator, 3G dongle, phonesim). oFono has been
installed and tested on PR3 running Tizen 2.1 and Ubuntu 12.04 device.
Test Environment
For all Setup:
oFono: v1.12 (updated to commit 53a0fa8)
- Smartphone device Setup:
Image: Tizen Mobile 2.1
Operator & SIM Card: several french and UK SIM Cards according to features
- Laptop + 3G Dongle/Phonesim:
usb_modeswitch: v1.2.3
modeswitch data: 20120120
Hardware: Laptop
Ubuntu: v12.04
Modem: Huawei E173u-2 - Operator & SIM Card: several french and UK SIM Cards
according to features
Phonesim: v1.19 (updated to commit c94e6c0)
- Laptop + HFP
HFP Server:
Hardware: Laptop
Ubuntu: v12.04
Bluez 4.101 (updated to commit 67ef3ac)
oFono has been installed with "--enable-bluez4" option instead of using
default bluez5 plugin (unable to make HFP using this one)
HFP Client: Android JB device
Issue Summary
New bug: 0
None
Known bug: 1
Bug 25982 <https://bugs.meego.com/show_bug.cgi?id=25982> - Going back from
a select item list releases the session
Closed bug: 0
None
Test Result
SUMMARY
Total Test Case 197
Passed 144
Failed 1
Blocked 52
TCs completed 100,0%
Run rate 74%
Pass rate total 73%
Blocked rate total 26%
Pass rate of executed 100%
FEATURES Total Pass Fail Blocked
Pass % Modem Used
Modem 5 5 0 0
100% Tested on smartphone using a real SIM Card and on Laptop
using 3G Dongle or using HFP
SIM 4 4 0 0
100% Tested on smartphone using a real SIM Card and on Laptop
using 3G Dongle
Network 2 2 0 0
100% Tested on smartphone using a real SIM
Connectivity 8 8 0 0
100% Tested on smartphone using a real SIM
Voice Calls 12 12 0 0
100% Tested on smartphone with appropriate SIM Card or using
Network Simulator
Messaging 2 2 0 0
100% Tested on smartphone using a real SIM
Message Waiting 1 1 0 0
100% Tested on Laptop using Phonesim
Supplementary Services 59 56 0 3 95%
Tested on smartphone with appropriate SIM Card
SimToolKit 104 54 1 49
52% Tested on Laptop using Phonesim
Please find details in the attached file.
Notes
Please note that I have found a crash of oFono when running two STK TCs in a
row:
Bug <https://bugs.meego.com/show_bug.cgi?id=25998> 25998 - oFono crashes
when doing a NAA Initialization+File Change Notification after having done a
NAA Initialization+Full File Change Notification with Phonesim.
26% of cases are blocked due to:
- Missing software (e.g.: Missing feature in Phonesim or missing a
visual application for some blocked feature as Setup Idle ModeText, Select
Item, Send SMS, etc.)
- Missing hardware (e.g.: Missing other SIM (having appropriate service
activated).
- Feature not supported by oFono
Best regards,
Nicolas
8 years, 1 month
