Accept push notifications regardless of the origin port, as some operators do not insert there the WAP connectionless session service port, and use random values instead. --- plugins/push-notification.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/plugins/push-notification.c b/plugins/push-notification.c index f6ca365..ff388d9 100644 --- a/plugins/push-notification.c +++ b/plugins/push-notification.c @@ -41,7 +41,7 @@ #define PUSH_NOTIFICATION_INTERFACE "org.ofono.PushNotification" #define AGENT_INTERFACE "org.ofono.PushNotificationAgent" -#define WAP_PUSH_SRC_PORT 9200 +#define WAP_PUSH_SRC_PORT -1 #define WAP_PUSH_DST_PORT 2948 static unsigned int modemwatch_id; @@ -50,21 +50,16 @@ struct push_notification { struct ofono_modem *modem; struct ofono_sms *sms; struct sms_agent *agent; - unsigned int push_watch[2]; + unsigned int push_watch; }; static void agent_exited(void *userdata) { struct push_notification *pn = userdata; - if (pn->push_watch[0] > 0) { - __ofono_sms_datagram_watch_remove(pn->sms, pn->push_watch[0]); - pn->push_watch[0] = 0; - } - - if (pn->push_watch[1] > 0) { - __ofono_sms_datagram_watch_remove(pn->sms, pn->push_watch[1]); - pn->push_watch[1] = 0; + if (pn->push_watch > 0) { + __ofono_sms_datagram_watch_remove(pn->sms, pn->push_watch); + pn->push_watch = 0; } pn->agent = NULL; @@ -113,17 +108,12 @@ static DBusMessage *push_notification_register_agent(DBusConnection *conn, sms_agent_set_removed_notify(pn->agent, agent_exited, pn); - pn->push_watch[0] = __ofono_sms_datagram_watch_add(pn->sms, + pn->push_watch = __ofono_sms_datagram_watch_add(pn->sms, push_received, WAP_PUSH_DST_PORT, WAP_PUSH_SRC_PORT, pn, NULL); - pn->push_watch[1] = __ofono_sms_datagram_watch_add(pn->sms, - push_received, - WAP_PUSH_DST_PORT, - 0, pn, NULL); - return dbus_message_new_method_return(msg); } @@ -166,8 +156,7 @@ static void push_notification_cleanup(gpointer user) DBG("%p", pn); /* The push watch was already cleaned up */ - pn->push_watch[0] = 0; - pn->push_watch[1] = 0; + pn->push_watch = 0; pn->sms = NULL; sms_agent_free(pn->agent); -- 2.1.4

--- src/sms.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/sms.c b/src/sms.c index 0270029..72972b2 100644 --- a/src/sms.c +++ b/src/sms.c @@ -1184,6 +1184,7 @@ static void dispatch_app_datagram(struct ofono_sms *sms, ofono_sms_datagram_notify_cb_t notify; struct sms_handler *h; GSList *l; + gboolean dispatched = FALSE; ts = sms_scts_to_time(scts, &remote); localtime_r(&ts, &local); @@ -1195,9 +1196,15 @@ static void dispatch_app_datagram(struct ofono_sms *sms, if (!port_equal(dst, h->dst) || !port_equal(src, h->src)) continue; + dispatched = TRUE; + notify(sender, &remote, &local, dst, src, buf, len, h->item.notify_data); } + + if (!dispatched) + ofono_info("Datagram with ports [%d,%d] not delivered", + dst, src); } static void dispatch_text_message(struct ofono_sms *sms, -- 2.1.4