]> git.ipfire.org Git - thirdparty/asterisk.git/commit
chan_sip: Don't use port derived from fromdomain if it isn't set
authorMatthew Jordan <mjordan@digium.com>
Thu, 21 Aug 2014 17:33:56 +0000 (17:33 +0000)
committerMatthew Jordan <mjordan@digium.com>
Thu, 21 Aug 2014 17:33:56 +0000 (17:33 +0000)
commit648c74def025d40c8a536068d3f0c7930aca6fc4
treec7e7794e4e27391d84094ded2f0c7454269b9f59
parentd58c976e8f5417757753ec938134d061f2ed5ab7
chan_sip: Don't use port derived from fromdomain if it isn't set

If a user does not provide a port in the fromdomain setting, chan_sip will set
the fromdomainport to STANDARD_SIP_PORT (5060). The fromdomainport value will
then get used unilaterally in certain places. This causes issues with TLS,
where the default port is expected to be 5061.

This patch modifies chan_sip such that fromdomainport is only used if it is
not the standard SIP port; otherwise, the port from the SIP pvt's recorded
self IP address is used.

Review: https://reviewboard.asterisk.org/r/3893/

ASTERISK-24178 #close
Reported by: Elazar Broad
patches:
  fromdomainport_fix.diff uploaded by Elazar Broad (License 5835)
........

Merged revisions 421717 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 421718 from http://svn.asterisk.org/svn/asterisk/branches/11

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@421719 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c