kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

preserve original callerid functionality for 1.0 (bug #3490)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4994 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-02-09 22:53:30 +00:00
parent b2ab9ffaec
commit d35a82a5b6
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/app_dial.c
View File

@@ -281,9 +281,6 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
ast_hangup(o->chan); ast_hangup(o->chan);
o->chan = NULL; o->chan = NULL;
numnochan++; numnochan++;
} else {
/* After calling, set callerid to extension */
ast_set_callerid(o->chan, ast_strlen_zero(in->macroexten) ? in->exten : in->macroexten, 0);
} }
} }
/* Hangup the original channel now, in case we needed it */ /* Hangup the original channel now, in case we needed it */
@@ -849,11 +846,9 @@ static int dial_exec(struct ast_channel *chan, void *data)
free(tmp); free(tmp);
cur = rest; cur = rest;
continue; continue;
} else { } else
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst); ast_verbose(VERBOSE_PREFIX_3 "Called %s\n", numsubst);
ast_set_callerid(tmp->chan, ast_strlen_zero(chan->macroexten) ? chan->exten : chan->macroexten, 0);
}
/* Put them in the list of outgoing thingies... We're ready now. /* Put them in the list of outgoing thingies... We're ready now.
XXX If we're forcibly removed, these outgoing calls won't get XXX If we're forcibly removed, these outgoing calls won't get
hung up XXX */ hung up XXX */