mirror of
https://github.com/asterisk/asterisk.git
synced 2026-07-02 04:53:32 -07:00
Merged revisions 55717 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r55717 | file | 2007-02-20 18:57:03 -0500 (Tue, 20 Feb 2007) | 2 lines Return behavior I removed. I did not remember that you could just add a localnet entry to make it work. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
+4
-2
@@ -1925,14 +1925,16 @@ static void build_via(struct sip_pvt *p)
|
||||
*/
|
||||
static enum sip_result ast_sip_ouraddrfor(struct in_addr *them, struct in_addr *us)
|
||||
{
|
||||
struct sockaddr_in theirs;
|
||||
struct sockaddr_in theirs, ours;
|
||||
|
||||
/* Get our local information */
|
||||
ast_ouraddrfor(them, us);
|
||||
theirs.sin_addr = *them;
|
||||
ours.sin_addr = *us;
|
||||
|
||||
if (localaddr && externip.sin_addr.s_addr &&
|
||||
ast_apply_ha(localaddr, &theirs)) {
|
||||
(ast_apply_ha(localaddr, &theirs)) &&
|
||||
(!ast_apply_ha(localaddr, &ours))) {
|
||||
if (externexpire && time(NULL) >= externexpire) {
|
||||
struct ast_hostent ahp;
|
||||
struct hostent *hp;
|
||||
|
||||
Reference in New Issue
Block a user