mirror of git://git.sysmocom.de/ofono
gisi: pass object handle to g_isi_verify() callback
This will be needed for GPDS.
This commit is contained in:
parent
0081548fcf
commit
bc6c4adcac
|
@ -410,7 +410,8 @@ static gboolean isi_call_barring_register(gpointer user)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
|
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
struct ofono_call_barring *barr = opaque;
|
struct ofono_call_barring *barr = opaque;
|
||||||
|
|
||||||
|
|
|
@ -505,7 +505,8 @@ static gboolean isi_call_forwarding_register(gpointer user)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
|
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
struct ofono_call_forwarding *cf = opaque;
|
struct ofono_call_forwarding *cf = opaque;
|
||||||
|
|
||||||
|
|
|
@ -287,7 +287,8 @@ static gboolean isi_call_settings_register(gpointer user)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
|
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
struct ofono_call_settings *cs = opaque;
|
struct ofono_call_settings *cs = opaque;
|
||||||
|
|
||||||
|
|
|
@ -273,7 +273,8 @@ static gboolean isi_devinfo_register(gpointer user)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
|
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
struct ofono_devinfo *info = opaque;
|
struct ofono_devinfo *info = opaque;
|
||||||
|
|
||||||
|
|
|
@ -978,7 +978,8 @@ static gboolean isi_netreg_register(gpointer user)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
|
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
struct ofono_netreg *netreg = opaque;
|
struct ofono_netreg *netreg = opaque;
|
||||||
|
|
||||||
|
|
|
@ -313,7 +313,8 @@ static gboolean isi_phonebook_register(gpointer user)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void reachable_cb(GIsiClient *client, bool alive, void *opaque)
|
static void reachable_cb(GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque)
|
||||||
{
|
{
|
||||||
struct ofono_phonebook *pb = opaque;
|
struct ofono_phonebook *pb = opaque;
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,8 @@ typedef void GIsiIndication (GIsiClient *client,
|
||||||
const void *restrict data, size_t len,
|
const void *restrict data, size_t len,
|
||||||
uint16_t object, void *opaque);
|
uint16_t object, void *opaque);
|
||||||
|
|
||||||
typedef void GIsiVerify (GIsiClient *client, bool alive, void *opaque);
|
typedef void GIsiVerify (GIsiClient *client, bool alive, uint16_t object,
|
||||||
|
void *opaque);
|
||||||
|
|
||||||
typedef bool GIsiResponse(GIsiClient *client,
|
typedef bool GIsiResponse(GIsiClient *client,
|
||||||
void const * restrict data, size_t len,
|
void const * restrict data, size_t len,
|
||||||
|
@ -1300,7 +1301,7 @@ static int isi_voicecall_probe(struct ofono_voicecall *ovc,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void isi_call_verify_cb(GIsiClient *client,
|
static void isi_call_verify_cb(GIsiClient *client,
|
||||||
bool alive,
|
bool alive, uint16_t object,
|
||||||
void *ovc)
|
void *ovc)
|
||||||
{
|
{
|
||||||
if (alive) {
|
if (alive) {
|
||||||
|
|
|
@ -38,7 +38,8 @@ typedef struct _GIsiClient GIsiClient;
|
||||||
struct _GIsiRequest;
|
struct _GIsiRequest;
|
||||||
typedef struct _GIsiRequest GIsiRequest;
|
typedef struct _GIsiRequest GIsiRequest;
|
||||||
|
|
||||||
typedef void (*GIsiVerifyFunc)(GIsiClient *client, bool alive, void *opaque);
|
typedef void (*GIsiVerifyFunc)(GIsiClient *client, bool alive,
|
||||||
|
uint16_t object, void *opaque);
|
||||||
|
|
||||||
typedef bool (*GIsiResponseFunc)(GIsiClient *client,
|
typedef bool (*GIsiResponseFunc)(GIsiClient *client,
|
||||||
const void *restrict data, size_t len,
|
const void *restrict data, size_t len,
|
||||||
|
|
|
@ -71,7 +71,7 @@ static bool verify_cb(GIsiClient *client, const void *restrict data,
|
||||||
|
|
||||||
out:
|
out:
|
||||||
if (func)
|
if (func)
|
||||||
func(client, alive, vd->data);
|
func(client, alive, object, vd->data);
|
||||||
g_free(vd);
|
g_free(vd);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue