merge patches from stkn openzap-facility-Umes.patch openzap-53ess-facility.patch...

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

diff --git a/libs/freetdm/src/isdn/5ESSStateNT.c b/libs/freetdm/src/isdn/5ESSStateNT.c
index 5ba4ca8f79e62b9ae4e2b027c6a34614e0f63011..d2a5540c3231b947c2b8f748dce0f180de0f5dfe 100644 (file)
--- a/libs/freetdm/src/isdn/5ESSStateNT.c
+++ b/libs/freetdm/src/isdn/5ESSStateNT.c
@@ -121,6 +121,9 @@ void ATT5ESSCreateNT(L3UCHAR i)
     Q931SetIEProc(Q931ie_USER_USER,                        i,Q931Pie_UserUser,          Q931Uie_UserUser);\r
     Q931SetIEProc(Q931ie_GENERIC_DIGITS,                   i,Q931Pie_GenericDigits,     Q931Uie_GenericDigits);\r
 \r
+       Q931SetIEProc(Q931ie_CONNECTED_NUMBER, i, Q931Pie_Generic, Q931Uie_Generic);\r
+       Q931SetIEProc(Q931ie_FACILITY,         i, Q931Pie_Generic, Q931Uie_Generic);\r
+\r
     /* The following define a state machine. The point is that the Message  */\r
     /* procs can when search this to find out if the message/state          */\r
     /* combination is legale. If not, the proc for unexpected message apply.*/\r

diff --git a/libs/freetdm/src/isdn/5ESSStateTE.c b/libs/freetdm/src/isdn/5ESSStateTE.c
index 13a080cadc8a65e38160b3dc12d5b68d890edc9b..62594212e3e52c5cc80ba7aa7ea536c0302507f7 100644 (file)
--- a/libs/freetdm/src/isdn/5ESSStateTE.c
+++ b/libs/freetdm/src/isdn/5ESSStateTE.c
@@ -130,6 +130,9 @@ void ATT5ESSCreateTE(L3UCHAR i)
     Q931SetIEProc(Q931ie_USER_USER,                        i,Q931Pie_UserUser,          Q931Uie_UserUser);\r
     Q931SetIEProc(Q931ie_GENERIC_DIGITS,                   i,Q931Pie_GenericDigits,     Q931Uie_GenericDigits);\r
 \r
+       Q931SetIEProc(Q931ie_CONNECTED_NUMBER, i, Q931Pie_Generic, Q931Uie_Generic);\r
+       Q931SetIEProc(Q931ie_FACILITY,         i, Q931Pie_Generic, Q931Uie_Generic);\r
+\r
     /* The following define a state machine. The point is that the Message  */\r
     /* procs can when search this to find out if the message/state          */\r
     /* combination is legale. If not, the proc for unexpected message apply.*/\r

diff --git a/libs/freetdm/src/isdn/5ESSmes.c b/libs/freetdm/src/isdn/5ESSmes.c
index fc8d4b9fbbaf201b92dc25a6a3e64207b23065af..10508baf9a5edeefcc21d607d3c06d5d0b08c930 100644 (file)
--- a/libs/freetdm/src/isdn/5ESSmes.c
+++ b/libs/freetdm/src/isdn/5ESSmes.c
@@ -95,6 +95,7 @@ L3INT ATT5ESSUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic
             case Q931ie_TRANSIT_NETWORK_SELECTION:\r
             case Q931ie_LOW_LAYER_COMPATIBILITY:\r
             case Q931ie_HIGH_LAYER_COMPATIBILITY:\r
+            case Q931ie_FACILITY:\r
                 rc = Q931Uie[pTrunk->Dialect][IBuf[IOff]](pTrunk, mes, &IBuf[IOff], &mes->buf[OOff], &IOff, &OOff);\r
                 if(rc != Q931E_NO_ERROR) \r
                     return rc;\r

diff --git a/libs/freetdm/src/isdn/Q931mes.c b/libs/freetdm/src/isdn/Q931mes.c
index 4a53516bdd122fdf71bf6a448353811c428f11d7..43a5098f627f8e28d465b5a8179bc889858b943d 100644 (file)
--- a/libs/freetdm/src/isdn/Q931mes.c
+++ b/libs/freetdm/src/isdn/Q931mes.c
@@ -1179,6 +1179,7 @@ L3INT Q931Umes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic *m
                case Q931ie_TRANSIT_NETWORK_SELECTION:
                case Q931ie_LOW_LAYER_COMPATIBILITY:
                case Q931ie_HIGH_LAYER_COMPATIBILITY:
+               case Q931ie_FACILITY:
                        rc = Q931Uie[pTrunk->Dialect][IBuf[IOff]](pTrunk, mes, &IBuf[IOff], &mes->buf[OOff], &IOff, &OOff);
                        if(rc != Q931E_NO_ERROR) 
                                return rc;