From f5d76bd5d2932e57793f671577b884345ce5800c Mon Sep 17 00:00:00 2001 From: Matthew Fredrickson Date: Wed, 6 Jun 2007 13:23:29 +0000 Subject: [PATCH] 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/libpri/trunk@417 2fbb986a-6c06-0410-b554-c9c1f0a7f128 --- pri_facility.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pri_facility.c b/pri_facility.c index d9e601d..791da46 100644 --- a/pri_facility.c +++ b/pri_facility.c @@ -990,11 +990,13 @@ static int add_callername_facility_ies(struct pri *pri, q931_call *c, int cpe) 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 @@ static int add_callername_facility_ies(struct pri *pri, q931_call *c, int cpe) 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);