[svn-commits] mattf: trunk r466 - in /trunk: ./ libpri.h q931.c

[SVN commits to the Digium repositories]

Author: mattf
Date: Fri Sep 14 16:34:11 2007
New Revision: 466

URL: http://svn.digium.com/view/libpri?view=rev&rev=466
Log:
Merged revisions 465 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

........
r465 | mattf | 2007-09-14 16:32:54 -0500 (Fri, 14 Sep 2007) | 1 line

Fix for #10189.  Make sure we properly report the user layer 1 for H.223 and H.245
........

Modified:
    trunk/   (props changed)
    trunk/libpri.h
    trunk/q931.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Sep 14 16:34:11 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386,390,416,424,427,441,446,462
+/branches/1.4:1-372,386,390,416,424,427,441,446,462,465

Modified: trunk/libpri.h
URL: http://svn.digium.com/view/libpri/trunk/libpri.h?view=diff&rev=466&r1=465&r2=466
==============================================================================
--- trunk/libpri.h (original)
+++ trunk/libpri.h Fri Sep 14 16:34:11 2007
@@ -202,7 +202,7 @@
 #define PRI_LAYER_1_ALAW			0x23
 #define PRI_LAYER_1_G721			0x24
 #define PRI_LAYER_1_G722_G725		0x25
-#define PRI_LAYER_1_G7XX_384K		0x26
+#define PRI_LAYER_1_H223_H245		0x26
 #define PRI_LAYER_1_NON_ITU_ADAPT	0x27
 #define PRI_LAYER_1_V120_RATE_ADAPT	0x28
 #define PRI_LAYER_1_X31_RATE_ADAPT	0x29

Modified: trunk/q931.c
URL: http://svn.digium.com/view/libpri/trunk/q931.c?view=diff&rev=466&r1=465&r2=466
==============================================================================
--- trunk/q931.c (original)
+++ trunk/q931.c Fri Sep 14 16:34:11 2007
@@ -548,7 +548,7 @@
 		{ PRI_LAYER_1_ALAW, "A-Law" },
 		{ PRI_LAYER_1_G721, "G.721 ADPCM" },
 		{ PRI_LAYER_1_G722_G725, "G.722/G.725 7kHz Audio" },
-		{ PRI_LAYER_1_G7XX_384K, "G.7xx 384k Video" },
+		{ PRI_LAYER_1_H223_H245, "H.223 and H.245" },	/* Recommendation Q.931(05/98) page 60) */
 		{ PRI_LAYER_1_NON_ITU_ADAPT, "Non-ITU Rate Adaption" },
 		{ PRI_LAYER_1_V120_RATE_ADAPT, "V.120 Rate Adaption" },
 		{ PRI_LAYER_1_X31_RATE_ADAPT, "X.31 Rate Adaption" },
@@ -662,7 +662,8 @@
 	}
 	ie->data[0] = 0x80 | tc;
 	ie->data[1] = call->transmoderate | 0x80;
-	if ((tc & PRI_TRANS_CAP_DIGITAL)&&(pri->switchtype == PRI_SWITCH_EUROISDN_E1)) {
+	if ( (tc & PRI_TRANS_CAP_DIGITAL) && (pri->switchtype == PRI_SWITCH_EUROISDN_E1) &&
+		(call->transmoderate == TRANS_MODE_PACKET) ) {
 		/* Apparently EuroISDN switches don't seem to like user layer 2/3 */
 		return 4;
 	}