diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-22 18:06:35 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-22 18:06:35 +0000 |
| commit | 4b004c6df5c04870b17bcf60649fb8e57be7211a (patch) | |
| tree | 4084785b51245c6b7d932a59d270431c087b929d /channels | |
| parent | 8d972bb58582cfd381596435dbb81ccc35d5b893 (diff) | |
Merged revisions 114538 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114538 | russell | 2008-04-22 13:04:39 -0500 (Tue, 22 Apr 2008) | 17 lines
Merged revisions 114537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114537 | russell | 2008-04-22 13:03:33 -0500 (Tue, 22 Apr 2008) | 9 lines
If the dial string passed to the call channel callback does not indicate an
extension, then consider the extension on the channel before falling back
to the default.
(closes issue #12479)
Reported by: darren1713
Patches:
exten_dial_fix_chan_iax2.c.patch uploaded by darren1713 (license 116)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@114539 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_iax2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 8fb6a0b67..4a71fc5a0 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -3388,8 +3388,12 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout) return -1; } - if (!pds.exten) - pds.exten = defaultrdest; + if (!pds.exten) { + if (!ast_strlen_zero(c->exten)) + pds.exten = c->exten; + else + pds.exten = defaultrdest; + } if (create_addr(pds.peer, c, &sin, &cai)) { ast_log(LOG_WARNING, "No address associated with '%s'\n", pds.peer); |