sms-mbim: new 'MMSmsMbim' object type

src/Makefile.am

@@ -258,6 +258,8 @@ endif
 # Additional MBIM support in ModemManager
 if WITH_MBIM
 ModemManager_SOURCES += \
+	mm-sms-mbim.h \
+	mm-sms-mbim.c \
 	mm-sim-mbim.h \
 	mm-sim-mbim.c \
 	mm-bearer-mbim.h \

src/mm-broadband-modem-mbim.c

@@ -25,6 +25,7 @@
 #include "mm-broadband-modem-mbim.h"
 #include "mm-bearer-mbim.h"
 #include "mm-sim-mbim.h"
+#include "mm-sms-mbim.h"
 
 #include "ModemManager.h"
 #include "mm-log.h"
@@ -2309,6 +2310,15 @@ load_initial_sms_parts (MMIfaceModemMessaging *self,
     mbim_message_unref (message);
 }
 
+/*****************************************************************************/
+/* Create SMS (Messaging interface) */
+
+static MMSms *
+messaging_create_sms (MMIfaceModemMessaging *self)
+{
+    return mm_sms_mbim_new (MM_BASE_MODEM (self));
+}
+
 /*****************************************************************************/
 
 MMBroadbandModemMbim *
@@ -2472,7 +2482,7 @@ iface_modem_messaging_init (MMIfaceModemMessaging *iface)
     iface->enable_unsolicited_events_finish = NULL;
     iface->disable_unsolicited_events = NULL;
     iface->disable_unsolicited_events_finish = NULL;
-    iface->create_sms = NULL;
+    iface->create_sms = messaging_create_sms;
 }
 
 static void

src/mm-sms-mbim.c

