[asterisk-commits] crichter: trunk r65040 - in /trunk: ./ channels/misdn/

[asterisk-commits at lists.digium.com]

Author: crichter
Date: Fri May 18 07:43:59 2007
New Revision: 65040

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

................
r65039 | crichter | 2007-05-18 14:40:46 +0200 (Fr, 18 Mai 2007) | 9 lines

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

........
r65007 | crichter | 2007-05-18 13:23:11 +0200 (Fr, 18 Mai 2007) | 1 line

fixed a warning regarding Keypad encoding. encode the IE sending_complete at the right position.
........

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

Modified:
    trunk/   (props changed)
    trunk/channels/misdn/ie.c
    trunk/channels/misdn/isdn_msg_parser.c

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

Modified: trunk/channels/misdn/ie.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/ie.c?view=diff&rev=65040&r1=65039&r2=65040
==============================================================================
--- trunk/channels/misdn/ie.c (original)
+++ trunk/channels/misdn/ie.c Fri May 18 07:43:59 2007
@@ -953,7 +953,7 @@
 
 	if (MISDN_IE_DEBG) printf("    keypad='%s'\n", keypad);
 
-	l = strlen((char *)keypad);
+	l = strlen(keypad);
 	p = msg_put(msg, l+2);
 	if (nt)
 		*ntmode = p+1;
@@ -961,7 +961,7 @@
 		qi->QI_ELEMENT(keypad) = p - (unsigned char *)qi - sizeof(Q931_info_t);
 	p[0] = IE_KEYPAD;
 	p[1] = l;
-	strncpy((char *)p+2, (char *)keypad, strlen((char *)keypad));
+	strncpy((char *)p+2, keypad, strlen(keypad));
 }
 #endif
 

Modified: trunk/channels/misdn/isdn_msg_parser.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/misdn/isdn_msg_parser.c?view=diff&rev=65040&r1=65039&r2=65040
==============================================================================
--- trunk/channels/misdn/isdn_msg_parser.c (original)
+++ trunk/channels/misdn/isdn_msg_parser.c Fri May 18 07:43:59 2007
@@ -340,15 +340,13 @@
 	}
 
 	if (bc->sending_complete) {
-		enc_ie_complete(&setup->BEARER,msg, bc->sending_complete, nt, bc);
-	}
-  
-	{
+		enc_ie_complete(&setup->COMPLETE,msg, bc->sending_complete, nt, bc);
+	}
+  
+	if (bc->uulen) {
 		int  protocol=4;
 		enc_ie_useruser(&setup->USER_USER, msg, protocol, bc->uu, bc->uulen, nt,bc);
-		if (bc->uulen) cb_log(1,bc->port,"ENCODING USERUESRINFO:%s\n",bc->uu);
-		else
-		cb_log(1,bc->port,"NO USERUESRINFO ENCODED\n");
+		cb_log(1,bc->port,"ENCODING USERUESRINFO:%s\n",bc->uu);
 	}
 
 #if DEBUG