kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

corrections in gk interface, small fixes in call clearing.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@255199 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Alexandr Anikin
2010-03-27 23:51:13 +00:00
parent b8aeb50b7b
commit 89e4c15783
6 changed files with 83 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
addons/chan_ooh323.c
View File

@@ -609,6 +609,10 @@ static struct ast_channel *ooh323_request(const char *type, format_t format,
if (dest) {
peer = find_peer(dest, port);
} else{
ast_mutex_lock(&iflock);
ast_mutex_unlock(&p->lock);
ooh323_destroy(p);
ast_mutex_unlock(&iflock);
ast_log(LOG_ERROR, "Destination format is not supported\n");
return NULL;
}
@@ -642,6 +646,15 @@ static struct ast_channel *ooh323_request(const char *type, format_t format,
ast_copy_string(p->accountcode, peer->accountcode, sizeof(p->accountcode));
p->amaflags = peer->amaflags;
} else {
if (gRasGkMode == RasNoGatekeeper) {
/* no gk and no peer */
ast_log(LOG_ERROR, "Call to undefined peer %s", dest);
ast_mutex_lock(&iflock);
ast_mutex_unlock(&p->lock);
ooh323_destroy(p);
ast_mutex_unlock(&iflock);
return NULL;
}
p->dtmfmode = gDTMFMode;
p->dtmfcodec = gDTMFCodec;
p->t38support = gT38Support;
@@ -672,23 +685,22 @@ static struct ast_channel *ooh323_request(const char *type, format_t format,
ast_mutex_lock(&iflock);
ooh323_destroy(p);
ast_mutex_unlock(&iflock);
} else {
ast_mutex_lock(&p->lock);
p->callToken = (char*)ast_malloc(AST_MAX_EXTENSION);
if(!p->callToken)
{
ast_mutex_unlock(&p->lock);
ast_mutex_lock(&iflock);
ooh323_destroy(p);
ast_mutex_unlock(&iflock);
ast_log(LOG_ERROR, "Failed to allocate memory for callToken\n");
return NULL;
}
} else {
ast_mutex_lock(&p->lock);
p->callToken = (char*)ast_malloc(AST_MAX_EXTENSION);
if(!p->callToken) {
ast_mutex_unlock(&p->lock);
ast_mutex_lock(&iflock);
ooh323_destroy(p);
ast_mutex_unlock(&iflock);
ast_log(LOG_ERROR, "Failed to allocate memory for callToken\n");
return NULL;
}
ast_mutex_unlock(&p->lock);
ast_mutex_lock(&ooh323c_cmd_lock);
ooMakeCall(data, p->callToken, AST_MAX_EXTENSION, NULL);
ast_mutex_unlock(&ooh323c_cmd_lock);
ast_mutex_unlock(&p->lock);
ast_mutex_lock(&ooh323c_cmd_lock);
ooMakeCall(data, p->callToken, AST_MAX_EXTENSION, NULL);
ast_mutex_unlock(&ooh323c_cmd_lock);
}
restart_monitor();
@@ -955,17 +967,17 @@ static int ooh323_call(struct ast_channel *ast, char *dest, int timeout)
else
ast_copy_string(destination, dest, sizeof(destination));
destination[sizeof(destination)-1]='\0';
destination[sizeof(destination)-1]='\0';
opts.transfercap = ast->transfercapability;
opts.transfercap = ast->transfercapability;
for (i=0;i<480 && !isRunning(p->callToken);i++) usleep(12000);
for (i=0;i<480 && !isRunning(p->callToken);i++) usleep(12000);
if(OO_TESTFLAG(p->flags, H323_DISABLEGK)) {
res = ooRunCall(destination, p->callToken, AST_MAX_EXTENSION, &opts);
} else {
res = ooRunCall(destination, p->callToken, AST_MAX_EXTENSION, NULL);
}
if(OO_TESTFLAG(p->flags, H323_DISABLEGK)) {
res = ooRunCall(destination, p->callToken, AST_MAX_EXTENSION, &opts);
} else {
res = ooRunCall(destination, p->callToken, AST_MAX_EXTENSION, NULL);
}
ast_mutex_unlock(&p->lock);
if (res != OO_OK) {