diff options
-rw-r--r-- | channels/chan_sip.c | 4 | ||||
-rw-r--r-- | configs/sip.conf.sample | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index be42558fc..d2af27c66 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -3974,7 +3974,7 @@ static int copy_via_headers(struct sip_pvt *p, struct sip_request *req, struct s if (rport && *(rport+6) == '=') rport = NULL; /* We already have a parameter to rport */ - if (rport && (ast_test_flag(p, SIP_NAT) == SIP_NAT_ALWAYS)) { + if (rport && ((ast_test_flag(p, SIP_NAT) == SIP_NAT_ALWAYS) || (ast_test_flag(p, SIP_NAT) == SIP_NAT_RFC3581))) { /* We need to add received port - rport */ ast_copy_string(tmp, oh, sizeof(tmp)); @@ -6653,8 +6653,10 @@ static int register_verify(struct sip_pvt *p, struct sockaddr_in *sin, struct si build_contact(p); peer = find_peer(name, NULL, 1); if (!(peer && ast_apply_ha(peer->ha, sin))) { + /* Peer fails ACL check */ if (peer) ASTOBJ_UNREF(peer,sip_destroy_peer); + peer = NULL; } if (peer) { if (!ast_test_flag(&peer->flags_page2, SIP_PAGE2_DYNAMIC)) { diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 889d959ea..f080e149b 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -187,7 +187,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; ;nat=no ; Global NAT settings (Affects all peers and users) ; yes = Always ignore info and assume NAT - ; no = Use NAT mode only according to RFC3581 + ; no = Use NAT mode only according to RFC3581 (;rport) ; never = Never attempt NAT mode or RFC3581 support ; route = Assume NAT, don't send rport ; (work around more UNIDEN bugs) |