[sr-dev] git:master:e82819e6: lcr: improve binary search to support a match including src port

Module: kamailio Branch: master Commit: e82819e6613dd64ca5c887759eab18cd38d20373 URL: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Author: Donat Zenichev &lt;dzenichev(a)sipwise.com&gt; Committer: Henning Westerholt &lt;hw(a)skalatan.de&gt; Date: 2021-09-20T20:09:58+02:00 lcr: improve binary search to support a match including src port Improve binary search in the lcr module and add a possibility to do a matching not only based on an IP address of a GW, but also using a source port. When a possibility to use 'src_port' parameter in from_gw() and from_any_gw() was introduced here: 14e6fc80b3d2389567c73c4a2196bf8e6d92d8d2 the bsearch() remained untouched, and hence the matching (iteration through existing GWs) is now done only based on an IP address. This leads to the issue, when there are more than one GW with the same IP address in gws table, and from_gw() and from_any_gw() functions are used with the 'src_port' parameter, it can happen that a wrong GW is picked out by bsearch() from gws table (lcr_gw) and a check by from_gw() and from_any_gw() returns False. Hence the matching based on IP address and source port is required for bsearch(), when from_gw() and from_any_gw() functions are used with the 'src_port' parameter. This means backwards compatibility is still present (when one uses functions without 'src_port'). --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… Patch: https://github.com/kamailio/kamailio/commit/e82819e6613dd64ca5c887759eab18c… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 21f05a4730..8c5b05d1df 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -921,6 +921,30 @@ static int comp_gws(const void *_g1, const void *_g2) return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); } +/* + * Compare gateways based on their IP address and port + */ +static int comp_gws_include_port(const void *_g1, const void *_g2) +{ + struct gw_info *g1 = (struct gw_info *)_g1; + struct gw_info *g2 = (struct gw_info *)_g2; + + /* first address family comparison */ + if(g1->ip_addr.af < g2->ip_addr.af) + return -1; + if(g1->ip_addr.af > g2->ip_addr.af) + return 1; + if(g1->ip_addr.len < g2->ip_addr.len) + return -1; + if(g1->ip_addr.len > g2->ip_addr.len) + return 1; + + /* secondly ports comparison */ + if(g1->port != g2->port) + return -1; + + return memcmp(g1->ip_addr.u.addr, g2->ip_addr.u.addr, g1->ip_addr.len); +} /* * Insert gw info into index i or gws table @@ -2997,10 +3021,17 @@ static int do_from_gw(struct sip_msg *_m, unsigned int lcr_id, return -1; } - /* Search for gw ip address */ gw.ip_addr = *src_addr; - res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], - sizeof(struct gw_info), comp_gws); + if (src_port != 0) { + /* Search for gw based on its ip address and port */ + gw.port = src_port; + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws_include_port); + } else { + /* Search for gw based on its ip address */ + res = (struct gw_info *)bsearch(&gw, &(gws[1]), gws[0].ip_addr.u.addr32[0], + sizeof(struct gw_info), comp_gws); + } /* Store tag and flags and return result */ if((res != NULL)