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

Fixed authentication bug. 

git-svn-id: http://voip.null.ro/svn/yate@1160 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2007-01-10 18:56:27 +00:00
parent 24949c1827
commit 98a64eb78c
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/yiax/transaction.cpp
View File

@ -954,7 +954,8 @@ IAXEvent* IAXTransaction::getEventResponse_New(IAXFrameOut* frame, bool& delFram
if (!(frame->type() == IAXFrame::IAX && frame->subclass() == IAXControl::AuthReq))
break;
// Frame is AUTHREQ: AUTHREP, REJECT, HANGUP ?
if (0 != (ev = createResponse(frame,IAXFrame::IAX,IAXControl::New,IAXEvent::AuthRep,false,NewRemoteInvite_RepRecv)))
if (0 != (ev = createResponse(frame,IAXFrame::IAX,IAXControl::AuthRep,
IAXEvent::AuthRep,false,NewRemoteInvite_RepRecv)))
return processAuthRep(ev);
if (0 != (ev = createResponse(frame,IAXFrame::IAX,IAXControl::Reject,IAXEvent::Reject,false,Terminating)))
return ev;

48
modules/yiaxchan.cpp
View File

@ -156,6 +156,13 @@ public:
*/
void regTerminate(IAXEvent* event);
/*
* Process an authentication request for a Register/Unregister operation
* This method is thread safe
* @param event The event (AuthReq)
*/
void regAuthReq(IAXEvent* event);
/*
* Timer notification
* This method is thread safe
@ -455,6 +462,7 @@ protected:
void startAudioIn();
void startAudioOut();
void evAuthRep(IAXEvent* event);
void evAuthReq(IAXEvent* event);
// Safe deref the connection if the reference counter was increased during registration
void safeDeref();
bool safeRefIncrease();
@ -610,6 +618,28 @@ void YIAXLineContainer::regTerminate(IAXEvent* event)
line->m_state = YIAXLine::Idle;
}
// Handle registration related authentication
void YIAXLineContainer::regAuthReq(IAXEvent* event)
{
Lock lock(this);
if (!event || event->type() != IAXEvent::AuthReq)
return;
IAXTransaction* trans = event->getTransaction();
if (!trans)
return;
YIAXLine* line = findLine(static_cast<YIAXLine*>(trans->getUserData()));
if (!line) {
Debug(&iplugin,DebugAll,"Lines: NO LINE");
return;
}
// Send auth reply
String response;
if (!iplugin.getEngine())
return;
iplugin.getEngine()->getMD5FromChallenge(response,trans->challenge(),line->password());
trans->sendAuthReply(response);
}
// Handle registration related events
void YIAXLineContainer::handleEvent(IAXEvent* event)
{
@ -619,6 +649,9 @@ void YIAXLineContainer::handleEvent(IAXEvent* event)
case IAXEvent::Timeout:
regTerminate(event);
break;
case IAXEvent::AuthReq:
regAuthReq(event);
break;
default:
iplugin.getEngine()->defaultEventHandler(event);
}
@ -1547,6 +1580,9 @@ void YIAXConnection::handleEvent(IAXEvent* event)
case IAXEvent::AuthRep:
evAuthRep(event);
break;
case IAXEvent::AuthReq:
evAuthReq(event);
break;
default:
iplugin.getEngine()->defaultEventHandler(event);
if (!m_transaction)
@ -1659,11 +1695,21 @@ void YIAXConnection::evAuthRep(IAXEvent* event)
route(true);
return;
}
const char* reason = invalidAuth ? IAXTransaction::s_iax_modInvalidAuth : "not authenticated";
const char* reason = IAXTransaction::s_iax_modInvalidAuth.c_str();
DDebug(this,DebugAll,"Not authenticated. Reason: '%s'. Reject.",reason);
hangup(event,reason,true);
}
void YIAXConnection::evAuthReq(IAXEvent* event)
{
DDebug(this,DebugAll,"YIAXConnection - AUTHREQ");
String response;
if (m_iaxEngine && m_transaction) {
m_iaxEngine->getMD5FromChallenge(response,m_transaction->challenge(),m_password);
m_transaction->sendAuthReply(response);
}
}
// Get rid of the extra reference
void YIAXConnection::safeDeref()
{