sr-dev August 2024

sr-dev@lists.kamailio.org

10 participants
162 discussions

git:master:1a56ff54: dispatcher: docs for dispatcher.oclist rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a56ff54ec1898b8bbc2aae4ab5f4b19eff6ecf5 URL: https://github.com/kamailio/kamailio/commit/1a56ff54ec1898b8bbc2aae4ab5f4b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-06T11:03:41+02:00 dispatcher: docs for dispatcher.oclist rpc command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1a56ff54ec1898b8bbc2aae4ab5f4b1… Patch: https://github.com/kamailio/kamailio/commit/1a56ff54ec1898b8bbc2aae4ab5f4b1… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a17e87f68e7..81d5b19cd00 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2334,6 +2334,30 @@ DEST: { kamctl rpc dispatcher.hash 0 alice server.com kamctl rpc dispatcher.hash 4 bob server.com ... +</programlisting> + </section> + <section id="dispatcher.r.oclist"> + <title> + <function moreinfo="none">dispatcher.oclist</function> + </title> + <para> + List the overload control attributes for the records in a specific group. + </para> + <para> + Name: <emphasis>dispatcher.oclist</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_group_: destination group id</para></listitem> + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# prototype: kamcli dispatcher.oclist _group_ +kamcli dispatcher.oclist 1 +... </programlisting> </section>

3 months, 3 weeks

git:master:583ab9f2: dispatcher: variables declared at beginning of block

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 583ab9f29cd7d5c472de2e12087a4c619bc1897f URL: https://github.com/kamailio/kamailio/commit/583ab9f29cd7d5c472de2e12087a4c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-06T10:23:27+02:00 dispatcher: variables declared at beginning of block --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/583ab9f29cd7d5c472de2e12087a4c6… Patch: https://github.com/kamailio/kamailio/commit/583ab9f29cd7d5c472de2e12087a4c6… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 4eefbff1ce3..42fb1e45d68 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1962,6 +1962,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) int n; str smode; int vmode = DS_RPC_PRINT_NORMAL; + ds_set_t *dslist = NULL; + int dslistnr = 0; n = rpc->scan(ctx, "*S", &smode); if(n == 1) { @@ -1972,8 +1974,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) } } - ds_set_t *dslist = ds_get_list(); - int dslistnr = ds_get_list_nr(); + dslist = ds_get_list(); + dslistnr = ds_get_list_nr(); if(dslist == NULL || dslistnr <= 0) { LM_DBG("no destination sets\n");

3 months, 3 weeks

git:master:4c481dc9: dispatcher: new rpc command dispatcher.oclist

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4c481dc95338d9bb814730d3d4f84ce9670a0ed0 URL: https://github.com/kamailio/kamailio/commit/4c481dc95338d9bb814730d3d4f84ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-06T10:16:04+02:00 dispatcher: new rpc command dispatcher.oclist - list overload control attributes for a specific dispatcher group --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/4c481dc95338d9bb814730d3d4f84ce… Patch: https://github.com/kamailio/kamailio/commit/4c481dc95338d9bb814730d3d4f84ce… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 831bfef7e1a..4eefbff1ce3 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -2253,6 +2253,53 @@ static void dispatcher_rpc_hash(rpc_t *rpc, void *ctx) return; } +static const char *dispatcher_rpc_oclist_doc[2] = { + "List overload control details for a group", 0}; + +/* + * RPC command to set the state of a destination address + */ +static void dispatcher_rpc_oclist(rpc_t *rpc, void *ctx) +{ + int group = 0; + int i = 0; + ds_set_t *node = NULL; + void *th = NULL; + + if(rpc->scan(ctx, "d", &group) != 1) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + + /* get the index of the set */ + node = ds_list_lookup(group); + if(node == NULL) { + LM_ERR("destination set [%d] not found\n", group); + rpc->fault(ctx, 404, "Destination Group Not Found"); + return; + } + + for(i = 0; i < node->nr; i++) { + /* add entry node */ + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + if(rpc->struct_add(th, "dSduuujjuu", "group", group, "uri", + &node->dlist[i].uri, "flags", node->dlist[i].flags, "ocrate", + node->dlist[i].attrs.ocrate, "ocidx", node->dlist[i].ocidx, + "ocseq", node->dlist[i].ocseq, "octime_sec", + (unsigned long)node->dlist[i].octime.tv_sec, "octime_usec", + (unsigned long)node->dlist[i].octime.tv_usec, "ocmin", + node->dlist[i].attrs.ocmin, "ocmax", + node->dlist[i].attrs.ocmax) + < 0) { + rpc->fault(ctx, 500, "Internal error main structure"); + return; + } + } +} + /* clang-format off */ rpc_export_t dispatcher_rpc_cmds[] = { {"dispatcher.reload", dispatcher_rpc_reload, @@ -2271,6 +2318,8 @@ rpc_export_t dispatcher_rpc_cmds[] = { dispatcher_rpc_remove_doc, 0}, {"dispatcher.hash", dispatcher_rpc_hash, dispatcher_rpc_hash_doc, 0}, + {"dispatcher.oclist", dispatcher_rpc_oclist, + dispatcher_rpc_oclist_doc, RPC_RET_ARRAY}, {0, 0, 0, 0} }; /* clang-format on */

