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: http://svn.digium.com/svn/asterisk/trunk@55718 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
80dab82fca
commit
fff5f64a98
|
@ -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)
|
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 */
|
/* Get our local information */
|
||||||
ast_ouraddrfor(them, us);
|
ast_ouraddrfor(them, us);
|
||||||
theirs.sin_addr = *them;
|
theirs.sin_addr = *them;
|
||||||
|
ours.sin_addr = *us;
|
||||||
|
|
||||||
if (localaddr && externip.sin_addr.s_addr &&
|
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) {
|
if (externexpire && time(NULL) >= externexpire) {
|
||||||
struct ast_hostent ahp;
|
struct ast_hostent ahp;
|
||||||
struct hostent *hp;
|
struct hostent *hp;
|
||||||
|
|
Reference in New Issue