@@ -0,0 +1,362 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2013 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <ModemManager.h>
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
+
+#include "mm-modem-helpers-mbim.h"
+#include "mm-iface-modem-messaging.h"
+#include "mm-sms-mbim.h"
+#include "mm-base-modem.h"
+#include "mm-log.h"
+
+G_DEFINE_TYPE (MMSmsMbim, mm_sms_mbim, MM_TYPE_SMS)
+
+/*****************************************************************************/
+
+static gboolean
+peek_device (gpointer self,
+             MbimDevice **o_device,
+             GAsyncReadyCallback callback,
+             gpointer user_data)
+{
+    MMBaseModem *modem = NULL;
+
+    g_object_get (G_OBJECT (self),
+                  MM_SMS_MODEM, &modem,
+                  NULL);
+    g_assert (MM_IS_BASE_MODEM (modem));
+
+    if (o_device) {
+        MMMbimPort *port;
+
+        port = mm_base_modem_peek_port_mbim (modem);
+        if (!port) {
+            g_simple_async_report_error_in_idle (G_OBJECT (self),
+                                                 callback,
+                                                 user_data,
+                                                 MM_CORE_ERROR,
+                                                 MM_CORE_ERROR_FAILED,
+                                                 "Couldn't peek MBIM port");
+            g_object_unref (modem);
+            return FALSE;
+        }
+
+        *o_device = mm_mbim_port_peek_device (port);
+    }
+
+    g_object_unref (modem);
+    return TRUE;
+}
+
+/*****************************************************************************/
+/* Send the SMS */
+
+typedef struct {
+    MMSms *self;
+    MMBaseModem *modem;
+    MbimDevice *device;
+    GSimpleAsyncResult *result;
+    GList *current;
+} SmsSendContext;
+
+static void
+sms_send_context_complete_and_free (SmsSendContext *ctx)
+{
+    g_simple_async_result_complete_in_idle (ctx->result);
+    g_object_unref (ctx->result);
+    g_object_unref (ctx->device);
+    g_object_unref (ctx->modem);
+    g_object_unref (ctx->self);
+    g_slice_free (SmsSendContext, ctx);
+}
+
+static gboolean
+sms_send_finish (MMSms *self,
+                 GAsyncResult *res,
+                 GError **error)
+{
+    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
+}
+
+static void sms_send_next_part (SmsSendContext *ctx);
+
+static void
+sms_send_set_ready (MbimDevice *device,
+                    GAsyncResult *res,
+                    SmsSendContext *ctx)
+{
+    MbimMessage *response;
+    GError *error = NULL;
+    guint32 message_reference;
+
+    response = mbim_device_command_finish (device, res, &error);
+    if (response &&
+        mbim_message_command_done_get_result (response, &error) &&
+        mbim_message_sms_send_response_parse (
+            response,
+            &message_reference,
+            &error)) {
+        mm_sms_part_set_message_reference ((MMSmsPart *)ctx->current->data,
+                                           message_reference);
+    }
+
+    if (response)
+        mbim_message_unref (response);
+
+    if (error) {
+        g_prefix_error (&error, "Couldn't send SMS part: ");
+        g_simple_async_result_take_error (ctx->result, error);
+        sms_send_context_complete_and_free (ctx);
+        return;
+    }
+
+    /* Go on with next part */
+    ctx->current = g_list_next (ctx->current);
+    sms_send_next_part (ctx);
+}
+
+static void
+sms_send_next_part (SmsSendContext *ctx)
+{
+    MbimMessage *message;
+    guint8 *pdu;
+    guint pdulen = 0;
+    guint msgstart = 0;
+    GError *error = NULL;
+    MbimSmsPduSendRecord send_record;
+
+    if (!ctx->current) {
+        /* Done we are */
+        g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+        sms_send_context_complete_and_free (ctx);
+        return;
+    }
+
+    /* Get PDU */
+    pdu = mm_sms_part_get_submit_pdu ((MMSmsPart *)ctx->current->data, &pdulen, &msgstart, &error);
+    if (!pdu) {
+        g_simple_async_result_take_error (ctx->result, error);
+        sms_send_context_complete_and_free (ctx);
+        return;
+    }
+
+    send_record.pdu_data_size = pdulen;
+    send_record.pdu_data = pdu;
+
+    message = mbim_message_sms_send_set_new (MBIM_SMS_FORMAT_PDU,
+                                             &send_record,
+                                             NULL,
+                                             NULL);
+    mbim_device_command (ctx->device,
+                         message,
+                         10,
+                         NULL,
+                         (GAsyncReadyCallback)sms_send_set_ready,
+                         ctx);
+    mbim_message_unref (message);
+    g_free (pdu);
+}
+
+static void
+sms_send (MMSms *self,
+          GAsyncReadyCallback callback,
+          gpointer user_data)
+{
+    SmsSendContext *ctx;
+    MbimDevice *device;
+
+    if (!peek_device (self, &device, callback, user_data))
+        return;
+
+    /* Setup the context */
+    ctx = g_slice_new0 (SmsSendContext);
+    ctx->result = g_simple_async_result_new (G_OBJECT (self),
+                                             callback,
+                                             user_data,
+                                             sms_send);
+    ctx->self = g_object_ref (self);
+    ctx->device = g_object_ref (device);
+    g_object_get (self,
+                  MM_SMS_MODEM, &ctx->modem,
+                  NULL);
+
+    ctx->current = mm_sms_get_parts (self);;
+    sms_send_next_part (ctx);
+}
+
+/*****************************************************************************/
+
+typedef struct {
+    MMSms *self;
+    MMBaseModem *modem;
+    MbimDevice *device;
+    GSimpleAsyncResult *result;
+    GList *current;
+    guint n_failed;
+} SmsDeletePartsContext;
+
+static void
+sms_delete_parts_context_complete_and_free (SmsDeletePartsContext *ctx)
+{
+    g_simple_async_result_complete_in_idle (ctx->result);
+    g_object_unref (ctx->result);
+    g_object_unref (ctx->device);
+    g_object_unref (ctx->modem);
+    g_object_unref (ctx->self);
+    g_slice_free (SmsDeletePartsContext, ctx);
+}
+
+static gboolean
+sms_delete_finish (MMSms *self,
+                   GAsyncResult *res,
+                   GError **error)
+{
+    return !g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (res), error);
+}
+
+static void delete_next_part (SmsDeletePartsContext *ctx);
+
+static void
+sms_delete_set_ready (MbimDevice *device,
+                      GAsyncResult *res,
+                      SmsDeletePartsContext *ctx)
+{
+    MbimMessage *response;
+    GError *error = NULL;
+
+    response = mbim_device_command_finish (device, res, &error);
+    if (response &&
+        mbim_message_command_done_get_result (response, &error))
+        mbim_message_sms_delete_response_parse (response, &error);
+
+    if (response)
+        mbim_message_unref (response);
+
+    if (error) {
+        ctx->n_failed++;
+        mm_dbg ("Couldn't delete SMS part with index %u: '%s'",
+                mm_sms_part_get_index ((MMSmsPart *)ctx->current->data),
+                error->message);
+        g_error_free (error);
+    }
+
+    /* We reset the index, as there is no longer that part */
+    mm_sms_part_set_index ((MMSmsPart *)ctx->current->data, SMS_PART_INVALID_INDEX);
+
+    ctx->current = g_list_next (ctx->current);
+    delete_next_part (ctx);
+}
+
+static void
+delete_next_part (SmsDeletePartsContext *ctx)
+{
+    MbimMessage *message;
+
+    /* Skip non-stored parts */
+    while (ctx->current &&
+           mm_sms_part_get_index ((MMSmsPart *)ctx->current->data) == SMS_PART_INVALID_INDEX)
+        ctx->current = g_list_next (ctx->current);
+
+    /* If all removed, we're done */
+    if (!ctx->current) {
+        if (ctx->n_failed > 0)
+            g_simple_async_result_set_error (ctx->result,
+                                             MM_CORE_ERROR,
+                                             MM_CORE_ERROR_FAILED,
+                                             "Couldn't delete %u parts from this SMS",
+                                             ctx->n_failed);
+        else
+            g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
+
+        sms_delete_parts_context_complete_and_free (ctx);
+        return;
+    }
+
+    message = mbim_message_sms_delete_set_new (MBIM_SMS_FLAG_INDEX,
+                                               (guint32)mm_sms_part_get_index ((MMSmsPart *)ctx->current->data),
+                                               NULL);
+    mbim_device_command (ctx->device,
+                         message,
+                         10,
+                         NULL,
+                         (GAsyncReadyCallback)sms_delete_set_ready,
+                         ctx);
+    mbim_message_unref (message);
+
+}
+
+static void
+sms_delete (MMSms *self,
+            GAsyncReadyCallback callback,
+            gpointer user_data)
+{
+    SmsDeletePartsContext *ctx;
+    MbimDevice *device;
+
+    if (!peek_device (self, &device, callback, user_data))
+        return;
+
+    ctx = g_slice_new0 (SmsDeletePartsContext);
+    ctx->result = g_simple_async_result_new (G_OBJECT (self),
+                                             callback,
+                                             user_data,
+                                             sms_delete);
+    ctx->self = g_object_ref (self);
+    ctx->device = g_object_ref (device);
+    g_object_get (self,
+                  MM_SMS_MODEM, &ctx->modem,
+                  NULL);
+
+    /* Go on deleting parts */
+    ctx->current = mm_sms_get_parts (self);
+    delete_next_part (ctx);
+}
+
+/*****************************************************************************/
+
+MMSms *
+mm_sms_mbim_new (MMBaseModem *modem)
+{
+    return MM_SMS (g_object_new (MM_TYPE_SMS_MBIM,
+                                 MM_SMS_MODEM, modem,
+                                 NULL));
+}
+
+static void
+mm_sms_mbim_init (MMSmsMbim *self)
+{
+}
+
+static void
+mm_sms_mbim_class_init (MMSmsMbimClass *klass)
+{
+    MMSmsClass *sms_class = MM_SMS_CLASS (klass);
+
+    sms_class->store = NULL;
+    sms_class->store_finish = NULL;
+    sms_class->send = sms_send;
+    sms_class->send_finish = sms_send_finish;
+    sms_class->delete = sms_delete;
+    sms_class->delete_finish = sms_delete_finish;
+}

