From 916bd148ff6ce6552aa79e7c2c3540ec88ad3037 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Mon, 2 Jul 2007 22:31:20 +0000
Subject: [PATCH] use "isQ931ext" in LLComp ie parser. Be more flexible to
missing octect 7 in LLComp ie.
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@300 a93c3328-9c30-0410-af19-c9cd2b2d52af
---
libs/openzap/src/isdn/Q931ie.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/libs/openzap/src/isdn/Q931ie.c b/libs/openzap/src/isdn/Q931ie.c
index 84677988f4..23e4f010ed 100644
--- a/libs/openzap/src/isdn/Q931ie.c
+++ b/libs/openzap/src/isdn/Q931ie.c
@@ -1780,7 +1780,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Octet++;
/* Octet 3a*/
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->NegotInd = (IBuf[Octet+Off] >> 6) & 0x01;
Off++;
@@ -1808,7 +1808,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Octet++;
/* Octet 5a */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->SyncAsync = (IBuf[Octet+Off] >> 6) & 0x01;
pie->Negot = (IBuf[Octet+Off] >> 5) & 0x01;
@@ -1816,7 +1816,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Off++;
/* Octet 5b - 2 options */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
if(pie->UIL1Prot == 0x01) /* V.110, I.460 and X.30*/
{
@@ -1849,7 +1849,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
}
/* Octet 5c */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->NumStopBits=(IBuf[Octet+Off] >> 5) & 0x03;
pie->NumDataBits=(IBuf[Octet+Off] >> 3) & 0x03;
@@ -1857,7 +1857,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Off++;
/* Octet 5d */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->DuplexMode = (IBuf[Octet+Off] >> 6) & 0x01;
pie->ModemType = IBuf[Octet+Off] & 0x3f;
@@ -1877,7 +1877,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Octet++;
/* Octet 6a */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
if(pie->UIL2Prot == 0x10) /* 2nd 6a */
{
@@ -1891,7 +1891,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Off++;
}
/* Octet 6b*/
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->WindowSize = IBuf[Octet+Off] & 0x7f;
Off++;
@@ -1907,7 +1907,7 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
Octet++;
/* Octet 7a */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
if(pie->UIL3Prot == 0x0b)
@@ -1931,13 +1931,13 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
}
/* Octet 7b*/
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->DefPackSize = IBuf[Octet+Off] & 0x0f;
Off++;
/* Octet 7c */
- if((IBuf[Octet+Off-1] & 0x80) != 0)
+ if(IsQ931Ext(IBuf[Octet+Off-1]))
{
pie->PackWinSize= IBuf[Octet+Off] & 0x7f;
}
@@ -1945,11 +1945,6 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *pMsg, L3UCHAR *
}
}
}
- else
- {
- Q931SetError(pTrunk,Q931E_LLCOMP, 7,0);
- return Q931E_LLCOMP;
- }
Q931IESizeTest(Q931E_LLCOMP);