retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Bug Fixed! Modified the pointers to mandatory variable and optional parameters from LUDT messages to be on 2 bytes instead of one. 

git-svn-id: http://voip.null.ro/svn/yate@4810 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
andrei 2012-01-19 13:37:20 +00:00
parent 59cfa3fbca
commit ffd3c51db4
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libs/ysig/sccp.cpp
View File

@ -926,7 +926,7 @@ static unsigned char encodeImportance(const SS7SCCP* sccp, SS7MSU& msu,
return data[0];
}
static unsigned char encodeData(const SS7SCCP* sccp, SS7MSU& msu, SS7MsgSCCP* msg)
static unsigned int encodeData(const SS7SCCP* sccp, SS7MSU& msu, SS7MsgSCCP* msg)
{
if (!msg) {
DDebug(sccp,DebugNote,"Request to encode data for a null message");
@ -3304,6 +3304,8 @@ SS7MSU* SS7SCCP::buildMSU(SS7MsgSCCP* msg, const SS7Label& label) const
}
len += param->size;
}
bool ludt = msg->type() == SS7MsgSCCP::LUDT;
int pointerLen = ludt ? 2 : 1;
// initialize the pointer array offset just past the mandatory fixed part
unsigned int ptr = label.length() + 1 + len;
// then add one pointer octet to each mandatory variable parameter
@ -3316,11 +3318,11 @@ SS7MSU* SS7SCCP::buildMSU(SS7MsgSCCP* msg, const SS7Label& label) const
}
if (param->size)
Debug(this,DebugMild,"Invalid (fixed) description of variable SCCP parameter 0x%02x [%p]",ptype,this);
len++;
len += pointerLen;
}
// finally add a pointer to the optional part only if supported by type
if (msgParams->optional)
len++;
len += pointerLen;
SS7MSU* msu = new SS7MSU(sio(),label,0,len);
unsigned char* d = msu->getData(label.length()+1,len);
*d++ = msg->type();
@ -3343,7 +3345,7 @@ SS7MSU* SS7SCCP::buildMSU(SS7MsgSCCP* msg, const SS7Label& label) const
d += param->size;
}
// now populate with mandatory variable parameters
for (; (ptype = *plist++) != SS7MsgSCCP::EndOfParameters; ptr++) {
for (; (ptype = *plist++) != SS7MsgSCCP::EndOfParameters; ptr += pointerLen) {
const SCCPParam* param = getParamDesc(ptype);
if (!param) {
Debug(this,DebugFail,"Stage 2: no description of variable SCCP parameter 0x%02x [%p]",ptype,this);
@ -3355,7 +3357,7 @@ SS7MSU* SS7SCCP::buildMSU(SS7MsgSCCP* msg, const SS7Label& label) const
}
// remember the offset this parameter will actually get stored
len = msu->length();
unsigned char size = 0;
unsigned int size = 0;
if (ptype == SS7MsgSCCP::Data || ptype == SS7MsgSCCP::LongData)
size = encodeData(this,*msu,msg);
else
@ -3371,7 +3373,14 @@ SS7MSU* SS7SCCP::buildMSU(SS7MsgSCCP* msg, const SS7Label& label) const
continue;
}
// store pointer to parameter
d[ptr] = len - ptr;
unsigned int storedLength = len - ptr;
if (!ludt) {
d[ptr] = storedLength;
continue;
}
storedLength --;
d[ptr] = storedLength & 0xff;
d[ptr+1] = storedLength >> 8;
}
if (msgParams->optional) {
// remember the offset past last mandatory == first optional parameter
@ -3405,7 +3414,13 @@ SS7MSU* SS7SCCP::buildMSU(SS7MsgSCCP* msg, const SS7Label& label) const
continue;
if (len) {
d = msu->getData(0,len+1);
d[ptr] = len - ptr;
unsigned int storedLength = len - ptr;
if (ludt) {
storedLength --;
d[ptr] = storedLength & 0xff;
d[ptr+1] = storedLength >> 8;
} else
d[ptr] = storedLength;
len = 0;
}
}
@ -3888,6 +3903,7 @@ bool SS7SCCP::decodeMessage(SS7MsgSCCP* msg, SS7PointCode::Type pcType,
paramLen -= param->size;
} // while ((ptype = *plist++)...
bool mustWarn = true;
bool ludt = msg->type() == SS7MsgSCCP::LUDT;
// next decode any mandatory variable parameters the message should have
while ((ptype = *plist++) != SS7MsgSCCP::EndOfParameters) {
mustWarn = false;
@ -3906,6 +3922,11 @@ bool SS7SCCP::decodeMessage(SS7MsgSCCP* msg, SS7PointCode::Type pcType,
return false;
}
unsigned int offs = paramPtr[0];
if (ludt) {
offs |= (paramPtr[1] << 8);
paramPtr++;
paramLen--;
}
if ((offs < 1) || (offs >= paramLen)) {
Debug(this,DebugWarn,"Invalid offset %u (len=%u) SCCP parameter %s [%p]",
offs,paramLen,param->name,this);
@ -3941,7 +3962,15 @@ bool SS7SCCP::decodeMessage(SS7MsgSCCP* msg, SS7PointCode::Type pcType,
} // while ((ptype = *plist++)...
// now decode the optional parameters if the message supports them
if (params->optional) {
unsigned int offs = paramLen ? paramPtr[0] : 0;
unsigned int offs = 0;
if (paramLen) {
if (ludt && paramLen > 1) {
offs = paramPtr[0] | (paramPtr[1] << 8);
paramPtr++;
paramLen--;
} else if (!ludt)
offs = paramPtr[0];
}
if (offs >= paramLen) {
if (paramLen) {
Debug(this,DebugWarn,"Invalid SCCP optional offset %u (len=%u) [%p]",