src/mm-sms-mbim.h

@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2013 Aleksander Morgado <aleksander@gnu.org>
+ */
+
+#ifndef MM_SMS_MBIM_H
+#define MM_SMS_MBIM_H
+
+#include <glib.h>
+#include <glib-object.h>
+
+#define _LIBMM_INSIDE_MM
+#include <libmm-glib.h>
+
+#include "mm-sms.h"
+
+#define MM_TYPE_SMS_MBIM            (mm_sms_mbim_get_type ())
+#define MM_SMS_MBIM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_SMS_MBIM, MMSmsMbim))
+#define MM_SMS_MBIM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_SMS_MBIM, MMSmsMbimClass))
+#define MM_IS_SMS_MBIM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_SMS_MBIM))
+#define MM_IS_SMS_MBIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_SMS_MBIM))
+#define MM_SMS_MBIM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_SMS_MBIM, MMSmsMbimClass))
+
+typedef struct _MMSmsMbim MMSmsMbim;
+typedef struct _MMSmsMbimClass MMSmsMbimClass;
+
+struct _MMSmsMbim {
+    MMSms parent;
+};
+
+struct _MMSmsMbimClass {
+    MMSmsClass parent;
+};
+
+GType mm_sms_mbim_get_type (void);
+
+MMSms *mm_sms_mbim_new (MMBaseModem *modem);
+
+#endif /* MM_SMS_MBIM_H */