3 months, 3 weeks

[kamailio/kamailio] permissions address failure during checks (Issue #3922)

by Mariah Yang

r2val(): converting STRING [test] 8(18) DEBUG: permissions [address.c:179]: reload_address_db_table(): Number of rows in address table: 3 8(18) DEBUG: permissions [address.c:191]: reload_address_db_table(): failure during checks of database value 1 (group) in address table 8(18) ERROR: permissions [address.c:233]: reload_address_db_table(): database problem - invalid record mysql> desc ka_address; +---------+-------------+------+-----+---------+-------+ | Field | Type | Null | Key | Default | Extra | +---------+-------------+------+-----+---------+-------+ | id | double | NO | | 0 | | | grp | bigint | NO | | 0 | | | ip_addr | varchar(64) | YES | | NULL | | | mask | bigint | NO | | 0 | | | port | bigint | NO | | 0 | | | tag | varchar(4) | NO | | | | +---------+-------------+------+-----+---------+-------+ when address table use bigint for grp，error happened when load address data -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3922 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3922(a)github.com>

3 months, 3 weeks

[kamailio/kamailio] allow address 'grd' 'mask' 'port' fields to be a mysql BIGINT (PR #3923)

by Mariah Yang

#### 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) - [ ] 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/3923 -- Commit Summary -- * allow address 'grd' 'mask' 'port' fields to be a mysql BIGINT -- File Changes -- M src/modules/permissions/address.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3923.patch https://github.com/kamailio/kamailio/pull/3923.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3923 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3923(a)github.com>

3 months, 3 weeks

git:master:4aaaca60: cdp: Error log caused crash

by Morten Tryfoss

Module: kamailio Branch: master Commit: 4aaaca60ef2207100dd3f4e16ae63428aadc7dc5 URL: https://github.com/kamailio/kamailio/commit/4aaaca60ef2207100dd3f4e16ae6342… Author: Morten Tryfoss <morten(a)tryfoss.no> Committer: Morten Tryfoss <morten(a)tryfoss.no> Date: 2024-08-05T12:14:04+02:00 cdp: Error log caused crash --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/4aaaca60ef2207100dd3f4e16ae6342… Patch: https://github.com/kamailio/kamailio/commit/4aaaca60ef2207100dd3f4e16ae6342… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index e03307c5e84..67a3a8e6feb 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -605,7 +605,7 @@ static inline int do_receive(serviced_peer_t *sp) version = (unsigned char)(sp->buf[0]); if(version != 1) { LM_ERR("do_receive(): [%.*s] Received Unknown version [%d]\n", - sp->p->fqdn.len, sp->p->fqdn.s, + sp->p ? sp->p->fqdn.len : 0, sp->p ? sp->p->fqdn.s : 0, (unsigned char)sp->buf[0]); goto error_and_reset; } else {

3 months, 3 weeks

git:master:14fb25a5: dispatcher: print no-probing flag in the rpc list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 14fb25a5d39748e52224225667bae4ab2b428c9b URL: https://github.com/kamailio/kamailio/commit/14fb25a5d39748e52224225667bae4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-05T10:21:08+02:00 dispatcher: print no-probing flag in the rpc list --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/14fb25a5d39748e52224225667bae4a… Patch: https://github.com/kamailio/kamailio/commit/14fb25a5d39748e52224225667bae4a… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 440b4b96030..831bfef7e1a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1855,6 +1855,8 @@ int ds_rpc_print_set( if(node->dlist[j].flags & DS_PROBING_DST) c[1] = 'P'; + else if(node->dlist[j].flags & DS_NOPING_DST) + c[1] = 'N'; else c[1] = 'X';

3 months, 3 weeks

git:master:1243755d: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1243755d20192e7d5d1c492462a0f9f66521abac URL: https://github.com/kamailio/kamailio/commit/1243755d20192e7d5d1c492462a0f9f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-02T12:31:10+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/1243755d20192e7d5d1c492462a0f9f… Patch: https://github.com/kamailio/kamailio/commit/1243755d20192e7d5d1c492462a0f9f… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index c19d629085f..60d805706fb 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -59,7 +59,7 @@ Ovidiu Sas 4.18. subst_user('/re/repl/flags') 4.19. subst_body('/re/repl/flags') 4.20. subst_hf(hf, subexp, flags) - 4.21. subst_hf(itext, subexp, ovp) + 4.21. subst_v(itext, subexp, ovp) 4.22. set_body(txt, content_type) 4.23. set_reply_body(txt, content_type) 4.24. filter_body(content_type) @@ -213,7 +213,7 @@ Chapter 1. Admin Guide 4.18. subst_user('/re/repl/flags') 4.19. subst_body('/re/repl/flags') 4.20. subst_hf(hf, subexp, flags) - 4.21. subst_hf(itext, subexp, ovp) + 4.21. subst_v(itext, subexp, ovp) 4.22. set_body(txt, content_type) 4.23. set_reply_body(txt, content_type) 4.24. filter_body(content_type) @@ -320,7 +320,7 @@ From: medabeda 4.18. subst_user('/re/repl/flags') 4.19. subst_body('/re/repl/flags') 4.20. subst_hf(hf, subexp, flags) - 4.21. subst_hf(itext, subexp, ovp) + 4.21. subst_v(itext, subexp, ovp) 4.22. set_body(txt, content_type) 4.23. set_reply_body(txt, content_type) 4.24. filter_body(content_type) @@ -742,7 +742,7 @@ if ( subst_body('/^o=(.*) /o=$fU /') ) {}; if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; ... -4.21. subst_hf(itext, subexp, ovp) +4.21. subst_v(itext, subexp, ovp) Sed-like substitution subexp applied to itext, with result stored in opv.

3 months, 3 weeks

git:master:40238581: textops: docs - fixed typo in subst_v() function name

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 40238581af0eea0787547bdacc2ff0fccf19cbba URL: https://github.com/kamailio/kamailio/commit/40238581af0eea0787547bdacc2ff0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-08-02T12:28:19+02:00 textops: docs - fixed typo in subst_v() function name - unnoticed after copy and paste --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40238581af0eea0787547bdacc2ff0f… Patch: https://github.com/kamailio/kamailio/commit/40238581af0eea0787547bdacc2ff0f… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 57414c05e81..86f02b97336 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -811,7 +811,7 @@ if ( subst_hf("From", "/:test@/:best@/", "a") ) { /*....*/ }; <section id="textops.f.subst_v"> <title> - <function moreinfo="none">subst_hf(itext, subexp, ovp)</function> + <function moreinfo="none">subst_v(itext, subexp, ovp)</function> </title> <para> Sed-like substitution subexp applied to itext, with result stored in opv.

3 months, 3 weeks

git:master:e92375c9: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e92375c96eace6340e42bca622e9835df6b5d17f URL: https://github.com/kamailio/kamailio/commit/e92375c96eace6340e42bca622e9835… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2024-08-02T11:46:11+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/e92375c96eace6340e42bca622e9835… Patch: https://github.com/kamailio/kamailio/commit/e92375c96eace6340e42bca622e9835…

3 months, 3 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2024