[libpri-commits] mattf: trunk r417 - in /trunk: ./ pri_facility.c

[libpri-commits at lists.digium.com]

Author: mattf
Date: Wed Jun  6 08:23:29 2007
New Revision: 417

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

................
r416 | mattf | 2007-06-06 08:22:15 -0500 (Wed, 06 Jun 2007) | 10 lines

Merged revisions 415 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r415 | mattf | 2007-06-06 08:20:05 -0500 (Wed, 06 Jun 2007) | 2 lines

Make sure we only send the NFE when we are talking QSIG

........

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

Modified:
    trunk/   (props changed)
    trunk/pri_facility.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Wed Jun  6 08:23:29 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-332,385,389
+/branches/1.2:1-332,385,389,415

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Jun  6 08:23:29 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386,390
+/branches/1.4:1-372,386,390,416

Modified: trunk/pri_facility.c
URL: http://svn.digium.com/view/libpri/trunk/pri_facility.c?view=diff&rev=417&r1=416&r2=417
==============================================================================
--- trunk/pri_facility.c (original)
+++ trunk/pri_facility.c Wed Jun  6 08:23:29 2007
@@ -990,11 +990,13 @@
 	buffer[i++] = (ASN1_CONTEXT_SPECIFIC | Q932_PROTOCOL_EXTENSIONS);
 	/* Interpretation component */
 
-	ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_0), buffer, i, 0);
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
+	if (pri->switchtype == PRI_SWITCH_QSIG) {
+		ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer, i);
+		ASN1_PUSH(compstk, compsp, comp);
+		ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_0), buffer, i, 0);
+		ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);
+		ASN1_FIXUP(compstk, compsp, buffer, i);
+	}
 
 	ASN1_ADD_BYTECOMP(comp, COMP_TYPE_INTERPRETATION, buffer, i, 0);
 
@@ -1031,11 +1033,12 @@
 	buffer[i++] = (ASN1_CONTEXT_SPECIFIC | Q932_PROTOCOL_EXTENSIONS);
 	/* Interpretation component */
 
-	ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer, i);
-	ASN1_PUSH(compstk, compsp, comp);
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_0), buffer, i, 0);
-	ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);
-	ASN1_FIXUP(compstk, compsp, buffer, i);
+	if (pri->switchtype == PRI_SWITCH_QSIG) {
+		ASN1_ADD_SIMPLE(comp, COMP_TYPE_NFE, buffer, i); ASN1_PUSH(compstk, compsp, comp);
+		ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_0), buffer, i, 0);
+		ASN1_ADD_BYTECOMP(comp, (ASN1_CONTEXT_SPECIFIC | ASN1_TAG_2), buffer, i, 0);
+		ASN1_FIXUP(compstk, compsp, buffer, i);
+	}
 
 	ASN1_ADD_BYTECOMP(comp, COMP_TYPE_INTERPRETATION, buffer, i, 0);