From 479b109acadc5b81e6553682a509e59dd30968d9 Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Fri, 14 Nov 2008 20:31:08 +0000 Subject: [PATCH] Fix OpenZAP-34 git-svn-id: http://svn.openzap.org/svn/openzap/trunk@609 a93c3328-9c30-0410-af19-c9cd2b2d52af --- libs/openzap/src/isdn/5ESSStateTE.c | 4 +- libs/openzap/src/isdn/DMSStateTE.c | 4 +- libs/openzap/src/isdn/Q931StateNT.c | 68 ++++++++++++++-------------- libs/openzap/src/isdn/Q931StateTE.c | 66 +++++++++++++-------------- libs/openzap/src/isdn/Q931api.c | 4 +- libs/openzap/src/isdn/include/Q931.h | 4 +- 6 files changed, 75 insertions(+), 75 deletions(-) diff --git a/libs/openzap/src/isdn/5ESSStateTE.c b/libs/openzap/src/isdn/5ESSStateTE.c index ce2425e0e0..e2ededd9ac 100644 --- a/libs/openzap/src/isdn/5ESSStateTE.c +++ b/libs/openzap/src/isdn/5ESSStateTE.c @@ -237,7 +237,7 @@ L3INT ATT5ESSProc0x0fTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } if (iFrom == 4) { /* TODO Add proc here*/ @@ -276,7 +276,7 @@ L3INT ATT5ESSProc0x07TE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } if (iFrom == 4) { /* TODO Add proc here*/ diff --git a/libs/openzap/src/isdn/DMSStateTE.c b/libs/openzap/src/isdn/DMSStateTE.c index 5de657d7d9..cb740d3c2f 100644 --- a/libs/openzap/src/isdn/DMSStateTE.c +++ b/libs/openzap/src/isdn/DMSStateTE.c @@ -231,7 +231,7 @@ L3INT DMSProc0x0fTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } if (iFrom == 4) { /* TODO Add proc here*/ @@ -269,7 +269,7 @@ L3INT DMSProc0x07TE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } if (iFrom == 4) { /* TODO Add proc here*/ diff --git a/libs/openzap/src/isdn/Q931StateNT.c b/libs/openzap/src/isdn/Q931StateNT.c index 71f2e6e836..6a4a37b0e7 100644 --- a/libs/openzap/src/isdn/Q931StateNT.c +++ b/libs/openzap/src/isdn/Q931StateNT.c @@ -163,7 +163,7 @@ L3INT Q931ProcAlertingNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) return ret; /* Reset 4 sec timer. */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); } @@ -192,7 +192,7 @@ L3INT Q931ProcCallProceedingNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iF /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -223,7 +223,7 @@ L3INT Q931ProcConnectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -254,7 +254,7 @@ L3INT Q931ProcConnectAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -285,7 +285,7 @@ L3INT Q931ProcProgressNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -332,7 +332,7 @@ L3INT Q931ProcSetupNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) if (ret) return ret; - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); Q931SetState(pTrunk, callIndex, Q931_U1); } /* incoming call */ @@ -362,7 +362,7 @@ L3INT Q931ProcSetupNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO: Unreachable code??? */ /* Set state U6 */ Q931SetState(pTrunk, callIndex, Q931_U6); - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); #endif } @@ -394,7 +394,7 @@ L3INT Q931ProcSetupAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -425,7 +425,7 @@ L3INT Q931ProcResumeNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -456,7 +456,7 @@ L3INT Q931ProcResumeAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -487,7 +487,7 @@ L3INT Q931ProcResumeRejectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFro /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -518,7 +518,7 @@ L3INT Q931ProcSuspendNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -549,7 +549,7 @@ L3INT Q931ProcSuspendAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -580,7 +580,7 @@ L3INT Q931ProcSuspendRejectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFr /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -611,7 +611,7 @@ L3INT Q931ProcUserInformationNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT i /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -642,7 +642,7 @@ L3INT Q931ProcDisconnectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -673,7 +673,7 @@ L3INT Q931ProcReleaseNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -704,7 +704,7 @@ L3INT Q931ProcReleaseCompleteNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT i /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -735,7 +735,7 @@ L3INT Q931ProcRestartNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -766,7 +766,7 @@ L3INT Q931ProcRestartAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -797,7 +797,7 @@ L3INT Q931ProcCongestionControlNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -828,7 +828,7 @@ L3INT Q931ProcInformationNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -859,7 +859,7 @@ L3INT Q931ProcNotifyNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -890,7 +890,7 @@ L3INT Q931ProcStatusNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -921,7 +921,7 @@ L3INT Q931ProcStatusEnquiryNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFr /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -952,7 +952,7 @@ L3INT Q931ProcSegmentNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -987,7 +987,7 @@ L3INT Q932ProcFacilityNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1018,7 +1018,7 @@ L3INT Q932ProcHoldNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1049,7 +1049,7 @@ L3INT Q932ProcHoldAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1080,7 +1080,7 @@ L3INT Q932ProcHoldRejectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1111,7 +1111,7 @@ L3INT Q932ProcRegisterNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1142,7 +1142,7 @@ L3INT Q932ProcRetrieveNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1173,7 +1173,7 @@ L3INT Q932ProcRetrieveAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1204,7 +1204,7 @@ L3INT Q932ProcRetrieveRejectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iF /* TODO chack against state table for illegal or unexpected message here*/ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); diff --git a/libs/openzap/src/isdn/Q931StateTE.c b/libs/openzap/src/isdn/Q931StateTE.c index 0d79daf656..b5486b37c0 100644 --- a/libs/openzap/src/isdn/Q931StateTE.c +++ b/libs/openzap/src/isdn/Q931StateTE.c @@ -246,7 +246,7 @@ L3INT Q931ProcAlertingTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) return ret; /* Reset 4 sec timer. */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); } @@ -275,7 +275,7 @@ L3INT Q931ProcCallProceedingTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iF /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom == 4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -306,7 +306,7 @@ L3INT Q931ProcConnectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -340,7 +340,7 @@ L3INT Q931ProcConnectAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -371,7 +371,7 @@ L3INT Q931ProcProgressTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -412,7 +412,7 @@ L3INT Q931ProcSetupTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) if (ret) return ret; - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); /* TODO: Add this back when we get the state stuff more filled out */ /*Q931SetState(pTrunk, callIndex, Q931_U1);*/ @@ -445,7 +445,7 @@ L3INT Q931ProcSetupTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* Set state U6 */ Q931SetState(pTrunk, callIndex, Q931_U6); - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); #endif } return rc; @@ -474,12 +474,12 @@ L3INT Q931ProcSetupAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) if (ret != Q931E_NO_ERROR) return ret; - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); } else if (iFrom == 2) { - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } return ret; } @@ -508,7 +508,7 @@ L3INT Q931ProcResumeTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) return ret; /* Start timer T318 */ - Q931StartTimer(pTrunk, callIndex, 318); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T318); /* set state U17 */ Q931SetState(pTrunk, callIndex, Q931_U17); @@ -537,7 +537,7 @@ L3INT Q931ProcResumeAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -568,7 +568,7 @@ L3INT Q931ProcResumeRejectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFro /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -599,7 +599,7 @@ L3INT Q931ProcSuspendTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -630,7 +630,7 @@ L3INT Q931ProcSuspendAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -661,7 +661,7 @@ L3INT Q931ProcSuspendRejectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFr /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -692,7 +692,7 @@ L3INT Q931ProcUserInformationTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT i /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -726,7 +726,7 @@ L3INT Q931ProcDisconnectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -817,7 +817,7 @@ L3INT Q931ProcRestartTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) return ret; /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } /* TODO chack against state table for illegal or unexpected message here */ @@ -854,7 +854,7 @@ L3INT Q931ProcRestartAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) if (ret != Q931E_NO_ERROR) return ret; /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); } /* TODO chack against state table for illegal or unexpected message here */ @@ -889,7 +889,7 @@ L3INT Q931ProcCongestionControlTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -920,7 +920,7 @@ L3INT Q931ProcInformationTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -951,7 +951,7 @@ L3INT Q931ProcNotifyTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -982,7 +982,7 @@ L3INT Q931ProcStatusTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1013,7 +1013,7 @@ L3INT Q931ProcStatusEnquiryTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFr /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1044,7 +1044,7 @@ L3INT Q931ProcSegmentTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1079,7 +1079,7 @@ L3INT Q932ProcFacilityTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1110,7 +1110,7 @@ L3INT Q932ProcHoldTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1141,7 +1141,7 @@ L3INT Q932ProcHoldAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1172,7 +1172,7 @@ L3INT Q932ProcHoldRejectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1203,7 +1203,7 @@ L3INT Q932ProcRegisterTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1234,7 +1234,7 @@ L3INT Q932ProcRetrieveTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom) /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1265,7 +1265,7 @@ L3INT Q932ProcRetrieveAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); @@ -1296,7 +1296,7 @@ L3INT Q932ProcRetrieveRejectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iF /* TODO chack against state table for illegal or unexpected message here */ /* TODO - Set correct timer here */ - Q931StartTimer(pTrunk, callIndex, 303); + Q931StartTimer(pTrunk, callIndex, Q931_TIMER_T303); if (iFrom ==4) { /* TODO Add proc here */ ret = Q931Tx32Data(pTrunk, 0, buf, pMes->Size); diff --git a/libs/openzap/src/isdn/Q931api.c b/libs/openzap/src/isdn/Q931api.c index c7200d568d..e59247a26a 100644 --- a/libs/openzap/src/isdn/Q931api.c +++ b/libs/openzap/src/isdn/Q931api.c @@ -167,13 +167,13 @@ void Q931SetIEProc(L3UCHAR iec, L3UCHAR dialect, q931pie_func_t *Q931PieProc, q9 Q931Uie[dialect][iec] = Q931UieProc; } -void Q931SetTimeoutProc(L3UCHAR timer, L3UCHAR dialect, q931timeout_func_t *Q931TimeoutProc) +void Q931SetTimeoutProc(L3UCHAR dialect, L3UCHAR timer, q931timeout_func_t *Q931TimeoutProc) { if(Q931Timeout != NULL) Q931Timeout[dialect][timer] = Q931TimeoutProc; } -void Q931SetTimerDefault(L3UCHAR timer, L3UCHAR dialect, q931timer_t timeout) +void Q931SetTimerDefault(L3UCHAR dialect, L3UCHAR timer, q931timer_t timeout) { Q931Timer[dialect][timer] = timeout; } diff --git a/libs/openzap/src/isdn/include/Q931.h b/libs/openzap/src/isdn/include/Q931.h index b9c1cd3d94..0dbafd9f11 100644 --- a/libs/openzap/src/isdn/include/Q931.h +++ b/libs/openzap/src/isdn/include/Q931.h @@ -1089,8 +1089,8 @@ void Q931SetHeaderSpace(L3INT space); void Q931SetMesProc(L3UCHAR mes, L3UCHAR dialect, q931proc_func_t *Q931ProcFunc, q931umes_func_t *Q931UmesFunc, q931pmes_func_t *Q931PmesFunc); void Q931SetIEProc(L3UCHAR iec, L3UCHAR dialect, q931pie_func_t *Q931PieProc, q931uie_func_t *Q931UieProc); -void Q931SetTimeoutProc(L3UCHAR timer, L3UCHAR dialect, q931timeout_func_t *Q931TimeoutProc); -void Q931SetTimerDefault(L3UCHAR timer, L3UCHAR dialect, q931timer_t timeout); +void Q931SetTimeoutProc(L3UCHAR dialect, L3UCHAR timer, q931timeout_func_t *Q931TimeoutProc); +void Q931SetTimerDefault(L3UCHAR dialect, L3UCHAR timer, q931timer_t timeout); void Q931Initialize(void); void Q931AddDialect(L3UCHAR iDialect, void (*Q931CreateDialectCB)(L3UCHAR iDialect));