sr-dev April 2021

sr-dev@lists.kamailio.org

14 participants
303 discussions

git:master:0c1211b0: Makefile.defs: version set to 5.6.0-dev0

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0c1211b02b48bf7776bd490454d0ad9ae785032e URL: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:51:26+02:00 Makefile.defs: version set to 5.6.0-dev0 - master branch is open for new features to be part of future release series 5.6.x --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… Patch: https://github.com/kamailio/kamailio/commit/0c1211b02b48bf7776bd490454d0ad9… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 2247a05385..027c985798 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -105,9 +105,9 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 -PATCHLEVEL = 5 +PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -dev0 # memory manager switcher # 0 - f_malloc (fast malloc)

3 years, 7 months

git:master:a8217183: Makefile.defs: version set to 5.5.0-pre1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a82171835767f65aa7365d303e53c097bf59e21a URL: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:48:20+02:00 Makefile.defs: version set to 5.5.0-pre1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… Patch: https://github.com/kamailio/kamailio/commit/a82171835767f65aa7365d303e53c09… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1d8e131e12..2247a05385 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

3 years, 7 months

git:master:54fe6aa0: topos_redis: set attributes always for provisional replies

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 54fe6aa05a266bfbf0cffedde89134ba534c8d1b URL: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T21:46:29+02:00 topos_redis: set attributes always for provisional replies --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… Patch: https://github.com/kamailio/kamailio/commit/54fe6aa05a266bfbf0cffedde89134b… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 93f02da0fd..5f0fda701e 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -1171,15 +1171,14 @@ int tps_redis_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, argc++; if(mode & TPS_DBU_CONTACT) { - TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, + TPS_REDIS_SET_ARGS(&md->a_contact, argc, &tt_key_a_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&md->b_contact, argc, &tt_key_b_contact, argv, argvlen); } if((mode & TPS_DBU_RPLATTRS) && msg->first_line.type==SIP_REPLY) { - if(sd->b_tag.len<=0 - && msg->first_line.u.reply.statuscode>=180 + if(msg->first_line.u.reply.statuscode>=180 && msg->first_line.u.reply.statuscode<200) { TPS_REDIS_SET_ARGS(&md->b_rr, argc, &tt_key_y_rr, argv, argvlen);

3 years, 7 months

git:master:06e265b3: ims_diameter_server: removed goto label used in single place

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 06e265b38a857789b64ca1370db039eeca5a0e50 URL: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:36:31+02:00 ims_diameter_server: removed goto label used in single place --- Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… Patch: https://github.com/kamailio/kamailio/commit/06e265b38a857789b64ca1370db039e… --- diff --git a/src/modules/ims_diameter_server/ims_diameter_server.c b/src/modules/ims_diameter_server/ims_diameter_server.c index 2270a62560..3ee51601ec 100644 --- a/src/modules/ims_diameter_server/ims_diameter_server.c +++ b/src/modules/ims_diameter_server/ims_diameter_server.c @@ -286,7 +286,10 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co session = 0; } - if (!req) goto error1; + if (!req) { + LM_ERR("Error occurred trying to send request\n"); + return -1; + } if (!addAVPsfromJSON(req, s_message)) { LM_ERR("Failed to parse JSON Request\n"); @@ -325,12 +328,6 @@ int ki_diameter_request(struct sip_msg * msg, str* s_peer, int i_appid, int i_co } } } -error1: - //Only free UAR IFF it has not been passed to CDP - if (req) cdpb.AAAFreeMessage(&req); - LM_ERR("Error occurred trying to send request\n"); - return -1; - } int diameter_request(struct sip_msg * msg, char* peer, char* appid, char* commandcode, char* message, int async) {

3 years, 7 months

git:master:86b05ed4: ims_charging: fixed compiler warnings for kemi exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 86b05ed47d2ec44535b3615dbebac59e4c2c99ca URL: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T09:29:26+02:00 ims_charging: fixed compiler warnings for kemi exports --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… Patch: https://github.com/kamailio/kamailio/commit/86b05ed47d2ec44535b3615dbebac59… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index a8883dc548..a01a08b566 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -409,7 +409,7 @@ static int ki_ro_ccr_stop(sip_msg_t *msg, str* p_direction, int p_code, str* p_r struct ro_session* ro_session; struct ro_session_entry *ro_session_entry; unsigned int h_entry; - str s_code, s_reason; + str s_reason; unsigned int code; int dir = 0; /*any side*/ char *c_direction; @@ -527,7 +527,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re return RO_RETURN_ERROR; } - dir = get_direction_as_int(&s_direction); + dir = get_direction_as_int(s_direction); if (dir == RO_ORIG_DIRECTION) { //get caller IMPU from asserted identity @@ -610,7 +610,7 @@ static int ki_ro_ccr(sip_msg_t *msg, str* s_route_name, str* s_direction, int re goto done; } - ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, &s_incoming_trunk_id, &s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); + ret = Ro_Send_CCR(msg, dlg, dir, reservation_units, s_incoming_trunk_id, s_outgoing_trunk_id, &pani, cfg_action, tindex, tlabel); if(ret < 0){ LM_ERR("Failed to send CCR\n"); @@ -669,6 +669,7 @@ static int ki_ro_set_session_id_avp(sip_msg_t *msg) { res = create_response_avp_string("ro_session_id", &ro_session->ro_session_id); dlgb.release_dlg(dlg); unref_ro_session(ro_session, 1, 1); + return res; } static int ro_fixup_stop(void **param, int param_no) { @@ -702,4 +703,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(ims_charging_kemi_exports); return 0; -} \ No newline at end of file +}

