Skip to content

F
freeswitch
提交 b8bfc4c8 authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

api rework to pass the Q931mes_Generic pointer into the message pack functions,… 

api rework to pass the Q931mes_Generic pointer into the message pack functions, and out of the message unpack functions.  Move Q932 to use the generic message type.

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@140 a93c3328-9c30-0410-af19-c9cd2b2d52af
上级 dd283a1e
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 166 行增加 和 262 行删除
libs/freetdm/src/isdn/Q931.c
浏览文件 @ b8bfc4c8
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
*****************************************************************************/ *****************************************************************************/
L3INT (*Q931Proc [Q931MAXDLCT][Q931MAXMES]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *,L3INT); L3INT (*Q931Proc [Q931MAXDLCT][Q931MAXMES]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *,L3INT);
L3INT (*Q931Umes [Q931MAXDLCT][Q931MAXMES]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size); L3INT (*Q931Umes [Q931MAXDLCT][Q931MAXMES]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size);
L3INT (*Q931Pmes [Q931MAXDLCT][Q931MAXMES]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT (*Q931Pmes [Q931MAXDLCT][Q931MAXMES]) (Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT (*Q931Uie [Q931MAXDLCT][Q931MAXIE]) (Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * OBuf, L3INT *IOff, L3INT *OOff); L3INT (*Q931Uie [Q931MAXDLCT][Q931MAXIE]) (Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR * OBuf, L3INT *IOff, L3INT *OOff);
L3INT (*Q931Pie [Q931MAXDLCT][Q931MAXIE]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT *Octet); L3INT (*Q931Pie [Q931MAXDLCT][Q931MAXIE]) (Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT *Octet);
...@@ -143,7 +143,7 @@ L3INT Q931ProcDummy(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b,L3INT c) ...@@ -143,7 +143,7 @@ L3INT Q931ProcDummy(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b,L3INT c)
Description: Dummy function for message processing Description: Dummy function for message processing
*****************************************************************************/ *****************************************************************************/
L3INT Q931UmesDummy(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q931UmesDummy(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
return Q931E_UNKNOWN_MESSAGE; return Q931E_UNKNOWN_MESSAGE;
} }
...@@ -167,7 +167,7 @@ L3INT Q931UieDummy(Q931_TrunkInfo_t *pTrunk,ie *pIE,L3UCHAR * IBuf, L3UCHAR * OB ...@@ -167,7 +167,7 @@ L3INT Q931UieDummy(Q931_TrunkInfo_t *pTrunk,ie *pIE,L3UCHAR * IBuf, L3UCHAR * OB
Description: Dummy function for message processing Description: Dummy function for message processing
*****************************************************************************/ *****************************************************************************/
L3INT Q931PmesDummy(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q931PmesDummy(Q931_TrunkInfo_t *pTrunk,Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
return Q931E_UNKNOWN_MESSAGE; return Q931E_UNKNOWN_MESSAGE;
} }
...@@ -334,7 +334,7 @@ L3INT Q931Rx23(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT Size) ...@@ -334,7 +334,7 @@ L3INT Q931Rx23(Q931_TrunkInfo_t *pTrunk, L3UCHAR * buf, L3INT Size)
m->MesType = Mes[IOff++]; m->MesType = Mes[IOff++];
/* Call table proc to unpack codec message */ /* Call table proc to unpack codec message */
RetCode = Q931Umes[pTrunk->Dialect][m->MesType](pTrunk, Mes, pTrunk->L3Buf, Q931L4HeaderSpace + IOff , Size - Q931L4HeaderSpace - IOff + 1); RetCode = Q931Umes[pTrunk->Dialect][m->MesType](pTrunk, Mes, (Q931mes_Generic *)pTrunk->L3Buf, Q931L4HeaderSpace + IOff , Size - Q931L4HeaderSpace - IOff + 1);
if(RetCode >= Q931E_NO_ERROR) if(RetCode >= Q931E_NO_ERROR)
{ {
...@@ -414,7 +414,7 @@ L3INT Q931Tx32(Q931_TrunkInfo_t *pTrunk, L3UCHAR * Mes, L3INT Size) ...@@ -414,7 +414,7 @@ L3INT Q931Tx32(Q931_TrunkInfo_t *pTrunk, L3UCHAR * Mes, L3INT Size)
L3INT iDialect = pTrunk->Dialect; L3INT iDialect = pTrunk->Dialect;
/* Call pack function through table. */ /* Call pack function through table. */
RetCode = Q931Pmes[iDialect][ptr->MesType](pTrunk,Mes,Size,&pTrunk->L2Buf[Q931L2HeaderSpace], &OSize); RetCode = Q931Pmes[iDialect][ptr->MesType](pTrunk, (Q931mes_Generic *)Mes, Size, &pTrunk->L2Buf[Q931L2HeaderSpace], &OSize);
if(RetCode >= Q931E_NO_ERROR) if(RetCode >= Q931E_NO_ERROR)
{ {
if (pTrunk->Q931Tx32CBProc) { if (pTrunk->Q931Tx32CBProc) {
......
libs/freetdm/src/isdn/Q931api.c
浏览文件 @ b8bfc4c8
...@@ -147,8 +147,8 @@ L3INT Q931Api_InitTrunk(Q931_TrunkInfo_t *pTrunk, ...@@ -147,8 +147,8 @@ L3INT Q931Api_InitTrunk(Q931_TrunkInfo_t *pTrunk,
void Q931SetMesProc(L3UCHAR mes, L3UCHAR dialect, void Q931SetMesProc(L3UCHAR mes, L3UCHAR dialect,
L3INT (*Q931ProcFunc)(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom), L3INT (*Q931ProcFunc)(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom),
L3INT (*Q931UmesFunc)(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size), L3INT (*Q931UmesFunc)(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size),
L3INT (*Q931PmesFunc)(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT (*Q931PmesFunc)(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
) )
{ {
if(Q931ProcFunc != NULL) if(Q931ProcFunc != NULL)
......
libs/freetdm/src/isdn/Q932mes.c
浏览文件 @ b8bfc4c8
...@@ -43,16 +43,16 @@ ...@@ -43,16 +43,16 @@
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_Facility(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_Facility(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_Facility *mes = (Q932mes_Facility*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_Facility) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -61,7 +61,7 @@ L3INT Q932Umes_Facility(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L ...@@ -61,7 +61,7 @@ L3INT Q932Umes_Facility(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L
Function: Q931Pmes_Facility Function: Q931Pmes_Facility
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_Facility(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_Facility(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -77,16 +77,16 @@ L3INT Q932Pmes_Facility(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3 ...@@ -77,16 +77,16 @@ L3INT Q932Pmes_Facility(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_Hold(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_Hold(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_Hold *mes = (Q932mes_Hold*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_Hold) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -95,7 +95,7 @@ L3INT Q932Umes_Hold(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT ...@@ -95,7 +95,7 @@ L3INT Q932Umes_Hold(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT
Function: Q931Pmes_Hold Function: Q931Pmes_Hold
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_Hold(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_Hold(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -111,16 +111,16 @@ L3INT Q932Pmes_Hold(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHA ...@@ -111,16 +111,16 @@ L3INT Q932Pmes_Hold(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHA
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_HoldAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_HoldAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_HoldAck *mes = (Q932mes_HoldAck*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_HoldAck) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -129,7 +129,7 @@ L3INT Q932Umes_HoldAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3 ...@@ -129,7 +129,7 @@ L3INT Q932Umes_HoldAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3
Function: Q931Pmes_HoldAck Function: Q931Pmes_HoldAck
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_HoldAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_HoldAck(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -145,16 +145,16 @@ L3INT Q932Pmes_HoldAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3U ...@@ -145,16 +145,16 @@ L3INT Q932Pmes_HoldAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3U
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_HoldReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_HoldReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_HoldReject *mes = (Q932mes_HoldReject*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_HoldReject) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -163,7 +163,7 @@ L3INT Q932Umes_HoldReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, ...@@ -163,7 +163,7 @@ L3INT Q932Umes_HoldReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf,
Function: Q931Pmes_HoldReject Function: Q931Pmes_HoldReject
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_HoldReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_HoldReject(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -179,16 +179,16 @@ L3INT Q932Pmes_HoldReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, ...@@ -179,16 +179,16 @@ L3INT Q932Pmes_HoldReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize,
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_Register(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_Register(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_Register *mes = (Q932mes_Register*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_Register) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -197,7 +197,7 @@ L3INT Q932Umes_Register(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L ...@@ -197,7 +197,7 @@ L3INT Q932Umes_Register(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L
Function: Q931Pmes_Register Function: Q931Pmes_Register
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_Register(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_Register(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -213,16 +213,16 @@ L3INT Q932Pmes_Register(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3 ...@@ -213,16 +213,16 @@ L3INT Q932Pmes_Register(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_Retrieve(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_Retrieve(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_Retrieve *mes = (Q932mes_Retrieve*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_Retrieve) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -231,7 +231,7 @@ L3INT Q932Umes_Retrieve(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L ...@@ -231,7 +231,7 @@ L3INT Q932Umes_Retrieve(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L
Function: Q931Pmes_Retrieve Function: Q931Pmes_Retrieve
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_Retrieve(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_Retrieve(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -247,16 +247,16 @@ L3INT Q932Pmes_Retrieve(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3 ...@@ -247,16 +247,16 @@ L3INT Q932Pmes_Retrieve(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_RetrieveAck *mes = (Q932mes_RetrieveAck*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_RetrieveAck) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -265,7 +265,7 @@ L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf ...@@ -265,7 +265,7 @@ L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf
Function: Q931Pmes_RetrieveAck Function: Q931Pmes_RetrieveAck
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
...@@ -281,16 +281,16 @@ L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, ...@@ -281,16 +281,16 @@ L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize,
*****************************************************************************/ *****************************************************************************/
L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
/* L3INT ir=0; */ /* L3INT ir=0; */
L3INT OOff=0; L3INT OOff=0;
Q932mes_RetrieveReject *mes = (Q932mes_RetrieveReject*)IBuf; Q931mes_Generic *mes = (Q931mes_Generic*)OBuf;
/* TODO */ /* TODO */
mes->Size = sizeof(Q932mes_RetrieveReject) - 1 + OOff; mes->Size = sizeof(Q931mes_Generic) - 1 + OOff;
return Q931E_NO_ERROR; return Q931E_NO_ERROR;
} }
...@@ -299,7 +299,7 @@ L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *O ...@@ -299,7 +299,7 @@ L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo_t *pTrunk,L3UCHAR *IBuf, L3UCHAR *O
Function: Q931Pmes_RetrieveReject Function: Q931Pmes_RetrieveReject
*****************************************************************************/ *****************************************************************************/
L3INT Q932Pmes_RetrieveReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT Q932Pmes_RetrieveReject(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3BOOL RetCode = L3FALSE; L3BOOL RetCode = L3FALSE;
......
libs/freetdm/src/isdn/include/Q932.h
浏览文件 @ b8bfc4c8
...@@ -55,102 +55,6 @@ ...@@ -55,102 +55,6 @@
*****************************************************************************/ *****************************************************************************/
#define Q932ie_FACILITY 0x1c /* 0001 1100 */ #define Q932ie_FACILITY 0x1c /* 0001 1100 */
/*****************************************************************************
Struct: Q932ie_Facility
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_Facility;
/*****************************************************************************
Struct: Q932ie_Hold
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_Hold;
/*****************************************************************************
Struct: Q932ie_HoldAck
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_HoldAck;
/*****************************************************************************
Struct: Q932ie_HoldReject
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_HoldReject;
/*****************************************************************************
Struct: Q932ie_Register
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_Register;
/*****************************************************************************
Struct: Q932ie_Retrieve
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_Retrieve;
/*****************************************************************************
Struct: Q932ie_RetrieveAck
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_RetrieveAck;
/*****************************************************************************
Struct: Q932ie_RetrieveReject
*****************************************************************************/
typedef struct
{
L3UINT Size; /* Size of message in bytes */
L3UCHAR ProtDisc; /* Protocol Discriminator */
L3UCHAR MesType; /* Message type */
L3USHORT CRV; /* Call reference value */
L3UCHAR buf[1]; /* Dynamic buffer */
}Q932mes_RetrieveReject;
/***************************************************************************** /*****************************************************************************
Function Prototypes. Function Prototypes.
*****************************************************************************/ *****************************************************************************/
...@@ -172,20 +76,20 @@ L3INT Q932ProcRetrieveNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom); ...@@ -172,20 +76,20 @@ L3INT Q932ProcRetrieveNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom);
L3INT Q932ProcRetrieveAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom); L3INT Q932ProcRetrieveAckNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom);
L3INT Q932ProcRetrieveRejectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom); L3INT Q932ProcRetrieveRejectNT(Q931_TrunkInfo_t *pTrunk, L3UCHAR * b, L3INT iFrom);
L3INT Q932Pmes_Facility(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_Facility(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_Hold(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_Hold(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_HoldAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_HoldAck(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_HoldReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_HoldReject(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_Register(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_Register(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_Retrieve(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_Retrieve(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Pmes_RetrieveReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT Q932Pmes_RetrieveReject(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
L3INT Q932Umes_Facility(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_Facility(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_Hold(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_Hold(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_HoldAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_HoldAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_HoldReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_HoldReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_Register(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_Register(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_Retrieve(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_Retrieve(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_RetrieveAck(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR * OBuf, L3INT I, L3INT O); L3INT Q932Umes_RetrieveReject(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic * OBuf, L3INT I, L3INT O);
libs/freetdm/src/isdn/include/national.h
浏览文件 @ b8bfc4c8
...@@ -104,8 +104,8 @@ L3INT nationalUie_GenericDigits(Q931_TrunkInfo_t *pTrunk,ie *pIE, L3UCHAR * IBuf ...@@ -104,8 +104,8 @@ L3INT nationalUie_GenericDigits(Q931_TrunkInfo_t *pTrunk,ie *pIE, L3UCHAR * IBuf
Q.931 Message Pack/Unpack functions. Implemented in nationalmes.c Q.931 Message Pack/Unpack functions. Implemented in nationalmes.c
*****************************************************************************/ *****************************************************************************/
L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size); L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size);
L3INT nationalPmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize); L3INT nationalPmes_Setup(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize);
/***************************************************************************** /*****************************************************************************
......
libs/freetdm/src/isdn/nationalmes.c
浏览文件 @ b8bfc4c8
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
Function: nationalUmes_Setup Function: nationalUmes_Setup
*****************************************************************************/ *****************************************************************************/
L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, L3INT IOff, L3INT Size) L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, Q931mes_Generic *OBuf, L3INT IOff, L3INT Size)
{ {
/* L3INT i = IOff; */ /* L3INT i = IOff; */
L3INT ir=0; L3INT ir=0;
...@@ -188,7 +188,7 @@ L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf, ...@@ -188,7 +188,7 @@ L3INT nationalUmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3UCHAR *OBuf,
Called By: Q931ProcSetup Called By: Q931ProcSetup
*****************************************************************************/ *****************************************************************************/
L3INT nationalPmes_Setup(Q931_TrunkInfo_t *pTrunk, L3UCHAR *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize) L3INT nationalPmes_Setup(Q931_TrunkInfo_t *pTrunk, Q931mes_Generic *IBuf, L3INT ISize, L3UCHAR *OBuf, L3INT *OSize)
{ {
L3INT rc = Q931E_NO_ERROR; L3INT rc = Q931E_NO_ERROR;
Q931mes_Generic *pMes = (Q931mes_Generic *)IBuf; Q931mes_Generic *pMes = (Q931mes_Generic *)IBuf;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论