-
- Downloads
res/res_pjsip: Standardize/fix localnet checks across pjsip.
In 2dee95cc (ASTERISK-27024) and 776ffd77 (ASTERISK-26879) there was confusion about whether the transport_state->localnet ACL has ALLOW or DENY semantics. For the record: the localnet has DENY semantics, meaning that "not in the list" means ALLOW, and the local nets are in the list. Therefore, checks like this look wrong, but are right: /* See if where we are sending this request is local or not, and if not that we can get a Contact URI to modify */ if (ast_apply_ha(transport_state->localnet, &addr) != AST_SENSE_ALLOW) { ast_debug(5, "Request is being sent to local address, " "skipping NAT manipulation\n"); (In the list == localnet == DENY == skip NAT manipulation.) And conversely, other checks that looked right, were wrong. This change adds two macro's to reduce the confusion and uses those instead: ast_sip_transport_is_nonlocal(transport_state, addr) ast_sip_transport_is_local(transport_state, addr) ASTERISK-27248 #close Change-Id: Ie7767519eb5a822c4848e531a53c0fd054fae934
Showing
- include/asterisk/res_pjsip.h 10 additions, 1 deletioninclude/asterisk/res_pjsip.h
- main/acl.c 2 additions, 2 deletionsmain/acl.c
- res/res_pjsip/config_transport.c 3 additions, 1 deletionres/res_pjsip/config_transport.c
- res/res_pjsip_nat.c 1 addition, 1 deletionres/res_pjsip_nat.c
- res/res_pjsip_sdp_rtp.c 1 addition, 2 deletionsres/res_pjsip_sdp_rtp.c
- res/res_pjsip_session.c 1 addition, 2 deletionsres/res_pjsip_session.c
- res/res_pjsip_t38.c 1 addition, 2 deletionsres/res_pjsip_t38.c
Loading
Please register or sign in to comment