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

Fixed compilation on gcc-3, ia32 

git-svn-id: http://yate.null.ro/svn/yate/trunk@872 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2006-06-18 13:39:51 +00:00
parent 7a4800fc50
commit c79047f92b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/yiax/frame.cpp
View File

@ -411,7 +411,7 @@ ObjList* IAXFrame::getIEList(const IAXFullFrame* frame, bool& invalid)
return 0;
}
for (i = 1; i < len;) {
if (i + data[i] >= len) {
if (i + (unsigned int)data[i] >= len) {
i = 0xFFFF;
break;
}

6
contrib/yiax/transaction.cpp
View File

@ -699,11 +699,12 @@ IAXEvent* IAXTransaction::getEventResponse(IAXFrameOut* frame, bool& delFrame)
IAXEvent* IAXTransaction::getEventStartTrans(IAXFullFrame* frame, bool& delFrame)
{
delFrame = true;
IAXEvent* ev = 0;
switch (type()) {
case New:
if (!(frame->type() == IAXFrame::IAX && frame->subclass() == IAXControl::New))
break;
IAXEvent* ev = createEvent(IAXEvent::NewCall,frame,NewRecv);
ev = createEvent(IAXEvent::NewCall,frame,NewRecv);
if (ev) {
IAXInfoElement* ie = ev->getIE(IAXInfoElement::VERSION);
if (!ie || (static_cast<IAXInfoElementNumeric*>(ie))->data() > IAX_PROTOCOL_VERSION) {
@ -958,7 +959,8 @@ IAXEvent* IAXTransaction::remoteRejectCall(const IAXFullFrame* frame, bool& delF
IAXEvent* IAXTransaction::getEventTerminating(u_int64_t time)
{
if (time > m_timeout) {
Debug(m_engine,DebugAll,"Transaction(%u,%u) - Timeout on remote request. Timestamp: %lu",localCallNo(),remoteCallNo(),timeStamp());
Debug(m_engine,DebugAll,"Transaction(%u,%u) - Timeout on remote request. Timestamp: " FMT64U,
localCallNo(),remoteCallNo(),timeStamp());
return terminate(IAXEvent::Timeout);
}
return 0;