kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-15 08:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 339011 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r339011 | mnicholson | 2011-10-03 10:19:44 -0500 (Mon, 03 Oct 2011) | 2 lines
  
  properly remove the AST_FAX_TECH_GATEWAY flag (instead of setting all of the other flags)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@339021 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Nicholson
2011-10-03 15:21:50 +00:00
parent 7b26fde494
commit 9a5de09f92
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/res_fax.c
View File

@@ -2377,7 +2377,7 @@ static void destroy_gateway(void *data)
if (gateway->s) { if (gateway->s) {
fax_session_release(gateway->s, gateway->token); fax_session_release(gateway->s, gateway->token);
gateway->token = NULL; gateway->token = NULL;
gateway->s->details->caps |= ~AST_FAX_TECH_GATEWAY; gateway->s->details->caps &= ~AST_FAX_TECH_GATEWAY;
ao2_lock(faxregistry.container); ao2_lock(faxregistry.container);
ao2_unlink(faxregistry.container, gateway->s); ao2_unlink(faxregistry.container, gateway->s);
@@ -2421,7 +2421,7 @@ static struct fax_gateway *fax_gateway_new(struct ast_fax_session_details *detai
details->caps = AST_FAX_TECH_GATEWAY; details->caps = AST_FAX_TECH_GATEWAY;
if (details->gateway_timeout && !(gateway->s = fax_session_reserve(details, &gateway->token))) { if (details->gateway_timeout && !(gateway->s = fax_session_reserve(details, &gateway->token))) {
details->caps |= ~AST_FAX_TECH_GATEWAY; details->caps &= ~AST_FAX_TECH_GATEWAY;
ast_log(LOG_ERROR, "Can't reserve a FAX session, gateway attempt failed.\n"); ast_log(LOG_ERROR, "Can't reserve a FAX session, gateway attempt failed.\n");
ao2_ref(gateway, -1); ao2_ref(gateway, -1);
return NULL; return NULL;