gprs-provision: Refactor provisioning

This commit is contained in:
Denis Kenzior 2011-01-26 14:50:30 -06:00
parent 5e5eed9f83
commit 71e5278ce6
2 changed files with 17 additions and 19 deletions

View File

@ -47,34 +47,31 @@ void __ofono_gprs_provision_free_settings(
g_free(settings);
}
void __ofono_gprs_provision_get_settings(const char *mcc, const char *mnc,
struct ofono_gprs_provision_data **settings,
int *count)
ofono_bool_t __ofono_gprs_provision_get_settings(const char *mcc,
const char *mnc,
struct ofono_gprs_provision_data **settings,
int *count)
{
GSList *d;
*settings = NULL;
*count = 0;
if (mcc == NULL || strlen(mcc) == 0 || mnc == NULL || strlen(mnc) == 0)
return;
return FALSE;
for (d = g_drivers; d != NULL; d = d->next) {
const struct ofono_gprs_provision_driver *driver = d->data;
if (driver->get_settings == NULL)
continue;
DBG("Calling provisioning plugin '%s'", driver->name);
driver->get_settings(mcc, mnc, settings, count);
if (driver->get_settings(mcc, mnc, settings, count) < 0)
continue;
if (*count > 0) {
DBG("Plugin '%s' returned %d context settings",
driver->name, *count);
return;
}
ofono_warn("Provisioning plugin '%s' returned no settings",
driver->name);
return TRUE;
}
return FALSE;
}
static gint compare_priority(gconstpointer a, gconstpointer b)

View File

@ -422,9 +422,10 @@ void __ofono_nettime_info_received(struct ofono_modem *modem,
#include <ofono/sim-auth.h>
#include <ofono/gprs-provision.h>
void __ofono_gprs_provision_get_settings(const char *mcc, const char *mnc,
struct ofono_gprs_provision_data **settings,
int *count);
ofono_bool_t __ofono_gprs_provision_get_settings(const char *mcc,
const char *mnc,
struct ofono_gprs_provision_data **settings,
int *count);
void __ofono_gprs_provision_free_settings(
struct ofono_gprs_provision_data *settings,
int count);