patch from Michael Collins, 5ess does not use display IE

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@518 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/openzap/src/isdn/5ESSStateTE.c b/libs/openzap/src/isdn/5ESSStateTE.c
index a9654ce72342e232d86a27af71ca1469db7f9a83..13a080cadc8a65e38160b3dc12d5b68d890edc9b 100644 (file)
--- a/libs/openzap/src/isdn/5ESSStateTE.c
+++ b/libs/openzap/src/isdn/5ESSStateTE.c
@@ -73,7 +73,7 @@ void ATT5ESSCreateTE(L3UCHAR i)
     Q931SetMesProc(Q931mes_CONNECT,             i,ATT5ESSProc0x07TE,           ATT5ESSUmes_0x07,           ATT5ESSPmes_0x07);\r
     Q931SetMesProc(Q931mes_CONNECT_ACKNOWLEDGE, i,ATT5ESSProc0x0fTE,           ATT5ESSUmes_0x0f,           ATT5ESSPmes_0x0f);\r
     Q931SetMesProc(Q931mes_PROGRESS,            i,Q931ProcProgressTE,          Q931Umes_Progress,          Q931Pmes_Progress);\r
-    Q931SetMesProc(Q931mes_SETUP,               i,Q931ProcSetupTE,             Q931Umes_Setup,             Q931Pmes_Setup);\r
+    Q931SetMesProc(Q931mes_SETUP,               i,Q931ProcSetupTE,             ATT5ESSUmes_Setup,          ATT5ESSPmes_Setup);\r
     Q931SetMesProc(Q931mes_SETUP_ACKNOWLEDGE,   i,Q931ProcSetupAckTE,          Q931Umes_SetupAck,          Q931Pmes_SetupAck);\r
     Q931SetMesProc(Q931mes_RESUME,              i,Q931ProcResumeTE,            Q931Umes_Resume,            Q931Pmes_Resume);\r
     Q931SetMesProc(Q931mes_RESUME_ACKNOWLEDGE,  i,Q931ProcResumeAckTE,         Q931Umes_ResumeAck,         Q931Pmes_ResumeAck);\r

diff --git a/libs/openzap/src/isdn/5ESSmes.c b/libs/openzap/src/isdn/5ESSmes.c
index da47f7ac5b7feac6b205ffd360a66330d2175dce..fc8d4b9fbbaf201b92dc25a6a3e64207b23065af 100644 (file)
--- a/libs/openzap/src/isdn/5ESSmes.c
+++ b/libs/openzap/src/isdn/5ESSmes.c
@@ -85,7 +85,6 @@ L3INT ATT5ESSUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic
             case Q931ie_CHANNEL_IDENTIFICATION:\r
             case Q931ie_PROGRESS_INDICATOR:\r
             case Q931ie_NETWORK_SPECIFIC_FACILITIES:\r
-            case Q931ie_DISPLAY:\r
             case Q931ie_DATETIME:\r
             case Q931ie_KEYPAD_FACILITY:\r
             case Q931ie_SIGNAL:\r
@@ -194,11 +193,6 @@ L3INT ATT5ESSPmes_Setup(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT I
         if((rc=Q931Pie[pTrunk->Dialect][Q931ie_NETWORK_SPECIFIC_FACILITIES](pTrunk, Q931GetIEPtr(pMes->NetFac,pMes->buf), OBuf, &Octet))!=0)\r
             return rc;\r
 \r
-    /* Display */\r
-    if(Q931IsIEPresent(pMes->Display))\r
-        if((rc=Q931Pie[pTrunk->Dialect][Q931ie_DISPLAY](pTrunk, Q931GetIEPtr(pMes->Display,pMes->buf), OBuf, &Octet))!=0)\r
-            return rc;\r
-\r
     /* Date/Time */\r
     if(Q931IsIEPresent(pMes->DateTime))\r
         if((rc=Q931Pie[pTrunk->Dialect][Q931ie_DATETIME](pTrunk, Q931GetIEPtr(pMes->DateTime,pMes->buf), OBuf, &Octet))!=0)\r