From patchwork Mon Dec 22 18:47:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C5=82awomir_Demeszko?= X-Patchwork-Id: 423484 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 607401400D5 for ; Tue, 23 Dec 2014 05:47:56 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 0BBAE28BE99; Mon, 22 Dec 2014 19:45:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id AAF8728A62A for ; Mon, 22 Dec 2014 19:45:46 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -7.6 Received: from hosting.nazwa24.pl (ns1.hosting.nazwa24.pl [46.242.129.143]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 22 Dec 2014 19:45:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=wireless-instruments.com; s=default; h=Content-Transfer-Encoding:Content-Type:MIME-Version:Message-Id:Date:Subject:Cc:To:From; bh=BR8QwHFTQ/9mxqSh9FN/R54sFc/6kT20ktxcpwHRzv8=; b=OYrDFU8nHjMOTvhFHSxHh4taf1JxbG84eKyjqUAyOfJwOEyQRe0GItIQIcS+v36x5fSMWhH8UJeSym/TvTtNhG/YohIjFBO1bEB8Abau3KUHmmoFhbyNvQxDIl9BLIIUSB+yxFn1CjtJDKQEhrG+CyddeU4p5wzCvyxeDqXp6zA=; Received: from afo149.internetdsl.tpnet.pl ([83.16.144.149]:43615 helo=localhost.localdomain) by hosting.nazwa24.pl with esmtpsa (UNKNOWN:AES128-SHA256:128) (Exim 4.82) (envelope-from ) id 1Y3816-0002OA-IX; Mon, 22 Dec 2014 19:47:40 +0100 From: =?UTF-8?q?S=C5=82awomir=20Demeszko?= To: openwrt-devel@lists.openwrt.org Date: Mon, 22 Dec 2014 19:47:34 +0100 Message-Id: <1419274054-6874-1-git-send-email-s.demeszko@wireless-instruments.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - hosting.nazwa24.pl X-AntiAbuse: Original Domain - lists.openwrt.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - wireless-instruments.com X-Get-Message-Sender-Via: hosting.nazwa24.pl: authenticated_id: s.demeszko@wireless-instruments.com Cc: =?UTF-8?q?S=C5=82awomir=20Demeszko?= Subject: [OpenWrt-Devel] [PATCH uqmi] Making smsc number optional X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" If smsc number is not provided before sending sms then operator's default stored on simcard will be used. Signed-off-by: Sławomir Demeszko --- commands-wms.c | 10 +++++++--- commands-wms.h | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/commands-wms.c b/commands-wms.c index 798e012..e3bcbc8 100644 --- a/commands-wms.c +++ b/commands-wms.c @@ -612,12 +612,12 @@ cmd_wms_send_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struc unsigned char protocol_id = 0x00; unsigned char dcs = 0x00; - if (!_send.smsc || !*_send.smsc || !_send.target || !*_send.target) { + if (!_send.target || !*_send.target) { uqmi_add_error("Missing argument"); return QMI_CMD_EXIT; } - if (strlen(_send.smsc) > 16 || strlen(_send.target) > 16 || strlen(arg) > 160) { + if ((_send.smsc && strlen(_send.smsc) > 16) || strlen(_send.target) > 16 || strlen(arg) > 160) { uqmi_add_error("Argument too long"); return QMI_CMD_EXIT; } @@ -625,7 +625,11 @@ cmd_wms_send_message_prepare(struct qmi_dev *qmi, struct qmi_request *req, struc if (_send.flash) dcs |= 0x10; - cur += pdu_encode_number(cur, _send.smsc, true); + if (!_send.smsc || !*_send.smsc) + *(cur++) = 0; + else + cur += pdu_encode_number(cur, _send.smsc, true); + *(cur++) = first_octet; *(cur++) = 0; /* reference */ diff --git a/commands-wms.h b/commands-wms.h index 07191da..83e6614 100644 --- a/commands-wms.h +++ b/commands-wms.h @@ -14,7 +14,7 @@ " --get-message : Get SMS message at index \n" \ " --get-raw-message : Get SMS raw message contents at index \n" \ " --send-message : Send SMS message (use options below)\n" \ - " --send-message-smsc : SMSC number (required)\n" \ + " --send-message-smsc : SMSC number\n" \ " --send-message-target : Destination number (required)\n" \ " --send-message-flash: Send as Flash SMS\n" \