sr-dev

sr-dev@lists.kamailio.org

12 participants
44188 discussions

git:master:c9ec6cad: dispatcher: function to fetch by group id and uri

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c9ec6cad7300d40beef095116bcdd361bc9690c4 URL: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 dispatcher: function to fetch by group id and uri --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… Patch: https://github.com/kamailio/kamailio/commit/c9ec6cad7300d40beef095116bcdd36… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index d9626000ddc..852296bbad1 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -185,6 +185,7 @@ static int w_ds_reload(struct sip_msg* msg, char*, char*); static int w_ds_is_active(sip_msg_t *msg, char *pset, char *p2); static int w_ds_is_active_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2); +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri); static int w_ds_oc_set_attrs(sip_msg_t*, char*, char*, char*, char*, char*); static int fixup_ds_is_from_list(void** param, int param_no); @@ -199,6 +200,7 @@ static int pv_parse_dsv(pv_spec_p sp, str *in); static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_dsg(pv_spec_p sp, str *in); static void ds_dsg_fetch(int dg); +static void ds_dsg_fetch_uri(int dg, str *uri); static pv_export_t mod_pvs[] = { { {"dsv", (sizeof("dsv")-1)}, PVT_OTHER, pv_get_dsv, 0, @@ -266,6 +268,8 @@ static cmd_export_t cmds[]={ fixup_isiii, fixup_free_isiii, ANY_ROUTE}, {"ds_dsg_fetch", (cmd_function)w_ds_dsg_fetch, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"ds_dsg_fetch_uri", (cmd_function)w_ds_dsg_fetch_uri, 2, + fixup_igp_spve, fixup_free_igp_spve, ANY_ROUTE}, {0,0,0,0,0,0} }; @@ -1367,14 +1371,32 @@ static int pv_parse_dsv(pv_spec_p sp, str *in) /** * */ -static int _pv_dsg_fetch = 1; +static int _pv_dsg_fetch_dg = 1; +static str _pv_dsg_fetch_uri = STR_NULL; /** * */ static void ds_dsg_fetch(int dg) { - _pv_dsg_fetch = dg; + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + _pv_dsg_fetch_uri.s = NULL; + _pv_dsg_fetch_uri.len = 0; +} + +/** + * + */ +static void ds_dsg_fetch_uri(int dg, str *uri) +{ + _pv_dsg_fetch_dg = dg; + if(_pv_dsg_fetch_uri.s != NULL) { + pkg_free(_pv_dsg_fetch_uri.s); + } + pkg_str_dup(&_pv_dsg_fetch_uri, uri); } /** @@ -1393,6 +1415,28 @@ static int w_ds_dsg_fetch(sip_msg_t *msg, char *pset, char *p2) return 1; } +/** + * + */ +static int w_ds_dsg_fetch_uri(sip_msg_t *msg, char *pset, char *puri) +{ + int set; + str suri = STR_NULL; + + if(fixup_get_ivalue(msg, (gparam_p)pset, &set) != 0) { + LM_ERR("cannot get set id param value\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_p)puri, &suri) != 0) { + LM_ERR("cannot get uri param value\n"); + return -1; + } + + ds_dsg_fetch_uri(set, &suri); + + return 1; +} + /** * */ @@ -1439,16 +1483,19 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) int active = 0; int inactive = 0; int j = 0; + ds_ocdata_t ocdata; if(param == NULL) { return -1; } - dsg = ds_list_lookup(_pv_dsg_fetch); + dsg = ds_list_lookup(_pv_dsg_fetch_dg); if(dsg == NULL) { return pv_get_null(msg, param, res); } + memset(&ocdata, 0, sizeof(ds_ocdata_t)); + lock_get(&dsg->lock); count = dsg->nr; for(j = 0; j < dsg->nr; j++) { @@ -1457,6 +1504,14 @@ static int pv_get_dsg(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) } else { active++; } + if(_pv_dsg_fetch_uri.s != NULL && _pv_dsg_fetch_uri.len > 0) { + if((_pv_dsg_fetch_uri.len == dsg->dlist[j].uri.len) + && (strncmp(dsg->dlist[j].uri.s, _pv_dsg_fetch_uri.s, + _pv_dsg_fetch_uri.len) + == 0)) { + memcpy(&ocdata, &dsg->dlist[j].ocdata, sizeof(ds_ocdata_t)); + } + } } lock_release(&dsg->lock);

1 month, 2 weeks

git:master:556efcaa: core: tcp - emit async tkv event for read error

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 556efcaa34367dc689ee653b0de9f22ccef073f9 URL: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-25T19:58:06+01:00 core: tcp - emit async tkv event for read error --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… Patch: https://github.com/kamailio/kamailio/commit/556efcaa34367dc689ee653b0de9f22… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index cd7790eb958..c08d9bf074f 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -52,6 +52,7 @@ #include "ut.h" #include "trim.h" #include "pt.h" +#include "async_task.h" #include "daemonize.h" #include "cfg/cfg_struct.h" #ifdef CORE_TLS @@ -269,6 +270,9 @@ int tcp_read_data(int fd, struct tcp_connection *c, char *buf, int b_size, strerror(errno), errno, ip_addr2xa(&c->rcv.src_ip), c->rcv.src_port, ip_addr2xa(&c->rcv.dst_ip), c->rcv.dst_port); + async_tkv_emit(1200, "tcp-read-error", + "erno=%d;srcip=%s;dstip=%s", errno, + ip_addr2xa(&c->rcv.src_ip), ip_addr2xa(&c->rcv.dst_ip)); if(errno == ETIMEDOUT) { c->event = TCP_CLOSED_TIMEOUT; } else if(errno == ECONNRESET) {

