sr-dev January 2021

sr-dev@lists.kamailio.org

17 participants
184 discussions

git:master:aff06f6a: kemix: exported KSR.kx.get_send_sock_port()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aff06f6a9daeb053587658ca6cf8e6c267ee36fe URL: https://github.com/kamailio/kamailio/commit/aff06f6a9daeb053587658ca6cf8e6c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-05T16:57:13+01:00 kemix: exported KSR.kx.get_send_sock_port() - return send socket port if set, 0 otherwise --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/aff06f6a9daeb053587658ca6cf8e6c… Patch: https://github.com/kamailio/kamailio/commit/aff06f6a9daeb053587658ca6cf8e6c… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index fc4c6a2a69..5cb7b20e3f 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -522,6 +522,17 @@ static sr_kemi_xval_t* ki_kx_get_send_sock_name(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static int ki_kx_get_send_sock_port(sip_msg_t *msg) +{ + if (msg==NULL || msg->force_send_socket==0) { + return 0; + } + return (int)msg->force_send_socket->port_no; +} + /** * */ @@ -1325,6 +1336,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_send_sock_port"), + SR_KEMIP_INT, ki_kx_get_send_sock_port, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_rcvip"), SR_KEMIP_XVAL, ki_kx_get_rcvip, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

3 years, 4 months

git:master:c5e2c397: pv: $fsp - return send socket port, or 0 if $fs not set

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5e2c397d962aa4099df4b0b59f69fa89a045754 URL: https://github.com/kamailio/kamailio/commit/c5e2c397d962aa4099df4b0b59f69fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-01-05T16:52:32+01:00 pv: $fsp - return send socket port, or 0 if $fs not set --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/c5e2c397d962aa4099df4b0b59f69fa… Patch: https://github.com/kamailio/kamailio/commit/c5e2c397d962aa4099df4b0b59f69fa… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 20f0979d86..f797f3ab7d 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -253,6 +253,9 @@ static pv_export_t mod_pvs[] = { {{"fsn", (sizeof("fsn")-1)}, /* */ PVT_OTHER, pv_get_force_sock_name, pv_set_force_sock_name, 0, 0, 0, 0}, + {{"fsp", (sizeof("fsp")-1)}, /* */ + PVT_OTHER, pv_get_force_sock_port, 0, + 0, 0, 0, 0}, {{"ft", (sizeof("ft")-1)}, /* */ PVT_OTHER, pv_get_from_attr, 0, 0, 0, pv_init_iname, 4}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 746e12e3ed..5137048e10 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1075,6 +1075,19 @@ int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &msg->force_send_socket->sockname); } +int pv_get_force_sock_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if (msg->force_send_socket==0) + return pv_get_uintval(msg, param, res, 0); + + return pv_get_intstrval(msg, param, res, (int)msg->force_send_socket->port_no, + &msg->force_send_socket->port_no_str); +} + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 865a48a2c0..2979e4cf9c 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -184,6 +184,9 @@ int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, int pv_get_force_sock_name(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_force_sock_port(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_useragent(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

3 years, 4 months

[kamailio/kamailio] dialog flag vs dlg_manage() - flag doesn't store uac_replace_* dialog variables (#2593)

by Sergiu Pojoga

### Description When invoking dialog tracking by flag instead of dlg_manage(), dialog doesn't store uac_replace_* variables. As a result, uac restore functionality doesn't work. ### Troubleshooting #### Reproduction #!define FLT_DIALOG 4 ... modparam("dialog", "dlg_flag", FLT_DIALOG) ... request_route { if (is_method("INVITE")) setflag(FLT_DIALOG); ... } Make a call. List dialogs (kamcmd dlg.list) You'll notice the dialog has no _uac_ variables  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.8 (x86_64/linux) a58155 ``` * **Operating System**:  ``` NAME="Debian GNU/Linux" VERSION="8 (jessie)" ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2593

3 years, 4 months

