Use the same Q931mes_Generic for all messages for simplicity.

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

libs/freetdm/src/isdn/Q931.c

@@ -319,7 +319,7 @@ L3INT Q931Rx23(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT Size)
 {
     L3UCHAR *Mes = &buf[Q931L2HeaderSpace];
 	L3INT RetCode = Q931E_NO_ERROR;
-    Q931mes_Alerting *m = (Q931mes_Alerting *) pTrunk->L3Buf;
+    Q931mes_Generic *m = (Q931mes_Generic *) pTrunk->L3Buf;
     L3INT ISize;
 
     L3INT IOff = 0;
@@ -409,7 +409,7 @@ L3INT Q931Rx43(Q931_TrunkInfo_t *pTrunk,L3UCHAR * buf, L3INT Size)
 L3INT Q931Tx32(Q931_TrunkInfo_t *pTrunk, L3UCHAR * Mes, L3INT Size)
 {
     L3INT     OSize;
-    Q931mes_Alerting *ptr = (Q931mes_Alerting*)Mes;
+    Q931mes_Generic *ptr = (Q931mes_Generic*)Mes;
 	L3INT RetCode = Q931E_NO_ERROR;
     L3INT iDialect = pTrunk->Dialect;
 

libs/freetdm/src/isdn/Q931StateNT.c

@@ -294,7 +294,7 @@ L3INT Q931ProcProgressNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 L3INT Q931ProcSetupNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 {
     L3INT rc=0;
-	Q931mes_Setup *pMes = (Q931mes_Setup *)&buf[Q931L4HeaderSpace];
+	Q931mes_Generic *pMes = (Q931mes_Generic *)&buf[Q931L4HeaderSpace];
     L3INT callIndex;
     L3INT ret=Q931E_NO_ERROR;
 

libs/freetdm/src/isdn/Q931StateTE.c

@@ -376,7 +376,7 @@ L3INT Q931ProcProgressTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 L3INT Q931ProcSetupTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 {
     L3INT rc=0;
-	Q931mes_Setup *pMes = (Q931mes_Setup *)&buf[Q931L4HeaderSpace];
+	Q931mes_Generic *pMes = (Q931mes_Generic *)&buf[Q931L4HeaderSpace];
     L3INT callIndex;
     L3INT ret=Q931E_NO_ERROR;
 
@@ -482,7 +482,7 @@ L3INT Q931ProcSetupAckTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 *****************************************************************************/
 L3INT Q931ProcResumeTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 {
-    Q931mes_Resume * pMes = (Q931mes_Resume *)&buf[Q931L4HeaderSpace];
+    Q931mes_Generic * pMes = (Q931mes_Generic *)&buf[Q931L4HeaderSpace];
     L3INT callIndex;
     L3INT ret = Q931E_NO_ERROR;
 
@@ -750,7 +750,7 @@ L3INT Q931ProcDisconnectTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 *****************************************************************************/
 L3INT Q931ProcReleaseTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 {
-    Q931mes_Release *pMes = (Q931mes_Release *)&buf[Q931L4HeaderSpace];
+    Q931mes_Generic *pMes = (Q931mes_Generic *)&buf[Q931L4HeaderSpace];
     L3INT state = Q931GetCallState(pTrunk, pMes->CRV);
     L3INT ret = Q931E_NO_ERROR;
     if(state == Q931_U0 && iFrom == 2)
@@ -772,7 +772,7 @@ L3INT Q931ProcReleaseTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 *****************************************************************************/
 L3INT Q931ProcReleaseCompleteTE(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT iFrom)
 {
-    Q931mes_ReleaseComplete *pMes = (Q931mes_ReleaseComplete *)&buf[Q931L4HeaderSpace];
+    Q931mes_Generic *pMes = (Q931mes_Generic *)&buf[Q931L4HeaderSpace];
     L3INT state = Q931GetCallState(pTrunk, pMes->CRV);
     L3INT ret = Q931E_NO_ERROR;
     if(state == Q931_U0 && iFrom == 2)

libs/freetdm/src/isdn/Q931api.c

@@ -182,47 +182,47 @@ void Q931SetIEProc(L3UCHAR iec, L3UCHAR dialect,
 L3UCHAR * Q931GetIEBuf(L3UCHAR *pm)
 {
 	L3UCHAR * s=NULL;
-	Q931mes_Alerting * pMes= (Q931mes_Alerting *)pm;
+	Q931mes_Generic * pMes= (Q931mes_Generic *)pm;
 	switch(pMes->MesType)
 	{
     case Q931mes_ALERTING             :
-		trampoline(Q931mes_Alerting);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_CALL_PROCEEDING      :
-		trampoline(Q931mes_CallProceeding);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_CONNECT              :      
-		trampoline(Q931mes_Connect);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_CONNECT_ACKNOWLEDGE  :
-		trampoline(Q931mes_ConnectAck);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_PROGRESS             :
-		trampoline(Q931mes_Progress);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_SETUP                :
-		trampoline(Q931mes_Setup);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_SETUP_ACKNOWLEDGE    :
-		trampoline(Q931mes_SetupAck);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RESUME               :
-		trampoline(Q931mes_Resume);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RESUME_ACKNOWLEDGE   :
-		trampoline(Q931mes_ResumeAck);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RESUME_REJECT        :
-		trampoline(Q931mes_ResumeReject);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q932mes_RETRIEVE             :
@@ -238,43 +238,43 @@ L3UCHAR * Q931GetIEBuf(L3UCHAR *pm)
         break;
 
     case Q931mes_SUSPEND              :
-		trampoline(Q931mes_Suspend);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_SUSPEND_ACKNOWLEDGE  :
-		trampoline(Q931mes_SuspendAck);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_SUSPEND_REJECT       :
-		trampoline(Q931mes_SuspendReject);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_USER_INFORMATION     :
-		trampoline(Q931mes_UserInformation);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_DISCONNECT           :
-		trampoline(Q931mes_Disconnect);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RELEASE              :
-		trampoline(Q931mes_Release);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RELEASE_COMPLETE     :
-		trampoline(Q931mes_ReleaseComplete);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RESTART              :
-		trampoline(Q931mes_Restart);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_RESTART_ACKNOWLEDGE  :
-		trampoline(Q931mes_RestartAck);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_CONGESTION_CONTROL   :
-		trampoline(Q931mes_CongestionControl);
+		trampoline(Q931mes_Generic);
         break;
 #if 0
     case Q931mes_FACILITY           :
@@ -283,11 +283,11 @@ L3UCHAR * Q931GetIEBuf(L3UCHAR *pm)
 #endif
 
     case Q931mes_INFORMATION          :
-		trampoline(Q931mes_Information);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_NOTIFY               :
-		trampoline(Q931mes_Notify);
+		trampoline(Q931mes_Generic);
         break;
 
 #if 0
@@ -297,15 +297,15 @@ L3UCHAR * Q931GetIEBuf(L3UCHAR *pm)
 #endif
 
     case Q931mes_STATUS               :
-		trampoline(Q931mes_Status);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_STATUS_ENQUIRY       :
-		trampoline(Q931mes_StatusEnquiry);
+		trampoline(Q931mes_Generic);
         break;
 
     case Q931mes_SEGMENT              :
-		trampoline(Q931mes_Segment);
+		trampoline(Q931mes_Generic);
         break;
 
     default:
@@ -340,7 +340,7 @@ L3INT Q931GetMesSize(L3UCHAR *pMes)
 ie Q931AppendIE( L3UCHAR *pm, L3UCHAR *pi)
 {
 	ie IE = 0;
-	Q931mes_Alerting * pMes= (Q931mes_Alerting *)pm;
+	Q931mes_Generic * pMes= (Q931mes_Generic *)pm;
 	Q931ie_BearerCap * pIE= (Q931ie_BearerCap *)pi;
 	L3INT iISize = pIE->Size;
 
@@ -363,7 +363,7 @@ L3INT Q931GetUniqueCRV(Q931_TrunkInfo_t *pTrunk)
 	return crv++;
 }
 
-L3INT Q931InitMesSetup(Q931mes_Setup *pMes)
+L3INT Q931InitMesSetup(Q931mes_Generic *pMes)
 {
 	pMes->ProtDisc		= 0x80;
 	pMes->CRV			= 0;		/* CRV to be allocated, might be receive*/
@@ -393,7 +393,7 @@ L3INT Q931InitMesSetup(Q931mes_Setup *pMes)
 	return 0;
 }
 
-L3INT Q931InitMesResume(Q931mes_Resume * pMes)
+L3INT Q931InitMesResume(Q931mes_Generic * pMes)
 {
 	pMes->ProtDisc		= 0x80;
 	pMes->CRV			= 0;		/* CRV to be allocated, might be receive*/
@@ -404,7 +404,7 @@ L3INT Q931InitMesResume(Q931mes_Resume * pMes)
 	return 0;
 }
 
-L3INT Q931InitMesRestartAck(Q931mes_RestartAck * pMes)
+L3INT Q931InitMesRestartAck(Q931mes_Generic * pMes)
 {
 	pMes->ProtDisc		= 0x80;
 	pMes->CRV			= 0;		/* CRV to be allocated, might be receive*/

libs/freetdm/src/isdn/nationalmes.c

@@ -56,7 +56,7 @@ L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
 	/* L3INT i = IOff; */
 	L3INT ir=0;
 	L3INT OOff=0;
-    Q931mes_Setup *mes = (Q931mes_Setup*)OBuf;
+    Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
 	L3INT rc=Q931E_NO_ERROR;
 	while(IOff < Size)
 	{
@@ -166,7 +166,7 @@ L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
 			break;
 		}
 	}
-    mes->Size = sizeof(Q931mes_Setup) - 1 + OOff;
+    mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
     return Q931E_NO_ERROR;
 }
 
@@ -174,7 +174,7 @@ L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
 
   Function:     nationalPmes_Setup
 
-  Decription:	Pack a Q931mes_Setup into a real Q.931 message. The user will
+  Decription:	Pack a Q931mes_Generic into a real Q.931 message. The user will
 				set up a SETUP message and issue this to the stack where it
 				is processed by Q931ProcSetup that processes and validates
 				it before it actually sends it out. This function is called
@@ -191,7 +191,7 @@ L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
 L3INT nationalPmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
 {
     L3INT rc = Q931E_NO_ERROR;
-	Q931mes_Setup *pMes = (Q931mes_Setup *)IBuf;
+	Q931mes_Generic *pMes = (Q931mes_Generic *)IBuf;
 	L3INT Octet = 0;
 
 	/* Q931 Message Header */

libs/freetdm/src/zap_isdn.c

@@ -68,7 +68,7 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 	Q931mes_Generic *gen = (Q931mes_Generic *) msg;
 
 
-	Q931mes_Restart * restart = (Q931mes_Restart*)msg;
+	Q931mes_Generic * restart = (Q931mes_Generic*)msg;
 
 	L3INT ieoff = Q931GetIEOffset(restart->RestartInd);
 	Q931ie_RestartInd * restartind = (void *)(&restart->buf + (ieoff * sizeof(restart->buf[1]))); 
@@ -76,10 +76,10 @@ static L3INT zap_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
 
 	assert(span != NULL);
 	assert(data != NULL);
-	printf("WTF: %d", ((Q931mes_Restart*)gen)->Size);
-	zap_log(ZAP_LOG_DEBUG, "Yay I got an event! %d %d\n", gen->MesType, ((Q931mes_Restart*)gen)->Size);
+	printf("WTF: %d", ((Q931mes_Generic*)gen)->Size);
+	zap_log(ZAP_LOG_DEBUG, "Yay I got an event! %d %d\n", gen->MesType, ((Q931mes_Generic*)gen)->Size);
 	zap_log(ZAP_LOG_DEBUG, "send ack %d\n", restartind->Class);
-	zap_log(ZAP_LOG_DEBUG, "send ack %d\n", ((Q931mes_Restart*)gen)->Size);
+	zap_log(ZAP_LOG_DEBUG, "send ack %d\n", ((Q931mes_Generic*)gen)->Size);
 
 	printf("XXXXXXXXXXXXx");
 	gen->MesType = Q931mes_RESTART_ACKNOWLEDGE;