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

@@ -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*/

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*/

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;
 }

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));