diff options
| author | Matthew Nicholson <mnicholson@digium.com> | 2010-09-15 13:10:50 +0000 |
|---|---|---|
| committer | Matthew Nicholson <mnicholson@digium.com> | 2010-09-15 13:10:50 +0000 |
| commit | f9c7f53a1fe852a2d96d9fde752205b3c75e4c53 (patch) | |
| tree | 793523e640ab52d199924a74534a20987ebf8185 /channels/chan_sip.c | |
| parent | c994bfae3d58b5b3fc357987e835e42d82895694 (diff) | |
Merged revisions 286868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r286868 | mnicholson | 2010-09-15 08:05:52 -0500 (Wed, 15 Sep 2010) | 16 lines
Set tohost to the domain specified in the configuration file instead of the IP address of the host we are calling.
This fixes a regression introduced in r274783.
(closes issue #17960)
Reported by: adriavidal
Patches:
sip-tohost-fix1.diff uploaded by mnicholson (license 96)
Tested by: mich, mnicholson, adriavidal
(closes issue #17676)
Reported by: outcast
Patches:
sip-tohost-fix1.diff uploaded by mnicholson (license 96)
Tested by: mnicholson
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@286869 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 8acfcc5bb..1cf6fe795 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -26173,9 +26173,8 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str return NULL; } - ast_string_field_set(peer, tohost, peer->dnsmgr ? srvlookup : - ast_sockaddr_stringify_host(&peer->addr)); - + ast_string_field_set(peer, tohost, srvlookup); + if (global_dynamic_exclude_static) { int err = 0; sip_cfg.contact_ha = ast_append_ha("deny", ast_sockaddr_stringify_addr(&peer->addr), |