1 month, 2 weeks

[kamailio/kamailio] cdp: fixes for various issues found with Coverity (PR #4030)

by Dragos Vingarzan

#### Pre-Submission Checklist    - [ ] 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) - [ ] 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  Various fixes for issues discovered with the Coverity static analysis tooling. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4030 -- Commit Summary -- * cdp: fixes for various issues found with coverity -- File Changes -- M src/modules/cdp/authstatemachine.c (2) M src/modules/cdp/common.c (8) M src/modules/cdp/diameter_peer.c (6) M src/modules/cdp/receiver.c (4) M src/modules/cdp/session.c (12) M src/modules/cdp/session.h (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4030.patch https://github.com/kamailio/kamailio/pull/4030.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4030 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4030(a)github.com>

1 month, 2 weeks

git:master:1ceeba73: cdp: fixed issues discovered during static code analysis

by Dragos Vingarzan

Module: kamailio Branch: master Commit: 1ceeba7364b745b6ca2840e830d006a37460d10e URL: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Author: Dragos Vingarzan <vingarzan(a)gmail.com> Committer: Dragos Vingarzan <dragos(a)neatpath.net> Date: 2024-11-25T13:33:40+01:00 cdp: fixed issues discovered during static code analysis This fixes: - 4-bytes (typically uint32_t) used for time_t storage (Y2K38) - print of time_t with %d instead of %ld - reuse of same loop index variable in a sub-loop - use of random(), when kam_rand() could theoretically be better - copy-paste mistake in sp2/sp parameter, where sp2 was meant and sp is probably NULL --- Modified: src/modules/cdp/authstatemachine.c Modified: src/modules/cdp/common.c Modified: src/modules/cdp/diameter_peer.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/session.c Modified: src/modules/cdp/session.h --- Diff: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a… Patch: https://github.com/kamailio/kamailio/commit/1ceeba7364b745b6ca2840e830d006a…

1 month, 2 weeks

git:master:55691f82: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 55691f82666f361bac5efb6355e6f32afb508660 URL: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-11-25T10:46:10+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32… Patch: https://github.com/kamailio/kamailio/commit/55691f82666f361bac5efb6355e6f32…

1 month, 2 weeks

[kamailio/kamailio] Add timer to ping rtpengine (PR #4016)

by Xenofon Karamanos

- Added parameter to control the interval   #### 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 - [ ] 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This PR adds a timer that its interval can be controlled with the param `ping_interval`. The timer pings all registered rtpengines and disables if any are found not responsive and vice versa. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4016 -- Commit Summary -- * Add timer to ping rtpengines -- File Changes -- M src/modules/rtpengine/rtpengine.c (50) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4016.patch https://github.com/kamailio/kamailio/pull/4016.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4016 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4016(a)github.com>

1 month, 2 weeks

git:master:f7fa3a39: rtpengine/docs: Add ping_interval docs

by Xenofon Karamanos

Module: kamailio Branch: master Commit: f7fa3a39f6c97ca8323a70f30ad4e33699ede23e URL: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine/docs: Add ping_interval docs --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… Patch: https://github.com/kamailio/kamailio/commit/f7fa3a39f6c97ca8323a70f30ad4e33… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 9a57c2e551e..a6c58ce401e 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2404,6 +2404,25 @@ modparam("rtpengine", "ping_mode", 0) </section> +<section id="rtpengine.p.ping_interval"> + <title><varname>ping_interval</varname> (integer)</title> + <para> + Specify the interval in seconds between pings to all rtpengines registered. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>ping_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "ping_interval", 10) +... + </programlisting> + </example> +</section> <section> <title>Functions</title>

1 month, 2 weeks

git:master:e183a3e2: rtpengine: Re-enable down servers (but not disabled ones)

by Xenofon Karamanos

Module: kamailio Branch: master Commit: e183a3e25c3f2088435b3911d13fcb376a89f5c0 URL: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Re-enable down servers (but not disabled ones) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… Patch: https://github.com/kamailio/kamailio/commit/e183a3e25c3f2088435b3911d13fcb3… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index cd3a76b1403..bdb4b76e4f1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1898,6 +1898,12 @@ static int rtpengine_iter_cb_ping( *found_rtpp_disabled = 1; crt_rtpp->rn_disabled = 1; } + /* if ping success, enable the rtpp and reset ticks, ONLY IF was not disabled manually */ + else if(crt_rtpp->rn_recheck_ticks != RTPENGINE_MAX_RECHECK_TICKS) { + crt_rtpp->rn_recheck_ticks = RTPENGINE_MIN_RECHECK_TICKS; + crt_rtpp->rn_disabled = 0; + *found_rtpp_disabled = 0; + } return 0; }

1 month, 2 weeks

git:master:a29afb3d: rtpengine: Add doxygen function descriptions

by Xenofon Karamanos

Module: kamailio Branch: master Commit: a29afb3de6d9dd1491667a5858187ae782d8d56d URL: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add doxygen function descriptions --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae… Patch: https://github.com/kamailio/kamailio/commit/a29afb3de6d9dd1491667a5858187ae…

1 month, 2 weeks

git:master:38234797: rtpengine: Add timer to ping rtpengine

by Xenofon Karamanos

Module: kamailio Branch: master Commit: 38234797332c79b81522c18cc7c6f83be86c0e9b URL: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <22965395+xkaraman(a)users.noreply.github.com> Date: 2024-11-25T11:31:56+02:00 rtpengine: Add timer to ping rtpengine - Added parameter to control the interval --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83… Patch: https://github.com/kamailio/kamailio/commit/38234797332c79b81522c18cc7c6f83…

1 month, 2 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev