mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-28 23:15:59 +00:00
process stack command even if gatekeeper client isn't register
don't destroy gatekeeper client if it is not started don't destroy gatekeeper client in some sort of gatekeeper errors signal rtp create condition when call cleared before rtp structure created (closes issue ASTERISK-23460) Reported by: Dmitry Melekhov Patches: ASTERISK-23460-2.patch Tested by: Dmitry Melekhov ........ Merged revisions 411531 from http://svn.asterisk.org/svn/asterisk/branches/11 ........ Merged revisions 411532 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411533 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -210,7 +210,7 @@ int ooGkClientStart(ooGkClient *pGkClient)
|
||||
if(iRet != OO_OK)
|
||||
{
|
||||
OOTRACEERR1("Error:Failed to send GRQ message\n");
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
ast_mutex_unlock(&pGkClient->Lock);
|
||||
return OO_FAILED;
|
||||
}
|
||||
@@ -433,7 +433,7 @@ int ooGkClientReceive(ooGkClient *pGkClient)
|
||||
if(iRet != OO_OK)
|
||||
{
|
||||
OOTRACEERR1("Error: Failed to handle received RAS message\n");
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
}
|
||||
memReset(pctxt);
|
||||
}
|
||||
@@ -702,7 +702,7 @@ int ooGkClientSendGRQ(ooGkClient *pGkClient)
|
||||
{
|
||||
OOTRACEERR1("Error: Failed to send GRQ message\n");
|
||||
memReset(&pGkClient->msgCtxt);
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
ast_mutex_unlock(&pGkClient->Lock);
|
||||
return OO_FAILED;
|
||||
}
|
||||
@@ -1530,7 +1530,7 @@ int ooGkClientSendURQ(ooGkClient *pGkClient, ooAliases *aliases)
|
||||
{
|
||||
OOTRACEERR1("Error:Failed to send UnregistrationRequest message\n");
|
||||
memReset(pctxt);
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
ast_mutex_unlock(&pGkClient->Lock);
|
||||
return OO_FAILED;
|
||||
}
|
||||
@@ -1909,7 +1909,7 @@ int ooGkClientSendAdmissionRequest
|
||||
{
|
||||
OOTRACEERR1("Error:Failed to send AdmissionRequest message\n");
|
||||
memReset(pctxt);
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
ast_mutex_unlock(&pGkClient->Lock);
|
||||
return OO_FAILED;
|
||||
}
|
||||
@@ -2423,7 +2423,7 @@ int ooGkClientSendIRR
|
||||
{
|
||||
OOTRACEERR1("Error:Failed to send IRR message\n");
|
||||
memReset(pctxt);
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
ast_mutex_unlock(&pGkClient->Lock);
|
||||
return OO_FAILED;
|
||||
}
|
||||
@@ -2576,7 +2576,7 @@ int ooGkClientSendDisengageRequest(ooGkClient *pGkClient, OOH323CallData *call)
|
||||
if(iRet != OO_OK)
|
||||
{
|
||||
OOTRACEERR1("Error: Failed to send DRQ message\n");
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
}
|
||||
|
||||
|
||||
@@ -2736,7 +2736,7 @@ int ooGkClientREGTimerExpired(void *pdata)
|
||||
if(ret != OO_OK)
|
||||
{
|
||||
OOTRACEERR1("Error:Failed to send Additive RRQ message\n");
|
||||
pGkClient->state = GkClientFailed;
|
||||
pGkClient->state = GkClientGkErr;
|
||||
return OO_FAILED;
|
||||
}
|
||||
return OO_OK;
|
||||
|
||||
Reference in New Issue
Block a user