sr-dev January 2022

sr-dev@lists.kamailio.org

13 participants
260 discussions

[kamailio/kamailio] core: Add virtual flag to listen config to ignore inactive ip addresses (PR #2985)

by rhys-hanrahan

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2984 #### Description A new option to "listen" has been added called "virtual". This sets a flag on the listening socket to modify the behaviour of grep_sock_info. When this flag is set, grep_sock_info will only consider the listening IP a match if the IP is found in the system's current list of local IP addresses. If the IP is not currently local, then the matching IP is ignored. If the virtual flag is not set on the socket then existing behaviour used instead. This feature is intended for scenarios where you have two Kamailio nodes in active/active setup, with virtual IPs, where you need to be able to listen on a virtual IP but it may not always be active locally. With this flag applied to a `listen=` socket, Kamailio will only consider traffic destined to this IP local, when the IP is actually active on the system, and other times the match is ignored. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2985 -- Commit Summary -- * core: listen can now have a "virtual" flag to check for nonlocal floating IPs. * etc: kamailio.cfg - added example use of listen's new virtual flag. * core: Added virtual flag to output of core.sockets_list * corex: Added virtual flag to output of "corex.list_sockets" * ims_ipsec_pcscf: Added virtual flag to output of sockets list. -- File Changes -- M etc/kamailio.cfg (2) M src/core/cfg.lex (2) M src/core/cfg.y (83) M src/core/core_cmd.c (10) M src/core/ip_addr.h (1) M src/core/socket_info.c (85) M src/modules/corex/corex_rpc.c (5) M src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2985.patch https://github.com/kamailio/kamailio/pull/2985.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2985 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2985(a)github.com>

2 years, 3 months

git:master:3e7d5ed3: core: Updated check_local_addresses to use getifaddrs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3e7d5ed34033067377ed9034e4ec49be444ca6fe URL: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: Updated check_local_addresses to use getifaddrs Changed virtual socket code to use getifaddrs instead of gethostbyname as this avoids lookups against the hosts file, which causes incorrect results. --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… Patch: https://github.com/kamailio/kamailio/commit/3e7d5ed34033067377ed9034e4ec49b… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 8ee6cd0b32..afb1dd5603 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -575,8 +575,8 @@ struct socket_info** get_sock_info_list(unsigned short proto) */ static int check_local_addresses(struct socket_info* si) { - struct hostent* he; - struct utsname myname; + int match = 0; + struct ifaddrs *ifap, *ifa; if (si == NULL) { LM_ERR("Socket info is NULL. Returning no match.\n"); @@ -589,40 +589,41 @@ static int check_local_addresses(struct socket_info* si) return 1; } - if (uname(&myname) <0){ - LM_ERR("Cannot determine hostname. Guessing a not local virtual IP.\n"); + if (getifaddrs(&ifap) != 0) { + LM_ERR("getifaddrs failed. Assuming no match.\n"); return 0; } - - //Should return a list of local IPs - he = _resolvehost(myname.nodename); - if (he == NULL) { - LM_ERR("Cannot get list of local IPs. Guessing not a local virtual IP.\n"); - return 0; - } - char** paddrlist = he->h_addr_list; - int i = 0; - while (*paddrlist != NULL) + + for (ifa = ifap; ifa; ifa = ifa->ifa_next) { + /* skip if no IP addr associated with the interface */ + if (ifa->ifa_addr==0) + continue; +#ifdef AF_PACKET + /* skip AF_PACKET addr family since it is of no use later on */ + if (ifa->ifa_addr->sa_family == AF_PACKET) + continue; +#endif struct ip_addr local_addr; - hostent2ip_addr(&local_addr, he, i); + sockaddr2ip_addr(&local_addr, (struct sockaddr*)ifa->ifa_addr); LM_DBG("Checking local address: %s\n", ip_addr2a(&local_addr)); if (ip_addr_cmp(&si->address, &local_addr)) { - LM_DBG("Found matching local IP for virtual socket: %s\n", ip_addr2a(&local_addr)); - return 1; + match = 1; + LM_DBG("Found matching local IP %s for virtual socket %s\n", ip_addr2a(&local_addr), si->name.s); + break; } - - i++; - paddrlist++; } - + freeifaddrs(ifap); //Default to not local if no match is found - LM_DBG("No matching local IP found.\n"); - return 0; + if (!match) { + LM_DBG("No matching local IP found for socket %s.\n", si->name.s); + return 0; + } else { + return 1; + } } - /* helper function for grep_sock_info * params: * host - hostname to compare with

2 years, 3 months

git:master:3cf03329: ims_ipsec_pcscf: Added virtual flag to output of sockets list.

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3cf033295f2ec78aeddf53b130ae9eab8f6d60f8 URL: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 ims_ipsec_pcscf: Added virtual flag to output of sockets list. --- Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… Patch: https://github.com/kamailio/kamailio/commit/3cf033295f2ec78aeddf53b130ae9ea… --- diff --git a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c index dbcf64b924..b2a19f332e 100644 --- a/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c +++ b/src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c @@ -140,9 +140,9 @@ static void ipsec_print_all_socket_lists() } if(si->port_no_str.s){ - sprintf(buf + cnt, "):%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, "):%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); }else{ - sprintf(buf + cnt, "):%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, "):%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); } cnt = strlen(buf); }else{ @@ -157,9 +157,9 @@ static void ipsec_print_all_socket_lists() } if(si->port_no_str.s){ - sprintf(buf + cnt, ":%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, ":%s%s%s%s", si->port_no_str.s, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); }else{ - sprintf(buf + cnt, ":%u%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED? " mhomed" : ""); + sprintf(buf + cnt, ":%u%s%s%s", si->port_no, si->flags & SI_IS_MCAST ? " mcast" : "", si->flags & SI_IS_MHOMED ? " mhomed" : "", si->flags & SI_IS_VIRTUAL ? " virtual" : ""); } cnt = strlen(buf);

2 years, 3 months

git:master:04aa88c5: corex: Added virtual flag to output of "corex.list_sockets"

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 04aa88c524ba6a61e59d9be6a344dce79c3aa178 URL: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 corex: Added virtual flag to output of "corex.list_sockets" --- Modified: src/modules/corex/corex_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… Patch: https://github.com/kamailio/kamailio/commit/04aa88c524ba6a61e59d9be6a344dce… --- diff --git a/src/modules/corex/corex_rpc.c b/src/modules/corex/corex_rpc.c index 8677c35d22..12fd8044af 100644 --- a/src/modules/corex/corex_rpc.c +++ b/src/modules/corex/corex_rpc.c @@ -95,10 +95,11 @@ static void corex_rpc_list_sockets(rpc_t* rpc, void* ctx) } } - if(rpc->struct_add(th, "sssss", + if(rpc->struct_add(th, "ssssss", "PORT", si->port_no_str.s, "MCAST", si->flags & SI_IS_MCAST ? "yes" : "no", - "MHOMED", si->flags & SI_IS_MHOMED? "yes" : "no", + "MHOMED", si->flags & SI_IS_MHOMED ? "yes" : "no", + "VIRTUAL", si->flags & SI_IS_VIRTUAL ? "yes" : "no", "SOCKNAME", si->sockname.s? si->sockname.s : "-", "ADVERTISE", si->useinfo.name.s?si->useinfo.name.s:"-")<0) {

2 years, 3 months

git:master:92c44f1b: core: Added virtual flag to output of core.sockets_list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92c44f1b3196f125b3e298499ed65df12cdd1a5a URL: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: Added virtual flag to output of core.sockets_list --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… Patch: https://github.com/kamailio/kamailio/commit/92c44f1b3196f125b3e298499ed65df… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index ba17c06e47..8231e3b1b9 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -955,10 +955,11 @@ static void core_sockets_list(rpc_t* rpc, void* c) for (ai=si->addr_info_lst; ai; ai=ai->next) rpc->struct_add(ha, "ss", "address", ai->address_str.s); - rpc->struct_add(ha, "sss", + rpc->struct_add(ha, "ssss", "port", si->port_no_str.s, "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", - "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no"); } else { printf(" %s: %s", get_proto_name(proto), @@ -969,10 +970,11 @@ static void core_sockets_list(rpc_t* rpc, void* c) if (!(si->flags & SI_IS_IP)) rpc->struct_add(ha, "s", "ipaddress", si->address_str.s); - rpc->struct_add(ha, "sss", + rpc->struct_add(ha, "ssss", "port", si->port_no_str.s, "mcast", si->flags & SI_IS_MCAST ? "yes" : "no", - "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no"); + "mhomed", si->flags & SI_IS_MHOMED ? "yes" : "no", + "virtual", si->flags & SI_IS_VIRTUAL ? "yes" : "no"); } } } while((proto=next_proto(proto)));

2 years, 3 months

git:master:e93640e6: core: listen can now have a "virtual" flag to check for nonlocal floating IPs.

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e93640e6119e61a24d8c1f6d36b60c83b3573f90 URL: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8… Author: Rhys Hanrahan <rhys(a)nexusone.com.au> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:27:25+01:00 core: listen can now have a "virtual" flag to check for nonlocal floating IPs. A new option to "listen" has been added called "virtual". This sets a flag on the listening socket to modify the behaviour of grep_sock_info. When this flag is set, grep_sock_info will only consider the listening IP a match if the IP is found in the system's current list of local IP addresses. If the IP is not currently local, then the matching IP is ignored. If the virtual flag is not set on the socket then existing behaviour used instead. This is useful in scenarios with an active/active cluster where Kamailio must know if a floating IP is currently local or not. --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/ip_addr.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8… Patch: https://github.com/kamailio/kamailio/commit/e93640e6119e61a24d8c1f6d36b60c8…

2 years, 3 months

[kamailio/kamailio] tcpclose event_routes issue (PR #2980)

by vlitvinov

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  We faced an issue that tcp:close (timeout and reset) event routes don't execute in rare cases. Debugging and testing show that in the case when a connection is marked as BAD or write timeout etc our event routes don't execute. I found that executing event routes is in the read function only. So in case when a connection is destroyed triggered by other reasons we don't have a notification about this. I propose to do this in main file every time when we destroy connections. But in this case, we don't have I reason to destroy (timeout reset or EOF). In our lab with these changes issue is gone. But sure this is just a concept. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2980 -- Commit Summary -- * tcpclose event_routes issue -- File Changes -- M src/core/tcp_main.c (26) M src/core/tcp_read.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2980.patch https://github.com/kamailio/kamailio/pull/2980.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2980 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/2980(a)github.com>

2 years, 3 months

git:master:60c5a873: tcpclose event_routes issue

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60c5a87379b30aa3f0eef569166abac703fab50a URL: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_conn.h Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac… Patch: https://github.com/kamailio/kamailio/commit/60c5a87379b30aa3f0eef569166abac…

2 years, 3 months

git:master:da0d4658: tcpclose event_routes issue

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: da0d4658985fe4b98a8247dc7a89dd48a6635e94 URL: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… Patch: https://github.com/kamailio/kamailio/commit/da0d4658985fe4b98a8247dc7a89dd4… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 458093b22d..f738325285 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -3649,7 +3649,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) /* if refcnt was 1 => it was used only in the tcp reader => it's not hashed or watched for IO anymore => no need to io_watch_del() */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_destroy(tcpconn); break; } @@ -3661,7 +3661,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) tcpconn->flags &= ~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } #ifdef TCP_ASYNC @@ -3713,7 +3713,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) io_watch_del(&io_h, tcpconn->s, -1, IO_FD_CLOSING); tcpconn->flags&=~F_CONN_WRITE_W; } - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } else if (unlikely(tcpconn->flags & F_CONN_WRITE_W)){ BUG("unhashed connection watched for write\n"); @@ -3750,7 +3750,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) tcpconn->flags&=~F_CONN_WRITE_W; } #endif /* TCP_ASYNC */ - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); } #ifdef TCP_ASYNC @@ -3782,7 +3782,7 @@ inline static int handle_tcp_child(struct tcp_child* tcp_c, int fd_i) #endif /* TCP_ASYNC */ if (tcpconn_try_unhash(tcpconn)) tcpconn_put(tcpconn); - tcp_emit_closed_event(c, TCP_CLOSED_EOF); + tcp_emit_closed_event(tcpconn, TCP_CLOSED_EOF); tcpconn_put_destroy(tcpconn); /* deref & delete if refcnt==0 */ break; default:

2 years, 3 months

git:master:635f3fb5: tcpclose event_routes issue

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 635f3fb5387713181a3492278bcf72d34738afd2 URL: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d… Author: Viktor <victor.litvinov(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-01-07T12:23:41+01:00 tcpclose event_routes issue --- Modified: src/core/tcp_main.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d… Patch: https://github.com/kamailio/kamailio/commit/635f3fb5387713181a3492278bcf72d…

2 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2022