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

gisi: modify reachability check 

Always cache server object ID and ISI version.
This commit is contained in:
Mika Liljeberg 2010-11-29 11:36:11 +02:00 committed by Aki Niemi
parent 38f49a769a
commit 3652340b1b
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gisi/modem.c
View File

@ -45,6 +45,7 @@ struct _GIsiServiceMux {
GIsiVersion version; GIsiVersion version;
uint8_t resource; uint8_t resource;
uint8_t last_utid; uint8_t last_utid;
uint16_t object;
unsigned subscriptions; unsigned subscriptions;
unsigned registrations; unsigned registrations;
gboolean reachable; gboolean reachable;
@ -194,6 +195,11 @@ static void common_message_decode(GIsiServiceMux *mux, GIsiMessage *msg)
return; return;
switch (code) { switch (code) {
case COMM_ISA_ENTITY_NOT_REACHABLE_RESP:
mux->reachable = FALSE;
msg->error = ENOENT;
break;
case COMM_ISI_VERSION_GET_RESP: case COMM_ISI_VERSION_GET_RESP:
if (g_isi_msg_data_get_byte(msg, 1, &major) && if (g_isi_msg_data_get_byte(msg, 1, &major) &&
@ -201,13 +207,7 @@ static void common_message_decode(GIsiServiceMux *mux, GIsiMessage *msg)
mux->version.major = major; mux->version.major = major;
mux->version.minor = minor; mux->version.minor = minor;
} }
mux->version_pending = FALSE; /* fall through */
break;
case COMM_ISA_ENTITY_NOT_REACHABLE_RESP:
mux->reachable = FALSE;
msg->error = ENOENT;
break;
case 0x00: case 0x00:
/* /*
@ -215,7 +215,9 @@ static void common_message_decode(GIsiServiceMux *mux, GIsiMessage *msg)
* 0x00 message as a response. Work around this modem * 0x00 message as a response. Work around this modem
* wart. * wart.
*/ */
mux->object = g_isi_msg_object(msg);
mux->version_pending = FALSE; mux->version_pending = FALSE;
mux->reachable = TRUE;
break; break;
} }
msg->version = &mux->version; msg->version = &mux->version;
@ -262,12 +264,6 @@ static gboolean isi_callback(GIOChannel *channel, GIOCondition cond,
if (!mux) if (!mux)
return TRUE; return TRUE;
/*
* For now, assume any message received means that the
* resource is reachable
*/
mux->reachable = TRUE;
if (g_isi_msg_id(&msg) == COMMON_MESSAGE) if (g_isi_msg_id(&msg) == COMMON_MESSAGE)
common_message_decode(mux, &msg); common_message_decode(mux, &msg);
@ -953,6 +949,8 @@ static gboolean reachable_notify(gpointer data)
struct sockaddr_pn addr = { struct sockaddr_pn addr = {
.spn_resource = mux->resource, .spn_resource = mux->resource,
.spn_dev = mux->object >> 8,
.spn_obj = mux->object & 0xff,
}; };
GIsiMessage msg = { GIsiMessage msg = {
.version = &mux->version, .version = &mux->version,