sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Refactor supplementary service drivers

This commit is contained in:
Aki Niemi 2010-01-12 13:18:03 +02:00
parent 5a1a5905d4
commit 65ce05d37a
3 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/isimodem/call-barring.c
View File

@ -42,6 +42,7 @@
#include "isimodem.h" #include "isimodem.h"
#include "isiutil.h" #include "isiutil.h"
#include "ss.h" #include "ss.h"
#include "debug.h"
struct barr_data { struct barr_data {
GIsiClient *client; GIsiClient *client;
@ -60,7 +61,7 @@ static bool set_resp_cb(GIsiClient *client, const void *restrict data,
} }
if (len < 3 || msg[0] != SS_SERVICE_COMPLETED_RESP) if (len < 3 || msg[0] != SS_SERVICE_COMPLETED_RESP)
goto error; return false;
if (msg[1] != SS_ACTIVATION && msg[1] != SS_DEACTIVATION) if (msg[1] != SS_ACTIVATION && msg[1] != SS_DEACTIVATION)
goto error; goto error;
@ -203,7 +204,7 @@ static bool query_resp_cb(GIsiClient *client, const void *restrict data,
} }
if (len < 7 || msg[0] != SS_SERVICE_COMPLETED_RESP) if (len < 7 || msg[0] != SS_SERVICE_COMPLETED_RESP)
goto error; return false;
if (msg[1] != SS_INTERROGATION) if (msg[1] != SS_INTERROGATION)
goto error; goto error;
@ -241,8 +242,8 @@ static bool query_resp_cb(GIsiClient *client, const void *restrict data,
break; break;
default: default:
DBG("Skipping sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -320,7 +321,7 @@ static bool set_passwd_resp_cb(GIsiClient *client, const void *restrict data,
} }
if (len < 3 || msg[0] != SS_SERVICE_COMPLETED_RESP) if (len < 3 || msg[0] != SS_SERVICE_COMPLETED_RESP)
goto error; return false;
if (msg[1] != SS_GSM_PASSWORD_REGISTRATION) if (msg[1] != SS_GSM_PASSWORD_REGISTRATION)
goto error; goto error;
@ -413,16 +414,23 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque) void *opaque)
{ {
struct ofono_call_barring *barr = opaque; struct ofono_call_barring *barr = opaque;
const char *debug = NULL;
if (alive == true) { if (!alive) {
DBG("Resource 0x%02X, with version %03d.%03d reachable", DBG("Unable to bootsrap call barring driver");
g_isi_client_resource(client),
g_isi_version_major(client),
g_isi_version_minor(client));
g_idle_add(isi_call_barring_register, barr);
return; return;
} }
DBG("Unable to bootsrap call barring driver");
DBG("%s (v%03d.%03d) reachable",
pn_resource_name(g_isi_client_resource(client)),
g_isi_version_major(client),
g_isi_version_minor(client));
debug = getenv("OFONO_ISI_DEBUG");
if (debug && (strcmp(debug, "all") == 0 || strcmp(debug, "ss") == 0))
g_isi_client_set_debug(client, ss_debug, NULL);
g_idle_add(isi_call_barring_register, barr);
} }

41
drivers/isimodem/call-forwarding.c
View File

