From b08f5b9e3b160fecb099f6153ad4be163ef97432 Mon Sep 17 00:00:00 2001 From: Mika Liljeberg Date: Mon, 29 Nov 2010 11:44:22 +0200 Subject: [PATCH] isimodem: revector GPRS driver to new gisi API --- drivers/isimodem/gprs-context.c | 281 +++++++++++++-------------- drivers/isimodem/gprs.c | 331 +++++++++++++++++++------------- 2 files changed, 334 insertions(+), 278 deletions(-) diff --git a/drivers/isimodem/gprs-context.c b/drivers/isimodem/gprs-context.c index 2dc1263d..b1caa74e 100644 --- a/drivers/isimodem/gprs-context.c +++ b/drivers/isimodem/gprs-context.c @@ -74,6 +74,7 @@ struct context_data { GIsiPipe *pipe; guint activate_timeout; guint deactivate_timeout; + guint reset; char apn[GPDS_MAX_APN_STRING_LENGTH + 1]; char username[GPDS_MAX_USERNAME_LENGTH + 1]; @@ -83,19 +84,21 @@ struct context_data { uint8_t type; }; +static gboolean client_reset(gpointer data) +{ + struct context_data *cd = data; + + g_isi_client_reset(cd->client); + cd->reset = 0; + + return FALSE; +} + static void reset_context(struct context_data *cd) { if (cd == NULL) return; - g_isi_remove_subscription(cd->client, PN_GPDS, - GPDS_CONTEXT_ACTIVATE_IND); - g_isi_remove_subscription(cd->client, - PN_GPDS, GPDS_CONTEXT_ACTIVATE_FAIL_IND); - g_isi_remove_subscription(cd->client, - PN_GPDS, GPDS_CONTEXT_DEACTIVATE_IND); - g_isi_commit_subscriptions(cd->client); - if (cd->activate_timeout) g_source_remove(cd->activate_timeout); @@ -113,23 +116,23 @@ static void reset_context(struct context_data *cd) cd->pep = NULL; cd->pipe = NULL; cd->handle = INVALID_ID; + + cd->reset = g_idle_add(client_reset, cd); } -static gboolean gprs_up_fail(struct context_data *cd) +typedef void (*ContextFailFunc)(struct context_data *cd); + +static void gprs_up_fail(struct context_data *cd) { CALLBACK_WITH_FAILURE(cd->up_cb, NULL, 0, NULL, NULL, NULL, NULL, cd->data); - reset_context(cd); - return TRUE; } -static gboolean gprs_down_fail(struct context_data *cd) +static void gprs_down_fail(struct context_data *cd) { CALLBACK_WITH_FAILURE(cd->down_cb, cd->data); - reset_context(cd); - return TRUE; } static gboolean gprs_up_timeout(gpointer data) @@ -150,70 +153,88 @@ static gboolean gprs_down_timeout(gpointer data) return FALSE; } -static gboolean check_resp(GIsiClient *client, - const uint8_t *restrict msg, size_t len, - uint_fast8_t cmd, struct context_data *cd) +static gboolean check_resp(const GIsiMessage *msg, uint8_t id, size_t minlen, + struct context_data *cd, + ContextFailFunc fail_cb) { - if (!msg) { - DBG("ISI client error: %d", g_isi_client_error(client)); + const uint8_t *data = g_isi_msg_data(msg); + + if (g_isi_msg_error(msg) < 0) { + DBG("ISI message error: %d", g_isi_msg_error(msg)); + goto error; + } + + if (g_isi_msg_id(msg) != id) + return FALSE; + + if (g_isi_msg_data_len(msg) < minlen) { + DBG("truncated message"); + goto error; + } + + if (cd->handle != INVALID_ID && data[0] != cd->handle) + return FALSE; + + if (data[1] != GPDS_OK) { + DBG("context error: %s (0x%02"PRIx8")", + gpds_status_name(data[1]), data[1]); + + if (minlen > 2) + DBG(" fail cause: %s (0x%02"PRIx8")", + gpds_isi_cause_name(data[2]), data[2]); + + goto error; + } + + return TRUE; + +error: + if (fail_cb) + fail_cb(cd); + + return FALSE; +} + +static gboolean check_ind(const GIsiMessage *msg, size_t minlen, + struct context_data *cd) + +{ + const uint8_t *data = g_isi_msg_data(msg); + + if (g_isi_msg_error(msg) < 0) { + DBG("ISI message error: %d", g_isi_msg_error(msg)); return FALSE; } - if (len < 3) { + if (g_isi_msg_data_len(msg) < minlen) { DBG("truncated message"); return FALSE; } - if (msg[0] != cmd) { - DBG("unexpected message ID: %s (0x%02"PRIx8")", - gpds_message_id_name(msg[0]), msg[0]); + if (cd->handle != INVALID_ID && data[0] != cd->handle) return FALSE; - } - if ((cd->handle != INVALID_ID && msg[1] != cd->handle) - || (msg[1] == INVALID_ID)) { - DBG("invalid context ID: 0x%02"PRIx8, msg[1]); - return FALSE; - } - - if (msg[2] != GPDS_OK) { - DBG("context creation error: %s (0x%02"PRIx8")", - gpds_status_name(msg[2]), msg[2]); - - if (len > 3) - DBG(" fail cause: %s (0x%02"PRIx8")", - gpds_isi_cause_name(msg[3]), msg[3]); - - return FALSE; - } return TRUE; } -static void deactivate_ind_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void deactivate_ind_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; - const unsigned char *msg = data; + const uint8_t *data = g_isi_msg_data(msg); - if (!msg || len < 3 || msg[0] != GPDS_CONTEXT_DEACTIVATE_IND || - msg[1] != cd->handle) + if (!check_ind(msg, 2, cd)) return; DBG("context deactivated: %s (0x%02"PRIx8")", - gpds_isi_cause_name(msg[3]), msg[3]); + gpds_isi_cause_name(data[2]), data[2]); ofono_gprs_context_deactivated(cd->context, cd->cid); reset_context(cd); } -static void activate_ind_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void activate_ind_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; - - const unsigned char *msg = data; GIsiSubBlockIter iter; char ifname[IF_NAMESIZE]; @@ -222,11 +243,10 @@ static void activate_ind_cb(GIsiClient *client, char *sdns = NULL; const char *dns[3]; - if (!msg || len < 3 || msg[0] != GPDS_CONTEXT_ACTIVATE_IND || - msg[1] != cd->handle) + if (!check_ind(msg, 2, cd)) return; - for (g_isi_sb_iter_init(&iter, msg, len, 3); + for (g_isi_sb_iter_init(&iter, msg, 2); g_isi_sb_iter_is_valid(&iter); g_isi_sb_iter_next(&iter)) { @@ -305,29 +325,19 @@ error: gprs_up_fail(cd); } -static void activate_fail_ind_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void activate_fail_ind_cb(const GIsiMessage *msg, void *opaque) { - const unsigned char *msg = data; struct context_data *cd = opaque; - if (!msg || len < 3 || msg[0] != GPDS_CONTEXT_ACTIVATE_FAIL_IND) + if (!check_ind(msg, 2, cd)) return; gprs_up_fail(cd); } -static gboolean context_activate_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void context_activate_cb(const GIsiMessage *msg, void *cd) { - struct context_data *cd = opaque; - - if (!check_resp(client, data, len, GPDS_CONTEXT_ACTIVATE_RESP, cd)) - return gprs_up_fail(cd); - - return TRUE; + check_resp(msg, GPDS_CONTEXT_ACTIVATE_RESP, 6, cd, gprs_up_fail); } static void send_context_activate(GIsiClient *client, void *opaque) @@ -340,33 +350,28 @@ static void send_context_activate(GIsiClient *client, void *opaque) 0, /* sub blocks */ }; - - g_isi_add_subscription(client, PN_GPDS, GPDS_CONTEXT_ACTIVATE_IND, + g_isi_client_ind_subscribe(client, GPDS_CONTEXT_ACTIVATE_IND, activate_ind_cb, cd); - g_isi_add_subscription(client, PN_GPDS, GPDS_CONTEXT_ACTIVATE_FAIL_IND, + g_isi_client_ind_subscribe(client, GPDS_CONTEXT_ACTIVATE_FAIL_IND, activate_fail_ind_cb, cd); - g_isi_add_subscription(client, PN_GPDS, GPDS_CONTEXT_DEACTIVATE_IND, + g_isi_client_ind_subscribe(client, GPDS_CONTEXT_DEACTIVATE_IND, deactivate_ind_cb, cd); - g_isi_commit_subscriptions(client); - if (g_isi_request_make(client, msg, sizeof(msg), GPDS_TIMEOUT, - context_activate_cb, cd)) + if (g_isi_client_send(client, msg, sizeof(msg), GPDS_TIMEOUT, + context_activate_cb, cd, NULL)) g_isi_pipe_start(cd->pipe); else gprs_up_fail(cd); } -static gboolean context_auth_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void context_auth_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; - if (!check_resp(client, data, len, GPDS_CONTEXT_AUTH_RESP, cd)) - return gprs_up_fail(cd); + if (!check_resp(msg, GPDS_CONTEXT_AUTH_RESP, 2, cd, gprs_up_fail)) + return; - send_context_activate(client, cd); - return TRUE; + send_context_activate(cd->client, cd); } static void send_context_authenticate(GIsiClient *client, void *opaque) @@ -399,36 +404,30 @@ static void send_context_authenticate(GIsiClient *client, void *opaque) { cd->password, password_len }, }; - if (g_isi_request_vmake(client, iov, 4, GPDS_TIMEOUT, - context_auth_cb, cd) == NULL) + if (g_isi_client_vsend(client, iov, 4, GPDS_TIMEOUT, + context_auth_cb, cd, NULL) == NULL) gprs_up_fail(cd); } -static gboolean context_conf_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void context_conf_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; - if (!check_resp(client, data, len, GPDS_CONTEXT_CONFIGURE_RESP, cd)) - return gprs_up_fail(cd); + if (!check_resp(msg, GPDS_CONTEXT_CONFIGURE_RESP, 2, cd, gprs_up_fail)) + return; if (cd->username[0] != '\0') - send_context_authenticate(client, cd); + send_context_authenticate(cd->client, cd); else - send_context_activate(client, cd); - - return TRUE; + send_context_activate(cd->client, cd); } -static gboolean link_conf_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void link_conf_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; size_t apn_len = strlen(cd->apn); - const unsigned char msg[] = { + const unsigned char req[] = { GPDS_CONTEXT_CONFIGURE_REQ, cd->handle, /* context ID */ cd->type, /* PDP type */ @@ -445,46 +444,38 @@ static gboolean link_conf_cb(GIsiClient *client, }; const struct iovec iov[2] = { - { (uint8_t *)msg, sizeof(msg) }, + { (uint8_t *)req, sizeof(req) }, { cd->apn, apn_len }, }; - if (!check_resp(client, data, len, GPDS_LL_CONFIGURE_RESP, cd)) - return gprs_up_fail(cd); + if (!check_resp(msg, GPDS_LL_CONFIGURE_RESP, 2, cd, gprs_up_fail)) + return; - if (!g_isi_request_vmake(client, iov, 2, GPDS_TIMEOUT, - context_conf_cb, cd)) - return gprs_up_fail(cd); - - return TRUE; + if (!g_isi_client_vsend(cd->client, iov, 2, GPDS_TIMEOUT, + context_conf_cb, cd, NULL)) + gprs_up_fail(cd); } -static gboolean create_context_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void create_context_cb(const GIsiMessage *msg, void *opaque) { - const unsigned char *resp = data; struct context_data *cd = opaque; + const uint8_t *data = g_isi_msg_data(msg); - unsigned char msg[] = { + unsigned char req[] = { GPDS_LL_CONFIGURE_REQ, 0x00, /* GPDS context ID, added later */ g_isi_pipe_get_handle(cd->pipe), GPDS_LL_PLAIN, /* link type */ }; - if (!check_resp(client, data, len, GPDS_CONTEXT_ID_CREATE_RESP, cd)) - return gprs_up_fail(cd); + if (!check_resp(msg, GPDS_CONTEXT_ID_CREATE_RESP, 2, cd, gprs_up_fail)) + return; - cd->handle = msg[1] = resp[1]; + cd->handle = req[1] = data[0]; - if (g_isi_request_make(client, msg, sizeof(msg), GPDS_TIMEOUT, - link_conf_cb, cd) == NULL) - return gprs_up_fail(cd); - - /* TODO: send context configuration at the same time? */ - - return TRUE; + if (!g_isi_client_send(cd->client, req, sizeof(req), GPDS_TIMEOUT, + link_conf_cb, cd, NULL)) + gprs_up_fail(cd); } static void create_pipe_cb(GIsiPipe *pipe) @@ -495,8 +486,8 @@ static void create_pipe_cb(GIsiPipe *pipe) GPDS_CONTEXT_ID_CREATE_REQ, }; - if (g_isi_request_make(cd->client, msg, sizeof(msg), GPDS_TIMEOUT, - create_context_cb, cd) == NULL) + if (g_isi_client_send(cd->client, msg, sizeof(msg), GPDS_TIMEOUT, + create_context_cb, cd, NULL) == NULL) gprs_up_fail(cd); } @@ -506,6 +497,8 @@ static void isi_gprs_activate_primary(struct ofono_gprs_context *gc, { struct context_data *cd = ofono_gprs_context_get_data(gc); + DBG("activate: gpds = 0x%04x", cd->gpds); + if (!cd->gpds) { /* GPDS is not reachable */ CALLBACK_WITH_FAILURE(cb, NULL, 0, NULL, NULL, NULL, @@ -513,6 +506,12 @@ static void isi_gprs_activate_primary(struct ofono_gprs_context *gc, return; } + if (cd->reset) { + g_isi_client_reset(cd->client); + g_source_remove(cd->reset); + cd->reset = 0; + } + cd->cid = ctx->cid; cd->up_cb = cb; cd->data = data; @@ -555,20 +554,16 @@ error: gprs_up_fail(cd); } -static gboolean context_deactivate_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, - void *opaque) +static void context_deactivate_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; - if (!check_resp(client, data, len, GPDS_CONTEXT_DEACTIVATE_RESP, cd)) - return gprs_down_fail(cd); + if (!check_resp(msg, GPDS_CONTEXT_DEACTIVATE_RESP, 2, cd, + gprs_down_fail)) + return; CALLBACK_WITH_SUCCESS(cd->down_cb, cd->data); reset_context(cd); - - return TRUE; } static void isi_gprs_deactivate_primary(struct ofono_gprs_context *gc, @@ -590,8 +585,8 @@ static void isi_gprs_deactivate_primary(struct ofono_gprs_context *gc, msg[1] = cd->handle; - if (g_isi_request_make(cd->client, msg, sizeof(msg), GPDS_TIMEOUT, - context_deactivate_cb, cd) == NULL) { + if (g_isi_client_send(cd->client, msg, sizeof(msg), GPDS_TIMEOUT, + context_deactivate_cb, cd, NULL) == NULL) { gprs_down_fail(cd); return; } @@ -600,28 +595,16 @@ static void isi_gprs_deactivate_primary(struct ofono_gprs_context *gc, gprs_down_timeout, cd); } -static void gpds_ctx_reachable_cb(GIsiClient *client, gboolean alive, - uint16_t object, - void *opaque) +static void gpds_ctx_reachable_cb(const GIsiMessage *msg, void *opaque) { struct context_data *cd = opaque; - const char *debug; - if (!alive) { + if (g_isi_msg_error(msg) < 0) { DBG("unable to bootstrap gprs context driver"); return; } - DBG("%s (v%03d.%03d) for PDP contexts", - pn_resource_name(g_isi_client_resource(client)), - g_isi_version_major(client), - g_isi_version_minor(client)); - - cd->gpds = object; - - debug = getenv("OFONO_ISI_DEBUG"); - if (debug && (strcmp(debug, "all") == 0 || strcmp(debug, "gpds") == 0)) - g_isi_client_set_debug(cd->client, gpds_debug, NULL); + cd->gpds = g_isi_msg_object(msg); } static int isi_gprs_context_probe(struct ofono_gprs_context *gc, @@ -643,7 +626,7 @@ static int isi_gprs_context_probe(struct ofono_gprs_context *gc, cd->context = gc; ofono_gprs_context_set_data(gc, cd); - g_isi_verify(cd->client, gpds_ctx_reachable_cb, cd); + g_isi_client_verify(cd->client, gpds_ctx_reachable_cb, cd, NULL); return 0; } diff --git a/drivers/isimodem/gprs.c b/drivers/isimodem/gprs.c index 3c9facde..9e8c73aa 100644 --- a/drivers/isimodem/gprs.c +++ b/drivers/isimodem/gprs.c @@ -35,11 +35,14 @@ #include #include #include +#include #include +#include #include "isimodem.h" #include "isiutil.h" #include "gpds.h" +#include "info.h" #include "debug.h" /* 27.007 Section 10.1.20 */ @@ -54,20 +57,25 @@ enum network_registration_status { struct gprs_data { GIsiClient *client; + GIsiClient *info_client; }; -static void detach_ind_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void detach_ind_cb(const GIsiMessage *msg, void *opaque) { struct ofono_gprs *gprs = opaque; - const unsigned char *msg = data; + const uint8_t *data = g_isi_msg_data(msg); - if (!msg || len < 3 || msg[0] != GPDS_DETACH_IND) + if (g_isi_msg_error(msg) < 0) + return; + + if (g_isi_msg_id(msg) != GPDS_DETACH_IND) + return; + + if (g_isi_msg_data_len(msg) < 2) return; DBG("detached: %s (0x%02"PRIx8")", - gpds_isi_cause_name(msg[1]), msg[1]); + gpds_isi_cause_name(data[0]), data[0]); ofono_gprs_detached_notify(gprs); } @@ -108,67 +116,147 @@ static void suspend_notify(struct ofono_gprs *gprs, uint8_t suspend_status, ofono_gprs_suspend_notify(gprs, cause); } -static void transfer_status_ind_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void transfer_status_ind_cb(const GIsiMessage *msg, void *opaque) { struct ofono_gprs *gprs = opaque; - const unsigned char *msg = data; + const uint8_t *data = g_isi_msg_data(msg); - if (!msg || len < 3 || msg[0] != GPDS_TRANSFER_STATUS_IND) + if (g_isi_msg_error(msg) < 0) return; - suspend_notify(gprs, msg[1], msg[2]); + if (g_isi_msg_id(msg) != GPDS_TRANSFER_STATUS_IND) + return; + + if (g_isi_msg_data_len(msg) < 2) + return; + + suspend_notify(gprs, data[0], data[1]); } -static gboolean isi_gprs_register(gpointer user) +static void create_contexts(struct ofono_gprs *gprs, int count) { - struct ofono_gprs *gprs = user; struct gprs_data *gd = ofono_gprs_get_data(gprs); + GIsiModem *modem = g_isi_client_modem(gd->client); + struct ofono_modem *omodem = g_isi_modem_get_userdata(modem); + struct ofono_gprs_context *gc; + int i; - const char *debug = getenv("OFONO_ISI_DEBUG"); + for (i = 0; i < count; i++) { + gc = ofono_gprs_context_create(omodem, 0, "isimodem", modem); + if (!gc) + break; - if (debug && (strcmp(debug, "all") == 0 || strcmp(debug, "gpds") == 0)) - g_isi_client_set_debug(gd->client, gpds_debug, NULL); + ofono_gprs_add_context(gprs, gc); + } - g_isi_subscribe(gd->client, GPDS_DETACH_IND, detach_ind_cb, gprs); - g_isi_subscribe(gd->client, GPDS_TRANSFER_STATUS_IND, - transfer_status_ind_cb, gprs); + ofono_gprs_set_cid_range(gprs, 1, i); - ofono_gprs_register(user); - - return FALSE; + DBG("%d GPRS contexts created", count); } -static void gpds_reachable_cb(GIsiClient *client, - gboolean alive, uint16_t object, - void *opaque) +static void info_pp_read_resp_cb(const GIsiMessage *msg, void *opaque) { struct ofono_gprs *gprs = opaque; + uint8_t count = GPDS_MAX_CONTEXT_COUNT; + GIsiSubBlockIter iter; - if (!alive) { - DBG("unable to bootsrap gprs driver"); + if (g_isi_msg_error(msg) < 0) + goto out; + + if (g_isi_msg_id(msg) != INFO_PP_READ_RESP) + goto out; + + for (g_isi_sb_iter_init(&iter, msg, 2); g_isi_sb_iter_is_valid(&iter); + g_isi_sb_iter_next(&iter)) { + + switch (g_isi_sb_iter_get_id(&iter)) { + case INFO_SB_PP: { + guint16 fea; + guint8 n; + unsigned pp; + + if (!g_isi_sb_iter_get_byte(&iter, &n, 1)) + goto out; + + for (pp = 4; n--; pp += 2) { + + if (!g_isi_sb_iter_get_word(&iter, &fea, pp)) + goto out; + + if ((fea >> 8) != INFO_PP_MAX_PDP_CONTEXTS) + goto out; + + count = fea & 0xff; + break; + } + break; + } + + default: + break; + } + } + +out: + create_contexts(gprs, count); +} + +static void gpds_reachable_cb(const GIsiMessage *msg, void *opaque) +{ + struct ofono_gprs *gprs = opaque; + struct gprs_data *gd = ofono_gprs_get_data(gprs); + GIsiModem *modem = g_isi_client_modem(gd->client); + + const unsigned char req[] = { + INFO_PP_READ_REQ, + 0, /* filler */ + 1, /* subblocks */ + INFO_SB_PP, + 8, /* subblock length */ + 0, + 1, /* N */ + INFO_PP_MAX_PDP_CONTEXTS, /* PP feature */ + 0, /* PP value */ + 0, /* filler */ + 0 /* filler */ + }; + + if (g_isi_msg_error(msg) < 0) { + DBG("unable to bootstrap gprs driver"); return; } - DBG("%s (v%03d.%03d)", - pn_resource_name(g_isi_client_resource(client)), - g_isi_version_major(client), - g_isi_version_minor(client)); + ISI_VERSION_DBG(msg); - g_idle_add(isi_gprs_register, gprs); + g_isi_client_ind_subscribe(gd->client, GPDS_DETACH_IND, + detach_ind_cb, gprs); + g_isi_client_ind_subscribe(gd->client, GPDS_TRANSFER_STATUS_IND, + transfer_status_ind_cb, gprs); + + ofono_gprs_register(gprs); + + gd->info_client = g_isi_client_create(modem, PN_PHONE_INFO); + if (!gd->info_client) { + create_contexts(gprs, GPDS_MAX_CONTEXT_COUNT); + return; + } + + if (g_isi_client_send(gd->info_client, req, sizeof(req), + GPDS_TIMEOUT, info_pp_read_resp_cb, + gprs, NULL)) + return; } static int isi_gprs_probe(struct ofono_gprs *gprs, unsigned int vendor, void *user) { - GIsiModem *idx = user; + GIsiModem *modem = user; struct gprs_data *gd = g_try_new0(struct gprs_data, 1); if (gd == NULL) return -ENOMEM; - gd->client = g_isi_client_create(idx, PN_GPDS); + gd->client = g_isi_client_create(modem, PN_GPDS); if (gd->client == NULL) { g_free(gd); return -ENOMEM; @@ -176,106 +264,81 @@ static int isi_gprs_probe(struct ofono_gprs *gprs, ofono_gprs_set_data(gprs, gd); - ofono_gprs_set_cid_range(gprs, 1, GPDS_MAX_CONTEXT_COUNT + 1); - - g_isi_verify(gd->client, gpds_reachable_cb, gprs); + g_isi_client_verify(gd->client, gpds_reachable_cb, gprs, NULL); return 0; } static void isi_gprs_remove(struct ofono_gprs *gprs) { - struct gprs_data *data = ofono_gprs_get_data(gprs); - - if (data == NULL) - return; + struct gprs_data *gd = ofono_gprs_get_data(gprs); ofono_gprs_set_data(gprs, NULL); - g_isi_client_destroy(data->client); - g_free(data); + + if (gd == NULL) + return; + + g_isi_client_destroy(gd->client); + g_isi_client_destroy(gd->info_client); + g_free(gd); } -static gboolean attach_resp_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void attach_resp_cb(const GIsiMessage *msg, void *opaque) { - const unsigned char *msg = data; struct isi_cb_data *cbd = opaque; ofono_gprs_cb_t cb = cbd->cb; + const uint8_t *data = g_isi_msg_data(msg); - if (!msg) { - DBG("ISI client error: %d", g_isi_client_error(client)); + if (g_isi_msg_error(msg) < 0) { + DBG("ISI message error: %d", g_isi_msg_error(msg)); goto error; } - if (len != 4 || msg[0] != GPDS_ATTACH_RESP) - return FALSE; + if (g_isi_msg_id(msg) != GPDS_ATTACH_RESP) + return; - if (msg[1] == GPDS_OK) { - CALLBACK_WITH_SUCCESS(cb, cbd->data); + if (g_isi_msg_data_len(msg) < 2) + goto error; - return TRUE; - } - - DBG("attach failed: %s", gpds_status_name(msg[1])); - -error: - CALLBACK_WITH_FAILURE(cb, cbd->data); - - return TRUE; -} - -static gboolean detach_resp_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) -{ - const unsigned char *msg = data; - struct isi_cb_data *cbd = opaque; - ofono_gprs_cb_t cb = cbd->cb; - - if (!msg) { - DBG("ISI client error: %d", g_isi_client_error(client)); + if (data[0] != GPDS_OK) { + DBG("attach failed: %s", gpds_status_name(data[0])); goto error; } - if (len != 3 || msg[0] != GPDS_DETACH_RESP) - return FALSE; - - if (msg[1] == GPDS_OK) { - CALLBACK_WITH_SUCCESS(cb, cbd->data); - - return TRUE; - } - - DBG("detach failed: %s", gpds_status_name(msg[1])); + CALLBACK_WITH_SUCCESS(cb, cbd->data); + return; error: CALLBACK_WITH_FAILURE(cb, cbd->data); - - return TRUE; } -static GIsiRequest *attach_request_send(GIsiClient *client, void *data) +static void detach_resp_cb(const GIsiMessage *msg, void *opaque) { - const unsigned char msg[] = { - GPDS_ATTACH_REQ, - GPDS_FOLLOW_OFF - }; + struct isi_cb_data *cbd = opaque; + ofono_gprs_cb_t cb = cbd->cb; + const uint8_t *data = g_isi_msg_data(msg); - return g_isi_send(client, msg, sizeof(msg), GPDS_TIMEOUT, - attach_resp_cb, data, g_free); -} + if (g_isi_msg_error(msg) < 0) { + DBG("ISI client error: %d", g_isi_msg_error(msg)); + goto error; + } -static GIsiRequest *detach_request_send(GIsiClient *client, void *data) -{ - const unsigned char msg[] = { - GPDS_DETACH_REQ, - 0x00, /* filler */ - 0x00 /* sub-blocks */ - }; + if (g_isi_msg_id(msg) != GPDS_DETACH_RESP) + return; - return g_isi_send(client, msg, sizeof(msg), GPDS_TIMEOUT, - detach_resp_cb, data, g_free); + if (g_isi_msg_data_len(msg) < 2) + goto error; + + if (data[0] != GPDS_OK) { + DBG("detach failed: %s", gpds_status_name(data[0])); + goto error; + } + + CALLBACK_WITH_SUCCESS(cb, cbd->data); + return; + +error: + CALLBACK_WITH_FAILURE(cb, cbd->data); } static void isi_gprs_set_attached(struct ofono_gprs *gprs, int attached, @@ -284,45 +347,59 @@ static void isi_gprs_set_attached(struct ofono_gprs *gprs, int attached, struct gprs_data *gd = ofono_gprs_get_data(gprs); struct isi_cb_data *cbd = isi_cb_data_new(NULL, cb, data); - GIsiRequest *req; - if (cbd == NULL || gd == NULL) goto error; - if (attached) - req = attach_request_send(gd->client, cbd); - else - req = detach_request_send(gd->client, cbd); + if (attached) { + const unsigned char msg[] = { + GPDS_ATTACH_REQ, + GPDS_FOLLOW_OFF + }; - if (req) - return; + if (g_isi_client_send(gd->client, msg, sizeof(msg), + GPDS_TIMEOUT, attach_resp_cb, + cbd, g_free)) + return; + } else { + const unsigned char msg[] = { + GPDS_DETACH_REQ, + 0x00, /* filler */ + 0x00 /* sub-blocks */ + }; + + if (g_isi_client_send(gd->client, msg, sizeof(msg), + GPDS_TIMEOUT, detach_resp_cb, + cbd, g_free)) + return; + } error: CALLBACK_WITH_FAILURE(cb, data); g_free(cbd); } -static gboolean status_resp_cb(GIsiClient *client, - const void *restrict data, size_t len, - uint16_t object, void *opaque) +static void status_resp_cb(const GIsiMessage *msg, void *opaque) { - const unsigned char *msg = data; struct isi_cb_data *cbd = opaque; ofono_gprs_status_cb_t cb = cbd->cb; struct ofono_gprs *gprs = cbd->data; int status; + const uint8_t *data = g_isi_msg_data(msg); - if (!msg) { - DBG("ISI client error: %d", g_isi_client_error(client)); + if (g_isi_msg_error(msg) < 0) { + DBG("ISI message error: %d", g_isi_msg_error(msg)); goto error; } - if (len < 13 || msg[0] != GPDS_STATUS_RESP) - return FALSE; + if (g_isi_msg_id(msg) != GPDS_STATUS_RESP) + return; + + if (g_isi_msg_data_len(msg) < 12) + goto error; /* FIXME: the core still expects reg status, and not a boolean * attached status here.*/ - switch (msg[1]) { + switch (data[0]) { case GPDS_ATTACHED: status = GPRS_STAT_REGISTERED; break; @@ -333,16 +410,13 @@ static gboolean status_resp_cb(GIsiClient *client, status = GPRS_STAT_UNKNOWN; } - suspend_notify(gprs, msg[11], msg[12]); + suspend_notify(gprs, data[10], data[11]); CALLBACK_WITH_SUCCESS(cb, status, cbd->data); - - return TRUE; + return; error: CALLBACK_WITH_FAILURE(cb, -1, cbd->data); - - return TRUE; } static void isi_gprs_attached_status(struct ofono_gprs *gprs, @@ -359,14 +433,13 @@ static void isi_gprs_attached_status(struct ofono_gprs *gprs, if (cbd == NULL || gd == NULL) goto error; - if (g_isi_send(gd->client, msg, sizeof(msg), GPDS_TIMEOUT, - status_resp_cb, cbd, g_free)) + if (g_isi_client_send(gd->client, msg, sizeof(msg), GPDS_TIMEOUT, + status_resp_cb, cbd, g_free)) return; error: CALLBACK_WITH_FAILURE(cb, -1, data); g_free(cbd); - } static struct ofono_gprs_driver driver = {