[kamailio/kamailio] Fix 2 issues that prevent auto_bind_ipv6 from happening on my setup (#2595)

by Paul Komkoff

#### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Without the first commit, on my setup - which has lots of interfaces with lots of addresses - auto_bind_ipv6 will make kamailio stuck on startup. It actually happens in get_flags, where data sent back from kernel can't fit into 8K anymore. Second commit is fixing obvious typo while we're at it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2595 -- Commit Summary -- * core: work around interface enum buffer overrun * core: fix unused argument in socket_info.c:get_flags -- File Changes -- M src/core/socket_info.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2595.patch https://github.com/kamailio/kamailio/pull/2595.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2595

3 years, 4 months

git:master:d8257e3c: Merge pull request #2595 from theraphim/master

by GitHub

Module: kamailio Branch: master Commit: d8257e3c947c5619456dedcea51d28691a70fd84 URL: https://github.com/kamailio/kamailio/commit/d8257e3c947c5619456dedcea51d286… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-01-05T16:30:11+01:00 Merge pull request #2595 from theraphim/master Fix 2 issues that prevent auto_bind_ipv6 from happening on my setup --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d8257e3c947c5619456dedcea51d286… Patch: https://github.com/kamailio/kamailio/commit/d8257e3c947c5619456dedcea51d286… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a46aba24ad..d55f506bcc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1070,6 +1070,7 @@ static int nl_bound_sock(void) req.g.rtgen_family = family;\ } while(0); +#define NETLINK_BUFFER_SIZE 32768 static int get_flags(int family){ struct { @@ -1079,12 +1080,12 @@ static int get_flags(int family){ int rtn = 0; struct nlmsghdr* nlp; struct ifinfomsg *ifi; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; int nl_sock = -1; - fill_nl_req(req, RTM_GETLINK, AF_INET); + fill_nl_req(req, RTM_GETLINK, family); if((nl_sock = nl_bound_sock()) < 0) return -1; @@ -1095,6 +1096,10 @@ static int get_flags(int family){ } while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in get_flags"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); nlp = (struct nlmsghdr *) p; if(nlp->nlmsg_type == NLMSG_DONE){ @@ -1148,7 +1153,7 @@ static int build_iface_list(void) struct nlmsghdr* nlp; struct ifaddrmsg *ifi; int rtl; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; struct rtattr * rtap; @@ -1184,6 +1189,10 @@ static int build_iface_list(void) nll = 0; p = buf; while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in build_iface_list"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *) p;

3 years, 4 months

git:master:42f77024: core: fix unused argument in socket_info.c:get_flags

by Paul Komkoff

Module: kamailio Branch: master Commit: 42f7702430c312b2c9caea8f617af4e3719ef12f URL: https://github.com/kamailio/kamailio/commit/42f7702430c312b2c9caea8f617af4e… Author: Paul Komkoff <i(a)stingr.net> Committer: Paul Komkoff <i(a)stingr.net> Date: 2021-01-05T14:55:11+04:00 core: fix unused argument in socket_info.c:get_flags get_flags has an argument - family - which is supposed to be used in netlink message, otherwise why would we need it? --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/42f7702430c312b2c9caea8f617af4e… Patch: https://github.com/kamailio/kamailio/commit/42f7702430c312b2c9caea8f617af4e… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index d34f3fb4cd..d55f506bcc 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1085,7 +1085,7 @@ static int get_flags(int family){ int nll = 0; int nl_sock = -1; - fill_nl_req(req, RTM_GETLINK, AF_INET); + fill_nl_req(req, RTM_GETLINK, family); if((nl_sock = nl_bound_sock()) < 0) return -1;

3 years, 4 months

git:master:d2fd204b: core: work around interface enum buffer overrun

by Paul Komkoff

Module: kamailio Branch: master Commit: d2fd204b0ae35512a04702e480bb0d16878e98be URL: https://github.com/kamailio/kamailio/commit/d2fd204b0ae35512a04702e480bb0d1… Author: Paul Komkoff <i(a)stingr.net> Committer: Paul Komkoff <i(a)stingr.net> Date: 2021-01-05T14:55:04+04:00 core: work around interface enum buffer overrun When a system has too many interfaces and too many addresses, 8 kilobytes isn't enough to fit all of the netlink responses. As the result, kamailio gets stuck in a loop where it tries to do a 0-length recv. Increase the buffer to 32K. It's a miniscule amount for modern times anyway. Also, add diagnostics to make further troubleshooting easier. Proper fix would be to switch to libnl here, which would make a good weekend project. --- Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/d2fd204b0ae35512a04702e480bb0d1… Patch: https://github.com/kamailio/kamailio/commit/d2fd204b0ae35512a04702e480bb0d1… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a46aba24ad..d34f3fb4cd 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -1070,6 +1070,7 @@ static int nl_bound_sock(void) req.g.rtgen_family = family;\ } while(0); +#define NETLINK_BUFFER_SIZE 32768 static int get_flags(int family){ struct { @@ -1079,7 +1080,7 @@ static int get_flags(int family){ int rtn = 0; struct nlmsghdr* nlp; struct ifinfomsg *ifi; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; int nl_sock = -1; @@ -1095,6 +1096,10 @@ static int get_flags(int family){ } while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in get_flags"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); nlp = (struct nlmsghdr *) p; if(nlp->nlmsg_type == NLMSG_DONE){ @@ -1148,7 +1153,7 @@ static int build_iface_list(void) struct nlmsghdr* nlp; struct ifaddrmsg *ifi; int rtl; - char buf[8192]; + char buf[NETLINK_BUFFER_SIZE]; char *p = buf; int nll = 0; struct rtattr * rtap; @@ -1184,6 +1189,10 @@ static int build_iface_list(void) nll = 0; p = buf; while(1) { + if ((sizeof(buf) - nll) == 0) { + LM_ERR("netlink buffer overflow in build_iface_list"); + goto error; + } rtn = recv(nl_sock, p, sizeof(buf) - nll, 0); LM_DBG("received %d byles \n", rtn); nlp = (struct nlmsghdr *) p;

3 years, 4 months

[kamailio/kamailio] Close parenthesis on error description (#2589)

by Javier Valencia

Close parentheses on error description when *Not enough parameters* on *htable_rpc_delete*. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2589 -- Commit Summary -- * Close parenthesis on error description -- File Changes -- M src/modules/htable/htable.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2589.patch https://github.com/kamailio/kamailio/pull/2589.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2589

3 years, 4 months

[kamailio/kamailio] Fix in parsing IPv6 address:port (#2592)

by Dennis

This patch fix wrong parsing the pair of IPv6 addr:port in rtpengine module, when loading node information from database.  #### 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) - [ ] 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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2592 -- Commit Summary -- * Fix in parsing IPv6 address:port -- File Changes -- M src/modules/rtpengine/rtpengine.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2592.patch https://github.com/kamailio/kamailio/pull/2592.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2592

3 years, 4 months

git:master:13d786e3: rtpengine: fixing wrong parsing the pair of IPv6 addr:port (#2592)

by GitHub

Module: kamailio Branch: master Commit: 13d786e33d6f04a718af40ba345cf0827f752c2f URL: https://github.com/kamailio/kamailio/commit/13d786e33d6f04a718af40ba345cf08… Author: Dennis <dennis_y(a)mail.ru> Committer: GitHub <noreply(a)github.com> Date: 2021-01-04T10:35:44-05:00 rtpengine: fixing wrong parsing the pair of IPv6 addr:port (#2592) - fixing wrong parsing the pair of IPv6 addr:port in rtpengine module, when loading node information from database. --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/13d786e33d6f04a718af40ba345cf08… Patch: https://github.com/kamailio/kamailio/commit/13d786e33d6f04a718af40ba345cf08… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index fb736b2f10..7eb0843793 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1022,7 +1022,14 @@ int add_rtpengine_socks(struct rtpp_set *rtpp_list, char *rtpengine, /* Check the rn_address is 'hostname:port' */ /* Check the rn_address port is valid */ - p1 = strchr(pnode->rn_address, ':'); + if(pnode->rn_umode == 6) { + p1 = strstr(pnode->rn_address, "]:"); + if(p1 != NULL) { + p1++; + } + } else { + p1 = strchr(pnode->rn_address, ':'); + } if (p1 != NULL) { p1++; }

3 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2021