@ -41,6 +41,7 @@
#include "isimodem.h" #include "isimodem.h"
#include "isiutil.h" #include "isiutil.h"
#include "ss.h" #include "ss.h"
#include "debug.h"
struct forw_data { struct forw_data {
GIsiClient *client; GIsiClient *client;
@ -118,8 +119,8 @@ static bool decode_gsm_forwarding_info(const void *restrict data, size_t len,
return true; return true;
} }
default: default:
DBG("Skipping sub-sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -141,7 +142,7 @@ static bool registration_resp_cb(GIsiClient *client, const void *restrict data,
} }
if (len < 7 || msg[0] != SS_SERVICE_COMPLETED_RESP) if (len < 7 || msg[0] != SS_SERVICE_COMPLETED_RESP)
goto error; return false;
if (msg[1] != SS_REGISTRATION) if (msg[1] != SS_REGISTRATION)
goto error; goto error;
@ -177,8 +178,8 @@ static bool registration_resp_cb(GIsiClient *client, const void *restrict data,
break; break;
} }
default: default:
DBG("Skipping sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -308,8 +309,8 @@ static bool erasure_resp_cb(GIsiClient *client, const void *restrict data,
break; break;
} }
default: default:
DBG("Skipping sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -433,8 +434,8 @@ static bool query_resp_cb(GIsiClient *client, const void *restrict data,
break; break;
} }
default: default:
DBG("Skipping sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -508,16 +509,23 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque) void *opaque)
{ {
struct ofono_call_forwarding *cf = opaque; struct ofono_call_forwarding *cf = opaque;
const char *debug = NULL;
if (alive == true) { if (!alive) {
DBG("Resource 0x%02X, with version %03d.%03d reachable", DBG("Unable to bootsrap call forwarding driver");
g_isi_client_resource(client),
g_isi_version_major(client),
g_isi_version_minor(client));
g_idle_add(isi_call_forwarding_register, cf);
return; return;
} }
DBG("Unable to bootsrap call forwarding driver");
DBG("%s (v%03d.%03d) reachable",
pn_resource_name(g_isi_client_resource(client)),
g_isi_version_major(client),
g_isi_version_minor(client));
debug = getenv("OFONO_ISI_DEBUG");
if (debug && (strcmp(debug, "all") == 0 || strcmp(debug, "ss") == 0))
g_isi_client_set_debug(client, ss_debug, NULL);
g_idle_add(isi_call_forwarding_register, cf);
} }
@ -537,6 +545,7 @@ static int isi_call_forwarding_probe(struct ofono_call_forwarding *cf,
return -ENOMEM; return -ENOMEM;
ofono_call_forwarding_set_data(cf, data); ofono_call_forwarding_set_data(cf, data);
if (!g_isi_verify(data->client, reachable_cb, cf)) if (!g_isi_verify(data->client, reachable_cb, cf))
DBG("Unable to verify reachability"); DBG("Unable to verify reachability");

31
drivers/isimodem/call-settings.c
View File

@ -41,6 +41,7 @@
#include "isimodem.h" #include "isimodem.h"
#include "isiutil.h" #include "isiutil.h"
#include "ss.h" #include "ss.h"
#include "debug.h"
struct settings_data { struct settings_data {
GIsiClient *client; GIsiClient *client;
@ -137,8 +138,8 @@ static bool query_resp_cb(GIsiClient *client, const void *restrict data,
break; break;
} }
default: default:
DBG("Skipping sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -228,8 +229,8 @@ static bool set_resp_cb(GIsiClient *client, const void *restrict data,
break; break;
} }
default: default:
DBG("Skipping sub-block: 0x%04X (%zu bytes)", DBG("Skipping sub-block: %s (%zd bytes)",
g_isi_sb_iter_get_id(&iter), ss_subblock_name(g_isi_sb_iter_get_id(&iter)),
g_isi_sb_iter_get_len(&iter)); g_isi_sb_iter_get_len(&iter));
break; break;
} }
@ -290,16 +291,23 @@ static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
void *opaque) void *opaque)
{ {
struct ofono_call_settings *cs = opaque; struct ofono_call_settings *cs = opaque;
const char *debug = NULL;
if (alive == true) { if (!alive) {
DBG("Resource 0x%02X, with version %03d.%03d reachable", DBG("Unable to bootsrap call settings driver");
g_isi_client_resource(client),
g_isi_version_major(client),
g_isi_version_minor(client));
g_idle_add(isi_call_settings_register, cs);
return; return;
} }
DBG("Unable to bootsrap call settings driver");
DBG("%s (v%03d.%03d) reachable",
pn_resource_name(g_isi_client_resource(client)),
g_isi_version_major(client),
g_isi_version_minor(client));
debug = getenv("OFONO_ISI_DEBUG");
if (debug && (strcmp(debug, "all") == 0 || strcmp(debug, "ss") == 0))
g_isi_client_set_debug(client, ss_debug, NULL);
g_idle_add(isi_call_settings_register, cs);
} }
@ -320,6 +328,7 @@ static int isi_call_settings_probe(struct ofono_call_settings *cs, unsigned int
return -ENOMEM; return -ENOMEM;
ofono_call_settings_set_data(cs, data); ofono_call_settings_set_data(cs, data);
if (!g_isi_verify(data->client, reachable_cb, cs)) if (!g_isi_verify(data->client, reachable_cb, cs))
DBG("Unable to verify reachability"); DBG("Unable to verify reachability");