summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AUTHORS2
-rw-r--r--drivers/isimodem/devinfo.c9
-rw-r--r--drivers/isimodem/network-registration.c18
-rw-r--r--drivers/isimodem/phonebook.c8
-rw-r--r--gisi/iter.c60
-rw-r--r--gisi/iter.h17
6 files changed, 67 insertions, 47 deletions
diff --git a/AUTHORS b/AUTHORS
index 51655cfd..d1e5079e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,4 +12,4 @@ Alexander Kanavin <alexander.kanavin@nokia.com>
Ismo Puustinen <ismo.h.puustinen@nokia.com>
Zhenhua Zhang <zhenhua.zhang@intel.com>
Jukka Saunamäki <jukka.saunamaki@nokia.com>
-Pekka Pessi <ppessi@gmail.com>
+Pekka Pessi <pekka.pessi@nokia.com>
diff --git a/drivers/isimodem/devinfo.c b/drivers/isimodem/devinfo.c
index 60d82102..5f8d85ef 100644
--- a/drivers/isimodem/devinfo.c
+++ b/drivers/isimodem/devinfo.c
@@ -118,11 +118,9 @@ static bool info_resp_cb(GIsiClient *client, const void *restrict data,
goto error;
}
- if (!g_isi_sb_iter_init(msg+3, len-3, &iter, false))
- goto error;
-
- while (g_isi_sb_iter_is_valid(&iter)) {
-
+ for (g_isi_sb_iter_init(&iter, msg, len, 3);
+ g_isi_sb_iter_is_valid(&iter);
+ g_isi_sb_iter_next(&iter)) {
switch (g_isi_sb_iter_get_id(&iter)) {
case INFO_SB_PRODUCT_INFO_MANUFACTURER:
@@ -151,7 +149,6 @@ static bool info_resp_cb(GIsiClient *client, const void *restrict data,
g_isi_sb_iter_get_len(&iter));
break;
}
- g_isi_sb_iter_next(&iter);
}
error:
diff --git a/drivers/isimodem/network-registration.c b/drivers/isimodem/network-registration.c
index 83075a94..9394921d 100644
--- a/drivers/isimodem/network-registration.c
+++ b/drivers/isimodem/network-registration.c
@@ -197,8 +197,7 @@ static gboolean decode_reg_status(struct netreg_data *nd, const guint8 *msg,
{
GIsiSubBlockIter iter;
- if (!g_isi_sb_iter_init(msg, len, &iter, false))
- return FALSE;
+ g_isi_sb_iter_init(&iter, msg, len, 0);
while (g_isi_sb_iter_is_valid(&iter)) {
@@ -396,8 +395,7 @@ static bool name_get_resp_cb(GIsiClient *client, const void *restrict data,
goto error;
}
- if (!g_isi_sb_iter_init(msg+7, len-7, &iter, false))
- goto error;
+ g_isi_sb_iter_init(&iter, msg, len, 7);
while (g_isi_sb_iter_is_valid(&iter)) {
@@ -510,8 +508,7 @@ static bool available_resp_cb(GIsiClient *client, const void *restrict data,
total = msg[2] / 2;
list = alloca(total * sizeof(struct ofono_network_operator));
- if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false))
- goto error;
+ g_isi_sb_iter_init(&iter, msg, len, 3);
while (g_isi_sb_iter_is_valid(&iter)) {
@@ -767,8 +764,7 @@ static void rat_ind_cb(GIsiClient *client, const void *restrict data,
if (!msg || len < 3 || msg[0] != NET_RAT_IND)
return;
- if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false))
- return;
+ g_isi_sb_iter_init(&iter, msg, len, 3);
while (g_isi_sb_iter_is_valid(&iter)) {
@@ -822,8 +818,7 @@ static bool rat_resp_cb(GIsiClient *client, const void *restrict data,
return true;
}
- if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false))
- return true;
+ g_isi_sb_iter_init(&iter, msg, len, 3);
while (g_isi_sb_iter_is_valid(&iter)) {
@@ -891,8 +886,7 @@ static bool rssi_resp_cb(GIsiClient *client, const void *restrict data,
goto error;
}
- if (!g_isi_sb_iter_init(msg + 3, len - 3, &iter, false))
- goto error;
+ g_isi_sb_iter_init(&iter, msg, len, 3);
while (g_isi_sb_iter_is_valid(&iter)) {
diff --git a/drivers/isimodem/phonebook.c b/drivers/isimodem/phonebook.c
index ac98bbe9..c24320a6 100644
--- a/drivers/isimodem/phonebook.c
+++ b/drivers/isimodem/phonebook.c
@@ -99,10 +99,9 @@ static int decode_read_response(const unsigned char *msg, size_t len,
if (msg[1] != SIM_PB_READ)
goto error;
- if (!g_isi_sb_iter_init(msg+3, len-3, &iter, true))
- goto error;
-
- while (g_isi_sb_iter_is_valid(&iter)) {
+ for (g_isi_sb_iter_init_full(&iter, msg, len, 3, true, msg[2]);
+ g_isi_sb_iter_is_valid(&iter);
+ g_isi_sb_iter_next(&iter)) {
switch (g_isi_sb_iter_get_id(&iter)) {
@@ -177,7 +176,6 @@ static int decode_read_response(const unsigned char *msg, size_t len,
g_isi_sb_iter_get_len(&iter));
break;
}
- g_isi_sb_iter_next(&iter);
}
if (status != SIM_SERV_OK) {
diff --git a/gisi/iter.c b/gisi/iter.c
index 5532107a..3764e2d0 100644
--- a/gisi/iter.c
+++ b/gisi/iter.c
@@ -47,22 +47,44 @@ static inline void bcd_to_mccmnc(const uint8_t *restrict bcd, char *mcc, char *m
mnc[3] = '\0';
}
-bool g_isi_sb_iter_init(const void *restrict data, size_t len,
- GIsiSubBlockIter *iter, bool longhdr)
+void g_isi_sb_iter_init_full(GIsiSubBlockIter *iter,
+ const void *restrict data,
+ size_t len,
+ size_t used,
+ bool longhdr,
+ uint16_t sub_blocks)
{
- if (!iter || !data || len == 0)
- return false;
-
- iter->start = (uint8_t *)data;
+ if (!data)
+ len = used = 0;
+ iter->start = (uint8_t *)data + used;
iter->end = iter->start + len;
iter->longhdr = longhdr;
+ iter->sub_blocks = len > used ? sub_blocks : 0;
+}
- return true;
+void g_isi_sb_iter_init(GIsiSubBlockIter *iter,
+ const void *restrict data,
+ size_t len,
+ size_t used)
+{
+
+ if (!data)
+ len = used = 0;
+ iter->start = (uint8_t *)data + used;
+ iter->end = iter->start + len;
+ iter->longhdr = false;
+ iter->sub_blocks = len > used ? iter->start[-1] : 0;
}
bool g_isi_sb_iter_is_valid(const GIsiSubBlockIter *iter)
{
- if (!iter || iter->end - iter->start < (iter->longhdr ? 4 : 2))
+ if (!iter)
+ return false;
+
+ if (iter->sub_blocks == 0)
+ return false;
+
+ if (iter->start + (iter->longhdr ? 4 : 2) > iter->end)
return false;
if (iter->start + g_isi_sb_iter_get_len(iter) > iter->end)
@@ -73,29 +95,24 @@ bool g_isi_sb_iter_is_valid(const GIsiSubBlockIter *iter)
int g_isi_sb_iter_get_id(const GIsiSubBlockIter *iter)
{
- if (iter->longhdr) {
- uint16_t *hdr = (uint16_t *)iter->start;
- return (int)ntohs(hdr[0]);
- }
-
+ if (iter->longhdr)
+ return (iter->start[0] << 8) | (iter->start[1]);
return iter->start[0];
}
size_t g_isi_sb_iter_get_len(const GIsiSubBlockIter *iter)
{
- if (iter->longhdr) {
- uint16_t *hdr = (uint16_t *)iter->start;
- return (size_t)ntohs(hdr[1]);
- }
+ if (iter->longhdr)
+ return (iter->start[2] << 8) | (iter->start[3]);
return iter->start[1];
}
bool g_isi_sb_iter_get_byte(const GIsiSubBlockIter *restrict iter, uint8_t *byte, int pos)
{
- if (pos > (int)g_isi_sb_iter_get_len(iter) || iter->start + pos > iter->end)
+ if ((size_t)(unsigned)pos > g_isi_sb_iter_get_len(iter) ||
+ iter->start + (unsigned)pos > iter->end)
return false;
-
*byte = iter->start[pos];
return true;
}
@@ -183,9 +200,14 @@ bool g_isi_sb_iter_next(GIsiSubBlockIter *iter)
if (len == 0)
len = iter->longhdr ? 4 : 2;
+ if (iter->sub_blocks == 0)
+ return false;
+
if (iter->start + len > iter->end)
return false;
iter->start += len;
+ iter->sub_blocks--;
+
return true;
}
diff --git a/gisi/iter.h b/gisi/iter.h
index 7596af04..081d85c4 100644
--- a/gisi/iter.h
+++ b/gisi/iter.h
@@ -34,13 +34,22 @@ extern "C" {
struct _GIsiSubBlockIter {
uint8_t *start;
uint8_t *end;
- bool longhdr;
+ uint16_t longhdr;
+ uint16_t sub_blocks;
};
+
typedef struct _GIsiSubBlockIter GIsiSubBlockIter;
-bool g_isi_sb_iter_init(const void *restrict data, size_t len,
- GIsiSubBlockIter *iter, bool longhdr);
-bool g_isi_sb_iter_is_valid(const GIsiSubBlockIter *iter);
+void g_isi_sb_iter_init(GIsiSubBlockIter *iter,
+ const void *restrict data,
+ size_t len, size_t used);
+void g_isi_sb_iter_init_full(GIsiSubBlockIter *iter,
+ const void *restrict data,
+ size_t len, size_t used,
+ bool longhdr,
+ uint16_t sub_blocks);
+bool g_isi_sb_iter_is_valid(GIsiSubBlockIter const *iter);
+
bool g_isi_sb_iter_next(GIsiSubBlockIter *iter);
int g_isi_sb_iter_get_id(const GIsiSubBlockIter *iter);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 20:50:01 +0000