diff options
author | Alexandr Anikin <may@telecom-service.ru> | 2014-03-28 18:00:18 +0000 |
---|---|---|
committer | Alexandr Anikin <may@telecom-service.ru> | 2014-03-28 18:00:18 +0000 |
commit | a35ce3924b2d0eea8aba2b9f9b1c3195f8ff604b (patch) | |
tree | 518ed153320f94d7072864361b203867d6d2c2cb /addons/ooh323c/src/ooGkClient.c | |
parent | 597f25db69c71d342e8661983df47e457625b5e2 (diff) |
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
Diffstat (limited to 'addons/ooh323c/src/ooGkClient.c')
-rw-r--r-- | addons/ooh323c/src/ooGkClient.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/addons/ooh323c/src/ooGkClient.c b/addons/ooh323c/src/ooGkClient.c index af6a10bbd..c090796b6 100644 --- a/addons/ooh323c/src/ooGkClient.c +++ b/addons/ooh323c/src/ooGkClient.c @@ -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; |