--- include/history.h | 5 +++++ src/history.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- src/ofono.h | 8 ++++++++ 3 files changed, 59 insertions(+), 1 deletions(-) diff --git a/include/history.h b/include/history.h index c1c4aa1..e661f24 100644 --- a/include/history.h +++ b/include/history.h @@ -58,6 +58,11 @@ struct ofono_history_driver { const struct ofono_uuid *uuid, const char *from, const struct tm *remote, const struct tm *local, const char *text); + void (*datagram_received)(struct ofono_history_context *context, + const struct ofono_uuid *uuid, const char *from, + int dst, int src, const struct tm *remote, + const struct tm *local, + const unsigned char *buffer, unsigned len); void (*sms_send_pending)(struct ofono_history_context *context, const struct ofono_uuid *uuid, const char *to, diff --git a/src/history.c b/src/history.c index 0229cf5..2610141 100644 --- a/src/history.c +++ b/src/history.c @@ -47,7 +47,15 @@ struct history_call_foreach_data { struct history_sms_foreach_data { const struct ofono_uuid *uuid; const char *address; - const char *text; + union { + const char *text; + struct { + const unsigned char *data; + unsigned len; + guint16 dst; + guint16 src; + }; + }; union { struct { const struct tm *remote; @@ -193,6 +201,43 @@ void __ofono_history_sms_received(struct ofono_modem *modem, history_sms_received, &hfd); } +static void history_datagram_received(struct ofono_atom *atom, void *data) +{ + struct ofono_history_context *context = __ofono_atom_get_data(atom); + struct history_sms_foreach_data *hfd = data; + + if (context->driver->datagram_received == NULL) + return; + + context->driver->datagram_received(context, hfd->uuid, hfd->address, + hfd->dst, hfd->src, + hfd->remote, hfd->local, + hfd->data, hfd->len); +} + +void __ofono_history_datagram_received(struct ofono_modem *modem, + const struct ofono_uuid *uuid, + const char *from, int dst, int src, + const struct tm *remote, + const struct tm *local, + const unsigned char *buffer, + unsigned len) +{ + struct history_sms_foreach_data hfd; + + hfd.uuid = uuid; + hfd.address = from; + hfd.dst = dst; + hfd.src = src; + hfd.remote = remote; + hfd.local = local; + hfd.data = buffer; + hfd.len = len; + + __ofono_modem_foreach_atom(modem, OFONO_ATOM_TYPE_HISTORY, + history_datagram_received, &hfd); +} + static void history_sms_send_pending(struct ofono_atom *atom, void *data) { struct ofono_history_context *context = __ofono_atom_get_data(atom); diff --git a/src/ofono.h b/src/ofono.h index 41ce011..b068f48 100644 --- a/src/ofono.h +++ b/src/ofono.h @@ -311,6 +311,14 @@ void __ofono_history_sms_received(struct ofono_modem *modem, const struct tm *local, const char *text); +void __ofono_history_datagram_received(struct ofono_modem *modem, + const struct ofono_uuid *uuid, + const char *from, int dst, int src, + const struct tm *remote, + const struct tm *local, + const unsigned char *buffer, + unsigned len); + void __ofono_history_sms_send_pending(struct ofono_modem *modem, const struct ofono_uuid *uuid, const char *to, -- 1.7.0.4