Merge lp:~sergiusens/phablet-extras/ofono into lp:phablet-extras/ofono

[Sergio Schvezov]

[ril/rilmodem] Using pdu field to figure out SMSC length (LP: #1090437).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/14/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/14/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/14/rebuild

review: Approve (continuous-integration)

[Tony Espy (awe)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:34
http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/phablet-extras-ofono-raring-armhf-ci/15/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phablet-extras-ofono-ci/15/rebuild

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good.

review: Approve

[lp:~sergiusens/phablet-extras/ofono]

33. By Sergio Schvezov on 2013-05-28

[ril/rilmodem] Using pdu field to figure out SMSC length (LP: #1090437). Fixes: https://bugs.launchpad.net/bugs/1090437.

Approved by Ricardo Salveti, PS Jenkins bot, Tony Espy.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-16 17:59:50 +0000
+++ debian/changelog	2013-05-28 16:58:26 +0000
@@ -1,9 +1,13 @@
 ofono (1.12phablet2) UNRELEASED; urgency=low
 
+  [ Tony Espy ]
   * [ril/rilmodem] Initial SIM support, includes:
    - read filesystem support
    - proper modem initialization
 
+  [ Sergio Schvezov ]
+  * [ril/rilmodem] Using pdu field to figure out SMSC length (LP: #1090437).
+
  -- Tony Espy <[e-mail]>  Fri, 12 Apr 2013 14:56:01 -0400
 
 ofono (1.12phablet1) raring; urgency=low
 
=== modified file 'drivers/rilmodem/sms.c'
--- drivers/rilmodem/sms.c	2013-04-11 19:31:21 +0000
+++ drivers/rilmodem/sms.c	2013-05-28 16:58:26 +0000
@@ -218,6 +218,7 @@
 	struct parcel rilp;
 	char *ril_pdu;
 	int ril_pdu_len;
+	unsigned int smsc_len;
 	long ril_buf_len;
 	guchar *ril_data;
 
@@ -251,10 +252,18 @@
 					sms_debug,
 					"sms-notify-decoded: ");
 
+    /* The first octect in the pdu contains the SMSC address length
+     * which is the X following octects it reads. We add 1 octet to
+     * the read length to take into account this read octet in order
+     * to calculate the proper tpdu length.
+     */
+	smsc_len = ril_data[0] + 1;
+	DBG("smsc_len is %d", smsc_len);
+
 	/* Last parameter is 'tpdu_len' ( substract SMSC length ) */
-	ofono_sms_deliver_notify(sms, ril_data,
-					ril_buf_len,
-					ril_buf_len - 8);
+	ofono_sms_deliver_notify(sms, ril_data, 
+			ril_buf_len, 
+			ril_buf_len - smsc_len);
 
 	/* Re-use rilp, so initilize */
 	parcel_init(&rilp);