sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
304 discussions

git:master:955152db: dmq: added dmq.remove rpc command
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 955152dbe5d1f05bf24d6ba23b091fe91a202cc3 URL: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:09:21+02:00 dmq: added dmq.remove rpc command - make it possible to remove a node that still is reachable by old address without having to shut dowm all nodes --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h --- Diff: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… Patch: https://github.com/kamailio/kamailio/commit/955152dbe5d1f05bf24d6ba23b091fe… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index fea60e0cc4..1db7cdd1f4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -430,8 +430,29 @@ static void dmq_rpc_list_nodes(rpc_t *rpc, void *c) static const char *dmq_rpc_list_nodes_doc[2] = {"Print all nodes", 0}; +void rpc_dmq_remove(rpc_t* rpc, void* ctx) +{ + str taddr = STR_NULL; + + if (rpc->scan(ctx, ".S", &taddr) < 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(dmq_node_del_by_uri(dmq_node_list, &taddr)<0) { + rpc->fault(ctx, 500, "Failure"); + return; + } +} + +static const char* rpc_dmq_remove_doc[3] = { + "Remove a DMQ node", + "address - the DMQ node address", + 0 +}; + static rpc_export_t rpc_methods[] = { {"dmq.list_nodes", dmq_rpc_list_nodes, dmq_rpc_list_nodes_doc, RET_ARRAY}, + {"dmq.remove", rpc_dmq_remove, rpc_dmq_remove_doc, 0}, {0, 0, 0, 0} }; diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 7e6ef93bdf..631dce11d5 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -350,6 +350,22 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node by uri + */ +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) +{ + dmq_node_t dnode; + + memset(&dnode, 0, sizeof(dmq_node_t)); + if(parse_uri(suri->s, suri->len, &dnode.uri) < 0) { + LM_ERR("error parsing uri [%.*s]\n", suri->len, suri->s); + return -1; + } + + return del_dmq_node(list, &dnode); +} + /** * @brief add dmq node */ diff --git a/src/modules/dmq/dmqnode.h b/src/modules/dmq/dmqnode.h index 45cac604a4..22c5c6fb1d 100644 --- a/src/modules/dmq/dmqnode.h +++ b/src/modules/dmq/dmqnode.h @@ -69,6 +69,7 @@ dmq_node_t *find_dmq_node(dmq_node_list_t *list, dmq_node_t *node); dmq_node_t *find_dmq_node_uri(dmq_node_list_t *list, str *uri); dmq_node_t *find_dmq_node_uri2(str *uri); int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node); +int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri); int cmp_dmq_node(dmq_node_t *node, dmq_node_t *cmpnode); int update_dmq_node_status(dmq_node_list_t *list, dmq_node_t *node, int status); dmq_node_t *shm_dup_node(dmq_node_t *node);

1 0

Crashes because of mixed shm and pkg in kamailio
by Rick Barenthin 21 Apr '21

21 Apr '21

Hi everyone, We have seen some crashes in kamailio version 5.3 which happens in some modules who are getting the request for a reply from the transaction by the tm module export and try to parse extra header in this request by the parser functions. This seems to create a mix of shm with pkg which lead to a crash in retransmission. My question is, is there a way to make sure that there is no mix of shm and pkg or is the parsing on the message from the transaction not a planned way of usage? Best regards Rick

3 2

git:master:1b956d74: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 1b956d74b25c9f80f01a6aa0bc7a6ff8f3d0f712 URL: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T11:31:26+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff… Patch: https://github.com/kamailio/kamailio/commit/1b956d74b25c9f80f01a6aa0bc7a6ff…

1 0

git:master:17e757c9: dmq: docs for server_socket address
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: 17e757c91e6e96f6711d9251979d81a792aaef08 URL: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:55:18+02:00 dmq: docs for server_socket address --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… Patch: https://github.com/kamailio/kamailio/commit/17e757c91e6e96f6711d9251979d81a… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 20a2e647b3..0e749e901e 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -121,7 +121,12 @@ sip:192.168.40.17:5060;status=active <section id="dmq.p.server_address"> <title><varname>server_address</varname>(str)</title> <para> - The local server address. This is the interface over which the DMQ engine will send/receive messages. + The local server address. This is the addres with which the local DMQ + node joins the servers group to send/receive messages. + </para> + <para> + Note: if server_socket is not set, then this address has to match a + local socket, which will be used to send/receive messages. </para> <para> <emphasis>Default value is <quote>NULL</quote>.</emphasis> @@ -134,6 +139,28 @@ modparam("dmq", "server_address", "sip:10.0.0.20:5060") ... modparam("dmq", "server_address", "sip:10.0.0.20:5061;transport=tls") ... +</programlisting> + </example> + </section> + <section id="dmq.p.server_socket"> + <title><varname>server_socket</varname>(str)</title> + <para> + The local listen address. This is the interface over which the DMQ + engine will send/receive messages. + </para> + <para> + Note: if this parameter is not set, the socket to send/receice + messages is built from server_address parameter. + </para> + <para> + <emphasis>Default value is <quote>NULL</quote>.</emphasis> + </para> + <example> + <title>Set <varname>server_socket</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dmq", "server_socket", "udp:10.0.0.20:5060") +... </programlisting> </example> </section>

