Skip to content

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

set the ie to point to the first byte of the ie struct, not the last. 

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@116 a93c3328-9c30-0410-af19-c9cd2b2d52af
上级 71f45908
隐藏空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 53 行删除
libs/freetdm/src/isdn/Q931ie.c
浏览文件 @ 5de359b3
......@@ -285,12 +285,12 @@ L3INT Q931Uie_BearerCap(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCH
Q931IESizeTest(Q931E_BEARERCAP);
*IOff = (*IOff) + Octet + Off;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_BearerCap);
pie->Size = sizeof(Q931ie_BearerCap);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -457,12 +457,12 @@ L3INT Q931Uie_CallID(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR
Q931IESizeTest(Q931E_CALLID);
*IOff = (*IOff) + Octet + Off;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CallID) + x -1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_CallID) + x -1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -542,12 +542,12 @@ L3INT Q931Uie_CallState(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHA
Q931IESizeTest(Q931E_CALLSTATE);
*IOff = (*IOff) + Octet + Off;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CallState);
pie->Size = sizeof(Q931ie_CallState);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -626,12 +626,12 @@ L3INT Q931Uie_CalledSub(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHA
Q931IESizeTest(Q931E_CALLEDSUB);
*IOff = (*IOff) + Octet + Off;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CalledSub) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_CalledSub) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -719,12 +719,12 @@ L3INT Q931Uie_CalledNum(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCH
Off++;
}
*IOff = (*IOff) + Octet + Off;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CalledNum) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_CalledNum) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -823,12 +823,12 @@ L3INT Q931Uie_CallingNum(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UC
Q931IESizeTest(Q931E_CALLINGNUM);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CallingNum) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_CallingNum) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -929,12 +929,12 @@ L3INT Q931Uie_CallingSub(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCH
Q931IESizeTest(Q931E_CALLINGSUB);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CallingSub) + x -1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_CallingSub) + x -1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1025,12 +1025,12 @@ L3INT Q931Uie_Cause(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR *
Q931IESizeTest(Q931E_CAUSE);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_Cause);
pie->Size = sizeof(Q931ie_Cause);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1097,12 +1097,12 @@ L3INT Q931Uie_CongLevel(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCH
pie->CongLevel = IBuf[Octet] & 0x0f;
Octet ++;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_CongLevel);
pie->Size = sizeof(Q931ie_CongLevel);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1204,12 +1204,12 @@ L3INT Q931Uie_ChanID(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *
Q931IESizeTest(Q931E_CHANID);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_BearerCap);
pie->Size = sizeof(Q931ie_BearerCap);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1389,12 +1389,12 @@ L3INT Q931Uie_DateTime(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR *IBuf, L3UCHAR
Q931IESizeTest(Q931E_DATETIME);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_DateTime);
pie->Size = sizeof(Q931ie_DateTime);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1478,12 +1478,12 @@ L3INT Q931Uie_Display(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR
Q931IESizeTest(Q931E_DISPLAY);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_Display) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_Display) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1589,12 +1589,12 @@ L3INT Q931Uie_HLComp(Q931_TrunkInfo_t *pTrunk, ie *pIE, L3UCHAR * IBuf, L3UCHAR
Q931IESizeTest(Q931E_HLCOMP);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_HLComp);
pie->Size = sizeof(Q931ie_HLComp);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1682,12 +1682,12 @@ L3INT Q931Uie_KeypadFac(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHA
Q931IESizeTest(Q931E_KEYPADFAC);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_KeypadFac) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_KeypadFac) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -1937,12 +1937,12 @@ L3INT Q931Uie_LLComp(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *
Q931IESizeTest(Q931E_LLCOMP);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_LLComp);
pie->Size = sizeof(Q931ie_LLComp);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2163,12 +2163,12 @@ L3INT Q931Uie_NetFac(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *
Q931IESizeTest(Q931E_NETFAC);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_NetFac) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_NetFac) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2255,12 +2255,12 @@ L3INT Q931Uie_NotifInd(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
Q931IESizeTest(Q931E_NOTIFIND);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_NotifInd);
pie->Size = sizeof(Q931ie_NotifInd);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2337,12 +2337,12 @@ L3INT Q931Uie_ProgInd(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
Q931IESizeTest(Q931E_PROGIND);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_ProgInd);
pie->Size = sizeof(Q931ie_ProgInd);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2405,12 +2405,12 @@ L3INT Q931Uie_RepeatInd(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHA
pie->RepeatInd = IBuf[Octet] & 0x0f;
Octet ++;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_RepeatInd);
pie->Size = sizeof(Q931ie_RepeatInd);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2600,12 +2600,12 @@ L3INT Q931Uie_Segment(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
Q931IESizeTest(Q931E_SEGMENT);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_Segment);
pie->Size = sizeof(Q931ie_Segment);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2666,12 +2666,12 @@ L3INT Q931Uie_SendComplete(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3U
Octet ++;
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_SendComplete);
pie->Size = sizeof(Q931ie_SendComplete);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2734,12 +2734,12 @@ L3INT Q931Uie_Signal(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR *
Q931IESizeTest(Q931E_SIGNAL);
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_Signal);
pie->Size = sizeof(Q931ie_Signal);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2816,12 +2816,12 @@ L3INT Q931Uie_TransNetSel(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UC
Off++;
}
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_TransNetSel) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_TransNetSel) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......@@ -2905,12 +2905,12 @@ L3INT Q931Uie_UserUser(Q931_TrunkInfo_t *pTrunk, ie *pIE,L3UCHAR * IBuf, L3UCHAR
Off++;
}
Q931SetIE(*pIE, *OOff);
*IOff = (*IOff) + Octet + Off;
*OOff = (*OOff) + sizeof(Q931ie_UserUser) + x - 1;
pie->Size = (L3UCHAR)(sizeof(Q931ie_UserUser) + x - 1);
Q931SetIE(*pIE, *OOff);
return Q931E_NO_ERROR;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论