[sr-dev] git:5.3:657ac663: nathelper: new parameter nat_addr_mode

Module: kamailio Branch: 5.3 Commit: 657ac663b973ef769dea21f9983ff0e2cf8e2444 URL: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Henning Westerholt &lt;hw(a)skalatan.de&gt; Date: 2020-04-24T12:29:00Z nathelper: new parameter nat_addr_mode - if set to 0, default private net addresses are checked by nat_uac_test() - if set to 1, other reserved net addresses are checked by nat_uac_test() - default 1 (reserved addresses are considered not routable) - related at GH #2277 (cherry picked from commit a10e7652f24bc7ed8e74ff27d16da5d77689b6ac) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… Patch: https://github.com/kamailio/kamailio/commit/657ac663b973ef769dea21f9983ff0e… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index e77c9470a8..7d326508c8 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -138,13 +138,16 @@ static int cblen = 0; static int natping_interval = 0; struct socket_info *force_socket = 0; +static int nh_nat_addr_mode = 1; /* clang-format off */ -static struct { +typedef struct nh_netaddr { const char *cnetaddr; uint32_t netaddr; uint32_t mask; -} nets_1918[] = { +} nh_netaddr_t; + +static nh_netaddr_t nh_nets_1918[] = { {"10.0.0.0", 0, 0xffffffffu << 24}, {"172.16.0.0", 0, 0xffffffffu << 20}, {"192.168.0.0", 0, 0xffffffffu << 16}, @@ -152,6 +155,11 @@ static struct { {"192.0.0.0", 0, 0xffffffffu << 3}, /* rfc7335 - IPv4 Service Continuity Prefix */ {NULL, 0, 0} }; + +static nh_netaddr_t nh_nets_extra[] = { + {"192.0.0.0", 0, 0xffffffffu << 8}, /* rfc7335 - IETF Protocol Assignments */ + {NULL, 0, 0} +}; /* clang-format on */ /* @@ -250,6 +258,7 @@ static param_export_t params[] = { {"udpping_from_path", INT_PARAM, &udpping_from_path }, {"append_sdp_oldmediaip", INT_PARAM, &sdp_oldmediaip }, {"filter_server_id", INT_PARAM, &nh_filter_srvid }, + {"nat_addr_mode", INT_PARAM, &nh_nat_addr_mode }, {0, 0, 0} }; @@ -528,10 +537,17 @@ static int mod_init(void) } /* Prepare 1918 networks list */ - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if(inet_aton(nets_1918[i].cnetaddr, &addr) != 1) + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_1918[i].cnetaddr, &addr) != 1) abort(); - nets_1918[i].netaddr = ntohl(addr.s_addr) & nets_1918[i].mask; + nh_nets_1918[i].netaddr = ntohl(addr.s_addr) & nh_nets_1918[i].mask; + } + + /* Prepare reserved/extra networks list */ + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if(inet_aton(nh_nets_extra[i].cnetaddr, &addr) != 1) + abort(); + nh_nets_extra[i].netaddr = ntohl(addr.s_addr) & nh_nets_extra[i].mask; } register_select_table(sel_declaration); @@ -1260,11 +1276,18 @@ static inline int is1918addr_n(uint32_t netaddr) uint32_t hl; hl = ntohl(netaddr); - for(i = 0; nets_1918[i].cnetaddr != NULL; i++) { - if((hl & nets_1918[i].mask) == nets_1918[i].netaddr) { + for(i = 0; nh_nets_1918[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_1918[i].mask) == nh_nets_1918[i].netaddr) { return 1; } } + if(nh_nat_addr_mode==1) { + for(i = 0; nh_nets_extra[i].cnetaddr != NULL; i++) { + if((hl & nh_nets_extra[i].mask) == nh_nets_extra[i].netaddr) { + return 1; + } + } + } return 0; }