1 0

git:master:a9a8bb31: dmq: exposed the server socket to modparam list
by Daniel-Constantin Mierla 21 Apr '21

21 Apr '21

Module: kamailio Branch: master Commit: a9a8bb31ed8f3d08579fc1d8b4e3b598c77c93be URL: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T10:49:39+02:00 dmq: exposed the server socket to modparam list --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… Patch: https://github.com/kamailio/kamailio/commit/a9a8bb31ed8f3d08579fc1d8b4e3b59… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 27e950e472..fea60e0cc4 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -118,6 +118,7 @@ static param_export_t params[] = { {"num_workers", INT_PARAM, &dmq_num_workers}, {"ping_interval", INT_PARAM, &dmq_ping_interval}, {"server_address", PARAM_STR, &dmq_server_address}, + {"server_socket", PARAM_STR, &dmq_server_socket}, {"notification_address", PARAM_STR|USE_FUNC_PARAM, dmq_add_notification_address}, {"notification_channel", PARAM_STR, &dmq_notification_channel}, {"multi_notify", INT_PARAM, &dmq_multi_notify}, @@ -229,10 +230,12 @@ static int mod_init(void) return -1; } - /* create socket string out of the server_uri */ - if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { - LM_ERR("failed to create socket out of server_uri\n"); - return -1; + if(dmq_server_socket.s==NULL || dmq_server_socket.len<=0) { + /* create socket string out of the server_uri */ + if(make_socket_str_from_uri(&dmq_server_uri, &dmq_server_socket) < 0) { + LM_ERR("failed to create socket out of server_uri\n"); + return -1; + } } if(lookup_local_socket(&dmq_server_socket) == NULL) { LM_ERR("server_uri is not a socket the proxy is listening on\n"); @@ -354,9 +357,6 @@ static void destroy(void) dmq_self_node->status = DMQ_NODE_DISABLED; request_nodelist(dmq_notification_node, 1); } - if(dmq_server_socket.s) { - pkg_free(dmq_server_socket.s); - } if(dmq_init_callback_done) { shm_free(dmq_init_callback_done); }

1 0

[kamailio/kamailio] export functions of ims_charging and ims_diameter_server to kemi (#2704)
by Riccardo-78 20 Apr '21

20 Apr '21

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  export functions of ims_charging and ims_diameter_server to kemi You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2704 -- Commit Summary -- * Merge pull request #1 from kamailio/master * ims_charging: export functions to kemi * ims_diameter_server: export functions to kemi -- File Changes -- M src/modules/ims_charging/ims_charging_mod.c (27) M src/modules/ims_diameter_server/ims_diameter_server.c (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2704.patch https://github.com/kamailio/kamailio/pull/2704.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/2704

2 5

git:master:1ddc27f1: ims_diameter_server: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 1ddc27f199061025a6a43da3e8a1388fcaddfe19 URL: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_diameter_server: export functions to kemi --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388… Patch: https://github.com/kamailio/kamailio/commit/1ddc27f199061025a6a43da3e8a1388…

1 0

git:master:4436fb7d: ims_charging: export functions to kemi
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: 4436fb7dc6bf868f30e9c7bcfd1ad57e49d6be0d URL: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Author: Riccardo Villa <riccardo.villa(a)netaxis.be> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:44:15+02:00 ims_charging: export functions to kemi --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57… Patch: https://github.com/kamailio/kamailio/commit/4436fb7dc6bf868f30e9c7bcfd1ad57…

1 0

[kamailio/kamailio] smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() (#2702)
by alexyosifov 20 Apr '21

20 Apr '21

- Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags.   #### 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 - [x] 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2702 -- Commit Summary -- * smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() -- File Changes -- M src/modules/smsops/smsops_impl.c (343) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2702.patch https://github.com/kamailio/kamailio/pull/2702.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/2702

2 3

git:master:e2b8bdda: smsops: Imrovements in decode_3gpp_sms() and pv_sms_body()
by Daniel-Constantin Mierla 20 Apr '21

20 Apr '21

Module: kamailio Branch: master Commit: e2b8bddad08f12f7eb48db199fad6ed184c58bac URL: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-20T12:38:51+02:00 smsops: Imrovements in decode_3gpp_sms() and pv_sms_body() - Added new sms pdu data: originating & destination address flags; SCTS(DELIVER)/VP(SUBMIT) absolute time format. - decode_3gpp_sms(): added support for DELIVER type; Added VP-AbsoluteTimeFormat for SUBMIT type. - pv_sms_body(): added support for ucs2 coding. - Extends of pv_get_sms() and pv_set_sms(): added support for originating & destination address flags. --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed… Patch: https://github.com/kamailio/kamailio/commit/e2b8bddad08f12f7eb48db199fad6ed…

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021