Merged revisions 323371 via svnmerge from
authorJonathan Rose <jrose@digium.com>
Tue, 14 Jun 2011 16:47:18 +0000 (16:47 +0000)
committerJonathan Rose <jrose@digium.com>
Tue, 14 Jun 2011 16:47:18 +0000 (16:47 +0000)
commit00181729b4c4a62e6baccf3b91b452d61af116b2
tree912900e078375d044f50850e38dc7f5e551a872e
parent379370a396335a11f26f42b13bcacc62e868a7e0
Merged revisions 323371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323371 | jrose | 2011-06-14 11:38:43 -0500 (Tue, 14 Jun 2011) | 12 lines

  Changes contact use in build_peer to use the FORCE_RPORT flag instead of RPORT_PRESENT

  It turned out that this was causing NAT=Yes to always use rport when present which was
  against 1.6.2 behavior and the check itself was redundant since the only way this
  segment of code could be reached was if RPORT_PRESENT was already evaluated as true
  earlier.

  (closes issue ASTERISK-17789)
  Reported by: byronclark
  Patches:
        use_sip_nat_force_rport.patch uploaded by byronclark (license 1200)
........

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