[svn-commits] file: trunk r47552 - in /trunk: ./ apps/app_sms.c

[svn-commits at lists.digium.com]

Author: file
Date: Mon Nov 13 11:10:21 2006
New Revision: 47552

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47552
Log:
Merged revisions 47551 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r47551 | file | 2006-11-13 12:08:07 -0500 (Mon, 13 Nov 2006) | 10 lines

Merged revisions 47549 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r47549 | file | 2006-11-13 12:05:32 -0500 (Mon, 13 Nov 2006) | 2 lines

When sending an SMS with a user data header properly set the UDH flag in the first byte. (issue #8347 reported by hoffmeis)

........

................

Modified:
    trunk/   (props changed)
    trunk/apps/app_sms.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/1.4:1-47483

Modified: trunk/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_sms.c?view=diff&rev=47552&r1=47551&r2=47552
==============================================================================
--- trunk/apps/app_sms.c (original)
+++ trunk/apps/app_sms.c Mon Nov 13 11:10:21 2006
@@ -1046,7 +1046,7 @@
 		unsigned char p = 2;
 		h->omsg[0] = 0x91;		  /* SMS_DATA */
 		if (h->smsc) {			 /* deliver */
-			h->omsg[p++] = (more ? 4 : 0);
+			h->omsg[p++] = (more ? 4 : 0) + ((h->udhl > 0) ? 0x40 : 0);
 			p += packaddress (h->omsg + p, h->oa);
 			h->omsg[p++] = h->pid;
 			h->omsg[p++] = h->dcs;