Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[ofono] Added support for provisioning IMS access points. JB#48905
  • Loading branch information
monich committed Feb 20, 2020
1 parent aa4309e commit 68e8b02
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 37 deletions.
6 changes: 5 additions & 1 deletion ofono/plugins/mbpi.c
Expand Up @@ -3,7 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
* Copyright (C) 2015-2017 Jolla Ltd.
* Copyright (C) 2015-2020 Jolla Ltd.
*
* 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
Expand Down Expand Up @@ -60,6 +60,7 @@ const char *mbpi_database = MBPI_DATABASE;
*/
enum ofono_gprs_proto mbpi_default_internet_proto = OFONO_GPRS_PROTO_IPV4V6;
enum ofono_gprs_proto mbpi_default_mms_proto = OFONO_GPRS_PROTO_IP;
enum ofono_gprs_proto mbpi_default_ims_proto = OFONO_GPRS_PROTO_IPV4V6;
enum ofono_gprs_proto mbpi_default_proto = OFONO_GPRS_PROTO_IP;
enum ofono_gprs_auth_method mbpi_default_auth_method = OFONO_GPRS_AUTH_METHOD_ANY;

Expand Down Expand Up @@ -246,6 +247,9 @@ static void usage_start(GMarkupParseContext *context,
} else if (strcmp(text, "mms") == 0) {
apn->type = OFONO_GPRS_CONTEXT_TYPE_MMS;
apn->proto = mbpi_default_mms_proto;
} else if (strcmp(text, "ims") == 0) {
apn->type = OFONO_GPRS_CONTEXT_TYPE_IMS;
apn->proto = mbpi_default_ims_proto;
} else if (strcmp(text, "wap") == 0)
apn->type = OFONO_GPRS_CONTEXT_TYPE_WAP;
else
Expand Down
2 changes: 2 additions & 0 deletions ofono/plugins/mbpi.h
Expand Up @@ -3,6 +3,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
* Copyright (C) 2013-2020 Jolla Ltd.
*
* 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
Expand All @@ -22,6 +23,7 @@
extern const char *mbpi_database;
extern enum ofono_gprs_proto mbpi_default_internet_proto;
extern enum ofono_gprs_proto mbpi_default_mms_proto;
extern enum ofono_gprs_proto mbpi_default_ims_proto;
extern enum ofono_gprs_proto mbpi_default_proto;
extern enum ofono_gprs_auth_method mbpi_default_auth_method;

Expand Down
42 changes: 30 additions & 12 deletions ofono/plugins/sailfish_provision.c
Expand Up @@ -2,7 +2,7 @@
* oFono - Open Source Telephony
*
* Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
* Copyright (C) 2013-2017 Jolla Ltd.
* Copyright (C) 2013-2020 Jolla Ltd.
*
* 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
Expand Down Expand Up @@ -136,38 +136,56 @@ static GSList *provision_pick_best_ap(GSList *list, const char *spn,
}
}

