--- plugins/mbpi.c | 71 +++++++++++++++++++++++++-------------------------- plugins/mbpi.h | 2 +- plugins/provision.c | 2 +- tools/lookup-apn.c | 2 +- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/plugins/mbpi.c b/plugins/mbpi.c index 53d4b27..1e41ecb 100644 --- a/plugins/mbpi.c +++ b/plugins/mbpi.c @@ -347,7 +347,7 @@ static const GMarkupParser gsm_parser = { NULL, }; -static void toplevel_start(GMarkupParseContext *context, +static void toplevel_gsm_start(GMarkupParseContext *context, const gchar *element_name, const gchar **atribute_names, const gchar **attribute_values, @@ -362,7 +362,7 @@ static void toplevel_start(GMarkupParseContext *context, g_markup_parse_context_push(context, &skip_parser, NULL); } -static void toplevel_end(GMarkupParseContext *context, +static void toplevel_gsm_end(GMarkupParseContext *context, const gchar *element_name, gpointer userdata, GError **error) { @@ -371,42 +371,22 @@ static void toplevel_end(GMarkupParseContext *context, g_markup_parse_context_pop(context); } -static const GMarkupParser toplevel_parser = { - toplevel_start, - toplevel_end, +static const GMarkupParser toplevel_gsm_parser = { + toplevel_gsm_start, + toplevel_gsm_end, NULL, NULL, NULL, }; -static gboolean mbpi_parse(const char *data, ssize_t size, - struct gsm_data *gsm, GError **error) -{ - GMarkupParseContext *context; - gboolean ret; - - context = g_markup_parse_context_new(&toplevel_parser, - G_MARKUP_TREAT_CDATA_AS_TEXT, - gsm, NULL); - - ret = g_markup_parse_context_parse(context, data, size, error); - - if (ret == TRUE) - g_markup_parse_context_end_parse(context, error); - - g_markup_parse_context_free(context); - - return ret; -} - -GSList *mbpi_lookup(const char *mcc, const char *mnc, - gboolean allow_duplicates, GError **error) +static gboolean mbpi_parse(const GMarkupParser *parser, gpointer userdata, + GError **error) { struct stat st; char *db; int fd; - struct gsm_data gsm; - GSList *l; + GMarkupParseContext *context; + gboolean ret; fd = open(MBPI_DATABASE, O_RDONLY); if (fd < 0) { @@ -414,7 +394,7 @@ GSList *mbpi_lookup(const char *mcc, const char *mnc, g_file_error_from_errno(errno), "open(%s) failed: %s", MBPI_DATABASE, g_strerror(errno)); - return NULL; + return FALSE; } if (fstat(fd, &st) < 0) { @@ -423,7 +403,7 @@ GSList *mbpi_lookup(const char *mcc, const char *mnc, g_file_error_from_errno(errno), "fstat(%s) failed: %s", MBPI_DATABASE, g_strerror(errno)); - return NULL; + return FALSE; } db = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); @@ -433,15 +413,37 @@ GSList *mbpi_lookup(const char *mcc, const char *mnc, g_file_error_from_errno(errno), "mmap(%s) failed: %s", MBPI_DATABASE, g_strerror(errno)); - return NULL; + return FALSE; } + context = g_markup_parse_context_new(parser, + G_MARKUP_TREAT_CDATA_AS_TEXT, + userdata, NULL); + + ret = g_markup_parse_context_parse(context, db, st.st_size, error); + + if (ret == TRUE) + g_markup_parse_context_end_parse(context, error); + + munmap(db, st.st_size); + close(fd); + g_markup_parse_context_free(context); + + return ret; +} + +GSList *mbpi_lookup_apn(const char *mcc, const char *mnc, + gboolean allow_duplicates, GError **error) +{ + struct gsm_data gsm; + GSList *l; + memset(&gsm, 0, sizeof(gsm)); gsm.match_mcc = mcc; gsm.match_mnc = mnc; gsm.allow_duplicates = allow_duplicates; - if (mbpi_parse(db, st.st_size, &gsm, error) == FALSE) { + if (mbpi_parse(&toplevel_gsm_parser, &gsm, error) == FALSE) { for (l = gsm.apns; l; l = l->next) mbpi_ap_free(l->data); @@ -449,8 +451,5 @@ GSList *mbpi_lookup(const char *mcc, const char *mnc, gsm.apns = NULL; } - munmap(db, st.st_size); - close(fd); - return gsm.apns; } diff --git a/plugins/mbpi.h b/plugins/mbpi.h index 42e439b..6d34358 100644 --- a/plugins/mbpi.h +++ b/plugins/mbpi.h @@ -23,5 +23,5 @@ const char *mbpi_ap_type(enum ofono_gprs_context_type type); void mbpi_ap_free(struct ofono_gprs_provision_data *data); -GSList *mbpi_lookup(const char *mcc, const char *mnc, +GSList *mbpi_lookup_apn(const char *mcc, const char *mnc, gboolean allow_duplicates, GError **error); diff --git a/plugins/provision.c b/plugins/provision.c index 06cba6f..99c299e 100644 --- a/plugins/provision.c +++ b/plugins/provision.c @@ -50,7 +50,7 @@ static int provision_get_settings(const char *mcc, const char *mnc, DBG("Provisioning for MCC %s, MNC %s, SPN '%s'", mcc, mnc, spn); - apns = mbpi_lookup(mcc, mnc, FALSE, &error); + apns = mbpi_lookup_apn(mcc, mnc, FALSE, &error); if (apns == NULL) { if (error != NULL) { ofono_error("%s", error->message); diff --git a/tools/lookup-apn.c b/tools/lookup-apn.c index b833b6c..884b32a 100644 --- a/tools/lookup-apn.c +++ b/tools/lookup-apn.c @@ -42,7 +42,7 @@ static void lookup_apn(const char *match_mcc, const char *match_mnc, g_print("Searching for info for network: %s%s\n", match_mcc, match_mnc); - apns = mbpi_lookup(match_mcc, match_mnc, allow_duplicates, &error); + apns = mbpi_lookup_apn(match_mcc, match_mnc, allow_duplicates, &error); if (apns == NULL) { if (error != NULL) { -- 1.7.1

--- plugins/mbpi.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ plugins/mbpi.h | 2 + 2 files changed, 153 insertions(+), 0 deletions(-) diff --git a/plugins/mbpi.c b/plugins/mbpi.c index 1e41ecb..14aa339 100644 --- a/plugins/mbpi.c +++ b/plugins/mbpi.c @@ -58,6 +58,12 @@ struct gsm_data { gboolean allow_duplicates; }; +struct cdma_data { + const char *match_sid; + char *provider_name; + gboolean match_found; +}; + const char *mbpi_ap_type(enum ofono_gprs_context_type type) { switch (type) { @@ -281,6 +287,34 @@ static void apn_handler(GMarkupParseContext *context, struct gsm_data *gsm, g_markup_parse_context_push(context, &apn_parser, ap); } +static void sid_handler(GMarkupParseContext *context, + struct cdma_data *cdma, + const gchar **attribute_names, + const gchar **attribute_values, + GError **error) +{ + const char *sid = NULL; + int i; + + if (cdma->match_found == TRUE) + return; + + for (i = 0; attribute_names[i]; i++) { + if (g_str_equal(attribute_names[i], "value") == TRUE) + sid = attribute_values[i]; + } + + if (sid == NULL) { + mbpi_g_set_error(context, error, G_MARKUP_ERROR, + G_MARKUP_ERROR_MISSING_ATTRIBUTE, + "Missing attribute: sid"); + return; + } + + if (g_str_equal(sid, cdma->match_sid)) + cdma->match_found = TRUE; +} + static void gsm_start(GMarkupParseContext *context, const gchar *element_name, const gchar **attribute_names, const gchar **attribute_values, @@ -347,6 +381,74 @@ static const GMarkupParser gsm_parser = { NULL, }; +static void cdma_start(GMarkupParseContext *context, const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer userdata, GError **error) +{ + if (g_str_equal(element_name, "sid")) { + struct cdma_data *cdma = userdata; + /* + * For entries with multiple sid elements, don't bother + * searching if we already have a match + */ + if (cdma->match_found == TRUE) + return; + + sid_handler(context, cdma, attribute_names, attribute_values, + error); + } +} + +static const GMarkupParser cdma_parser = { + cdma_start, + NULL, + NULL, + NULL, + NULL, +}; + +static void provider_start(GMarkupParseContext *context, + const gchar *element_name, + const gchar **attribute_names, + const gchar **attribute_values, + gpointer userdata, GError **error) +{ + struct cdma_data *cdma = userdata; + + if (g_str_equal(element_name, "name")) { + if ((cdma->match_found == FALSE) && (cdma->provider_name)) { + g_free(cdma->provider_name); + cdma->provider_name = NULL; + } + + g_markup_parse_context_push(context, &text_parser, + &cdma->provider_name); + } else if (g_str_equal(element_name, "gsm")) + g_markup_parse_context_push(context, &skip_parser, NULL); + else if (g_str_equal(element_name, "cdma")) + g_markup_parse_context_push(context, &cdma_parser, userdata); +} + +static void provider_end(GMarkupParseContext *context, + const gchar *element_name, + gpointer userdata, GError **error) +{ + if (g_str_equal(element_name, "name") || + g_str_equal(element_name, "gsm") || + g_str_equal(element_name, "cdma")) + g_markup_parse_context_pop(context); + +} + +static const GMarkupParser provider_parser = { + provider_start, + provider_end, + NULL, + NULL, + NULL, +}; + static void toplevel_gsm_start(GMarkupParseContext *context, const gchar *element_name, const gchar **atribute_names, @@ -379,6 +481,40 @@ static const GMarkupParser toplevel_gsm_parser = { NULL, }; +static void toplevel_cdma_start(GMarkupParseContext *context, + const gchar *element_name, + const gchar **atribute_names, + const gchar **attribute_values, + gpointer userdata, GError **error) +{ + struct cdma_data *cdma = userdata; + + if (g_str_equal(element_name, "provider")) { + if (cdma->match_found == TRUE) + g_markup_parse_context_push(context, &skip_parser, + NULL); + else + g_markup_parse_context_push(context, &provider_parser, + userdata); + } +} + +static void toplevel_cdma_end(GMarkupParseContext *context, + const gchar *element_name, + gpointer userdata, GError **error) +{ + if (g_str_equal(element_name, "provider")) + g_markup_parse_context_pop(context); +} + +static const GMarkupParser toplevel_cdma_parser = { + toplevel_cdma_start, + toplevel_cdma_end, + NULL, + NULL, + NULL, +}; + static gboolean mbpi_parse(const GMarkupParser *parser, gpointer userdata, GError **error) { @@ -453,3 +589,18 @@ GSList *mbpi_lookup_apn(const char *mcc, const char *mnc, return gsm.apns; } + +char *mbpi_lookup_cdma_provider_name(const char *sid, GError **error) +{ + struct cdma_data cdma; + + memset(&cdma, 0, sizeof(cdma)); + cdma.match_sid = sid; + + if (mbpi_parse(&toplevel_cdma_parser, &cdma, error) == FALSE) { + g_free(cdma.provider_name); + cdma.provider_name = NULL; + } + + return cdma.provider_name; +} diff --git a/plugins/mbpi.h b/plugins/mbpi.h index 6d34358..64b7ea5 100644 --- a/plugins/mbpi.h +++ b/plugins/mbpi.h @@ -25,3 +25,5 @@ void mbpi_ap_free(struct ofono_gprs_provision_data *data); GSList *mbpi_lookup_apn(const char *mcc, const char *mnc, gboolean allow_duplicates, GError **error); + +char *mbpi_lookup_cdma_provider_name(const char *sid, GError **error); -- 1.7.1

--- Makefile.am | 7 ++- tools/lookup-provider-name.c | 104 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletions(-) create mode 100644 tools/lookup-provider-name.c diff --git a/Makefile.am b/Makefile.am index a28f790..337aeb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -627,7 +627,8 @@ TESTS = $(unit_tests) if TOOLS noinst_PROGRAMS += tools/huawei-audio tools/auto-enable \ - tools/get-location tools/lookup-apn + tools/get-location tools/lookup-apn \ + tools/lookup-provider-name tools_huawei_audio_SOURCES = $(gdbus_sources) tools/huawei-audio.c tools_huawei_audio_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @@ -640,6 +641,10 @@ tools_get_location_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ tools_lookup_apn_SOURCES = plugins/mbpi.c plugins/mbpi.h tools/lookup-apn.c tools_lookup_apn_LDADD = @GLIB_LIBS@ + +tools_lookup_provider_name_SOURCES = plugins/mbpi.c plugins/mbpi.h \ + tools/lookup-provider-name.c +tools_lookup_provider_name_LDADD = @GLIB_LIBS@ endif noinst_PROGRAMS += gatchat/gsmdial gatchat/test-server gatchat/test-qcdm diff --git a/tools/lookup-provider-name.c b/tools/lookup-provider-name.c new file mode 100644 index 0000000..dc91ae5 --- /dev/null +++ b/tools/lookup-provider-name.c @@ -0,0 +1,104 @@ +/* + * + * 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 <stdlib.h> + +#include <glib.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/modem.h> +#include <ofono/gprs-provision.h> + +#include "plugins/mbpi.h" + +static void lookup_cdma_provider_name(const char *match_sid) +{ + GError *error = NULL; + char *name; + + g_print("Searching for serving network name with SID: %s\n", match_sid); + + name = mbpi_lookup_cdma_provider_name(match_sid, &error); + + if (name == NULL) { + if (error != NULL) { + g_printerr("Lookup failed: %s\n", error->message); + g_error_free(error); + } + else + g_printerr("Not found\n"); + + return; + } + + g_print("CDMA provider name: %s\n", name); + + g_free(name); +} + +static gboolean option_version = FALSE; +static gboolean option_duplicates = FALSE; + +static GOptionEntry options[] = { + { "version", 'v', 0, G_OPTION_ARG_NONE, &option_version, + "Show version information and exit" }, + { "allow-duplicates", 0, 0, G_OPTION_ARG_NONE, &option_duplicates, + "Allow duplicate access point types" }, + { NULL }, +}; + +int main(int argc, char **argv) +{ + GOptionContext *context; + GError *error = NULL; + + context = g_option_context_new(NULL); + g_option_context_add_main_entries(context, options, NULL); + + if (g_option_context_parse(context, &argc, &argv, &error) == FALSE) { + if (error != NULL) { + g_printerr("%s\n", error->message); + g_error_free(error); + } else + g_printerr("An unknown error occurred\n"); + exit(1); + } + + g_option_context_free(context); + + if (option_version == TRUE) { + g_print("%s\n", VERSION); + exit(0); + } + + if (argc < 1) { + g_printerr("Missing parameters\n"); + exit(1); + } + + lookup_cdma_provider_name(argv[1]); + + return 0; +} -- 1.7.1