3 years, 7 months

git:master:94068d2e: dmq: skip removing local node via rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 94068d2e40eb867a5d6da44868d5edb52949f817 URL: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-22T08:36:11+02:00 dmq: skip removing local node via rpc command --- Modified: src/modules/dmq/dmqnode.c --- Diff: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… Patch: https://github.com/kamailio/kamailio/commit/94068d2e40eb867a5d6da44868d5edb… --- diff --git a/src/modules/dmq/dmqnode.c b/src/modules/dmq/dmqnode.c index 631dce11d5..4300f80b54 100644 --- a/src/modules/dmq/dmqnode.c +++ b/src/modules/dmq/dmqnode.c @@ -328,9 +328,12 @@ void pkg_free_node(dmq_node_t *node) } /** - * @brief delete dmq node + * @brief delete dmq node with filter rules + * - list - the list of nodes + * - node - the structure with characteristics of the node to be deleted + * - filter - if 0: delete node always; if 1: delete node if not local */ -int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +int dmq_node_del_filter(dmq_node_list_t *list, dmq_node_t *node, int filter) { dmq_node_t *cur, **prev; lock_get(&list->lock); @@ -338,8 +341,10 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) prev = &list->nodes; while(cur) { if(cmp_dmq_node(cur, node)) { - *prev = cur->next; - destroy_dmq_node(cur, 1); + if(filter==0 || cur->local==0) { + *prev = cur->next; + destroy_dmq_node(cur, 1); + } lock_release(&list->lock); return 1; } @@ -350,6 +355,14 @@ int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) return 0; } +/** + * @brief delete dmq node + */ +int del_dmq_node(dmq_node_list_t *list, dmq_node_t *node) +{ + return dmq_node_del_filter(list, node, 0); +} + /** * @brief delete dmq node by uri */ @@ -363,7 +376,7 @@ int dmq_node_del_by_uri(dmq_node_list_t *list, str *suri) return -1; } - return del_dmq_node(list, &dnode); + return dmq_node_del_filter(list, &dnode, 1); } /**

3 years, 7 months

git:master:0fa5455d: modules: readme files regenerated - dmq ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 0fa5455d9bc1d603c142cd9a767df5b248eba64a URL: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-04-21T19:31:12+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… Patch: https://github.com/kamailio/kamailio/commit/0fa5455d9bc1d603c142cd9a767df5b… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 78196f8ce1..1e7d6ff375 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -56,6 +56,7 @@ Charles Chance 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 2. Developer Guide @@ -87,6 +88,7 @@ Charles Chance 1.14. dmq_t_replicate usage 1.15. dmq_is_from_node usage 1.16. dmq.list_nodes usage + 1.17. dmq.remove usage 2.1. dmq_api_t structure 2.2. register_dmq_peer usage 2.3. bcast_message usage @@ -125,6 +127,7 @@ Chapter 1. Admin Guide 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 1. Overview @@ -464,6 +467,7 @@ ext/plain"); 5. RPC Commands 5.1. dmq.list_nodes + 5.2. dmq.remove 5.1. dmq.list_nodes @@ -474,6 +478,18 @@ ext/plain"); kamcmd dmq.list_nodes ... +5.2. dmq.remove + + Remove a DMQ node by address. + + Parameters: + * address - the SIP address of the DMQ node to remove. + + Example 1.17. dmq.remove usage +... +kamctl rpc dmq.remove sip:1.2.3.4:5060 +... + Chapter 2. Developer Guide Table of Contents

3 years, 7 months

Branching 5.5 on git repo for 5.5.x releases

by Daniel-Constantin Mierla

Hello, since freezing the development for 5.5 series, I did quite a lot of code analyzing with a bunch of tools as well as run various tests, no major issue being in my list at this moment, therefore I think we can plan branching 5.5 on git repo in the near future. If there is no other suggestion or argument against it, I propose to create the branch 5.5 on Thursday next week (April 22, 2021). After that, master branch will be open for new features (to become part of 5.6 or what ever version will be decided to be next), testing will continue for branch 5.5 for another 1-2 weeks, then we will release 5.5.0 as first stable version in the 5.5.x series. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online May 17-20, 2021 (Europe Timezone) - June 7-10, 2021 (America Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

3 years, 7 months

git:master:adf8919f: dmq: docs for rpc dmq.remove command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: adf8919f52841800f0cd4528c33679c7ef80f2c5 URL: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-04-21T19:16:21+02:00 dmq: docs for rpc dmq.remove command --- Modified: src/modules/dmq/doc/dmq_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… Patch: https://github.com/kamailio/kamailio/commit/adf8919f52841800f0cd4528c33679c… --- diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0e749e901e..ebc6f44e1a 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -518,6 +518,30 @@ modparam("dmq", "ping_interval", 90) <programlisting format="linespecific"> ... &kamcmd; dmq.list_nodes +... + </programlisting> + </example> + </section> + <section id="dmq.r.list_nodes"> + <title>dmq.remove</title> + <para> + Remove a DMQ node by address. + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>address</emphasis> - the SIP address + of the DMQ node to remove. + </para> + </listitem> + </itemizedlist> + + <example> + <title>dmq.remove usage</title> + <programlisting format="linespecific"> +... +&kamctl; rpc dmq.remove sip:1.2.3.4:5060 ... </programlisting> </example>

3 years, 7 months

git:master:955152db: dmq: added dmq.remove rpc command

by Daniel-Constantin Mierla

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);

3 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2021