/* Returns the list containing exactly one INTERNET and one MMS access point */
/**
* Returns the list containing INTERNET, MMS and IMS access points,
* always all three of them and always in this order.
*/
static GSList *provision_normalize_apn_list(GSList *apns, const char *spn)
{
static const struct provision_ap_defaults internet_defaults =
{ OFONO_GPRS_CONTEXT_TYPE_INTERNET, "Internet", "internet" };
static const struct provision_ap_defaults mms_defaults =
{ OFONO_GPRS_CONTEXT_TYPE_MMS, "MMS", "mms" };
static const struct provision_ap_defaults ims_defaults =
{ OFONO_GPRS_CONTEXT_TYPE_IMS, "IMS", "ims" };

GSList *internet_apns = NULL;
GSList *mms_apns = NULL;
GSList *ims_apns = NULL;

/* Split internet and mms apns, delete all others */
/* Build separate apn list for each type */
while (apns) {
GSList *link = apns;
struct ofono_gprs_provision_data *ap = link->data;

apns = g_slist_remove_link(apns, link);
if (ap->type == OFONO_GPRS_CONTEXT_TYPE_INTERNET) {
switch (ap->type) {
case OFONO_GPRS_CONTEXT_TYPE_INTERNET:
internet_apns = g_slist_concat(internet_apns, link);
} else if (ap->type == OFONO_GPRS_CONTEXT_TYPE_MMS) {
break;
case OFONO_GPRS_CONTEXT_TYPE_MMS:
mms_apns = g_slist_concat(mms_apns, link);
} else {
break;
case OFONO_GPRS_CONTEXT_TYPE_IMS:
ims_apns = g_slist_concat(ims_apns, link);
break;
default:
g_slist_free_full(link, provision_free_ap);
break;
}
}

/* Pick the best ap of each type and concatenate them */
return g_slist_concat(
provision_pick_best_ap(internet_apns, spn,
mbpi_default_internet_proto, &internet_defaults),
provision_pick_best_ap(mms_apns, spn,
mbpi_default_mms_proto, &mms_defaults));
/* Pick the best ap of each type */
internet_apns = provision_pick_best_ap(internet_apns, spn,
mbpi_default_internet_proto, &internet_defaults);
mms_apns = provision_pick_best_ap(mms_apns, spn,
mbpi_default_mms_proto, &mms_defaults);
ims_apns = provision_pick_best_ap(ims_apns, spn,
mbpi_default_ims_proto, &ims_defaults);

/* And concatenate them in the right order */
return g_slist_concat(internet_apns, g_slist_concat(mms_apns,
ims_apns));
}

int provision_get_settings(const char *mcc, const char *mnc,
Expand Down
143 changes: 119 additions & 24 deletions ofono/unit/test-provision.c
@@ -1,7 +1,7 @@
/*
* oFono - Open Source Telephony
*
* Copyright (C) 2014-2017 Jolla. All rights reserved.
* Copyright (C) 2014-2020 Jolla. 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
Expand Down Expand Up @@ -105,21 +105,21 @@ static void test_provision(gconstpointer test_data)

g_assert(actual->type == expected->type);
g_assert(actual->proto == expected->proto);
g_assert(!g_strcmp0(actual->provider_name,
expected->provider_name));
g_assert(!g_strcmp0(actual->name, expected->name));
g_assert_cmpstr(actual->provider_name, ==,
expected->provider_name);
g_assert_cmpstr(actual->name, ==, expected->name);
g_assert(actual->provider_primary ==
expected->provider_primary);
g_assert(!g_strcmp0(actual->apn, expected->apn));
g_assert(!g_strcmp0(actual->username,
expected->username));
g_assert(!g_strcmp0(actual->password,
expected->password));
g_assert_cmpstr(actual->apn, ==, expected->apn);
g_assert_cmpstr(actual->username, ==,
expected->username);
g_assert_cmpstr(actual->password, ==,
expected->password);
g_assert(actual->auth_method == expected->auth_method);
g_assert(!g_strcmp0(actual->message_proxy,
expected->message_proxy));
g_assert(!g_strcmp0(actual->message_center,
expected->message_center));
g_assert_cmpstr(actual->message_proxy, ==,
expected->message_proxy);
g_assert_cmpstr(actual->message_center, ==,
expected->message_center);
}
} else {
g_assert(!__ofono_gprs_provision_get_settings(test->mcc,
Expand Down Expand Up @@ -212,6 +212,14 @@ static char telia_fi_message_center [] = "http://mms/";
.apn = "mms", \
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE

/* Default IMS settings */
#define DEFAULT_IMS_SETTINGS \
.type = OFONO_GPRS_CONTEXT_TYPE_IMS, \
.proto = OFONO_GPRS_PROTO_IPV4V6, \
.name = "IMS", \
.apn = "ims", \
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE

static const struct ofono_gprs_provision_data telia_fi_internet_mms_p[] = {
{
.type = OFONO_GPRS_CONTEXT_TYPE_INTERNET,
Expand All @@ -231,7 +239,8 @@ static const struct ofono_gprs_provision_data telia_fi_internet_mms_p[] = {
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE,
.message_proxy = telia_fi_message_proxy,
.message_center = telia_fi_message_center
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data telia_fi_internet_mms[] = {
Expand All @@ -251,7 +260,8 @@ static const struct ofono_gprs_provision_data telia_fi_internet_mms[] = {
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE,
.message_proxy = telia_fi_message_proxy,
.message_center = telia_fi_message_center
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data telia_fi_internet[] = {
Expand All @@ -263,7 +273,8 @@ static const struct ofono_gprs_provision_data telia_fi_internet[] = {
.apn = telia_fi_apn_internet,
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
},
{ DEFAULT_MMS_SETTINGS }
{ DEFAULT_MMS_SETTINGS },
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data telia_fi_mms[] = {
Expand All @@ -277,12 +288,14 @@ static const struct ofono_gprs_provision_data telia_fi_mms[] = {
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE,
.message_proxy = telia_fi_message_proxy,
.message_center = telia_fi_message_center
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data default_settings[] = {
{ DEFAILT_INTERNET_SETTINGS },
{ DEFAULT_MMS_SETTINGS }
{ DEFAULT_MMS_SETTINGS },
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data no_auth_settings[] = {
Expand All @@ -300,7 +313,8 @@ static const struct ofono_gprs_provision_data no_auth_settings[] = {
.name = "MMS",
.apn = "mms",
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data auth_settings[] = {
Expand All @@ -318,7 +332,8 @@ static const struct ofono_gprs_provision_data auth_settings[] = {
.apn = "mms",
.password = "password",
.auth_method = OFONO_GPRS_AUTH_METHOD_ANY
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data settings_ip[] = {
Expand All @@ -329,7 +344,8 @@ static const struct ofono_gprs_provision_data settings_ip[] = {
.apn = "internet",
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
},
{ DEFAULT_MMS_SETTINGS }
{ DEFAULT_MMS_SETTINGS },
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data settings_ipv6[] = {
Expand All @@ -345,7 +361,8 @@ static const struct ofono_gprs_provision_data settings_ipv6[] = {
.name = "MMS",
.apn = "mms",
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const struct ofono_gprs_provision_data settings_ipv4v6[] = {
Expand All @@ -356,7 +373,40 @@ static const struct ofono_gprs_provision_data settings_ipv4v6[] = {
.name = "MMS",
.apn = "mms",
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
}
},
{ DEFAULT_IMS_SETTINGS }
};

static char beeline_provider_name [] = "Beeline";
static const struct ofono_gprs_provision_data beeline_ims[] = {
{
.type = OFONO_GPRS_CONTEXT_TYPE_INTERNET,
.proto = OFONO_GPRS_PROTO_IPV4V6,
.provider_name = beeline_provider_name,
.name = "Beeline Internet",
.apn = "internet.beeline.ru",
.username = "beeline",
.password = "beeline",
.auth_method = OFONO_GPRS_AUTH_METHOD_ANY
}, {
.type = OFONO_GPRS_CONTEXT_TYPE_MMS,
.proto = OFONO_GPRS_PROTO_IP,
.provider_name = beeline_provider_name,
.name = "Beeline MMS",
.apn = "mms.beeline.ru",
.username = "beeline",
.password = "beeline",
.auth_method = OFONO_GPRS_AUTH_METHOD_PAP,
.message_proxy = "192.168.94.23:8080",
.message_center = "http://mms/"
}, {
.type = OFONO_GPRS_CONTEXT_TYPE_IMS,
.proto = OFONO_GPRS_PROTO_IPV4V6,
.provider_name = beeline_provider_name,
.name = "Beeline IMS",
.apn = "ims.beeline.ru",
.auth_method = OFONO_GPRS_AUTH_METHOD_NONE
}
};

static char test_provider_name[] = "Test provider";
Expand All @@ -382,7 +432,8 @@ static const struct ofono_gprs_provision_data test_username_password[] = {
.auth_method = OFONO_GPRS_AUTH_METHOD_CHAP,
.message_proxy = test_message_proxy,
.message_center = test_message_center
}
},
{ DEFAULT_IMS_SETTINGS }
};

static const char telia_fi_internet_xml[] =
Expand Down Expand Up @@ -806,6 +857,42 @@ static const struct provision_test_case test_cases[] = {
.mnc = "91",
.settings = telia_fi_mms,
.count = G_N_ELEMENTS(telia_fi_mms)
},{
.name = TEST_SUITE "ims",
.xml =
"<serviceproviders format=\"2.0\">\n\
<country code=\"ru\">\n\
<provider>\n\
<name>Beeline</name>\n\
<gsm>\n\
<network-id mcc=\"250\" mnc=\"99\"/>\n\
<apn value=\"internet.beeline.ru\">\n\
<usage type=\"internet\"/>\n\
<name>Beeline Internet</name>\n\
<username>beeline</username>\n\
<password>beeline</password>\n\
</apn>\n\
<apn value=\"mms.beeline.ru\">\n\
<usage type=\"mms\"/>\n\
<name>Beeline MMS</name>\n\
<authentication method=\"pap\"/>\n\
<username>beeline</username>\n\
<password>beeline</password>\n\
<mmsc>http://mms/</mmsc>\n\
<mmsproxy>192.168.94.23:8080</mmsproxy>\n\
</apn>\n\
<apn value=\"ims.beeline.ru\">\n\
<usage type=\"ims\"/>\n\
<name>Beeline IMS</name>\n\
</apn>\n\
</gsm>\n\
</provider>\n\
</country>\n\
</serviceproviders>\n",
.mcc = "250",
.mnc = "99",
.settings = beeline_ims,
.count = G_N_ELEMENTS(beeline_ims)
},{
.name = TEST_SUITE "not_found_mcc",
.xml = telia_fi_internet_xml,
Expand Down Expand Up @@ -1297,3 +1384,11 @@ int main(int argc, char **argv)
}
return g_test_run();
}

/*
* Local Variables:
* mode: C
* c-basic-offset: 8
* indent-tabs-mode: t
* End:
*/

0 comments on commit 68e8b02

Please sign in to comment.