sr-dev

sr-dev@lists.kamailio.org

45190 discussions

git:master:2e5b8167: dispatcher: option to get shorter result for rpc list command
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 2e5b81676c91f9c39ba8613f1116a7f8e0e06453 URL: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T18:11:50+02:00 dispatcher: option to get shorter result for rpc list command --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… Patch: https://github.com/kamailio/kamailio/commit/2e5b81676c91f9c39ba8613f1116a7f… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8ff3307548..ccb8b1334a 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1584,10 +1584,15 @@ static void dispatcher_rpc_reload(rpc_t *rpc, void *ctx) static const char *dispatcher_rpc_list_doc[2] = { "Return the content of dispatcher sets", 0}; + +#define DS_RPC_PRINT_NORMAL 1 +#define DS_RPC_PRINT_SHORT 2 + /** * */ -int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) +int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, + int mode) { int i = 0, rc = 0; void *rh; @@ -1604,7 +1609,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) return 0; for(; i < 2; ++i) { - rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle); + rc = ds_rpc_print_set(node->next[i], rpc, ctx, rpc_handle, mode); if(rc != 0) return rc; } @@ -1639,7 +1644,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle) else c[1] = 'X'; - if(node->dlist[j].attrs.body.s) { + if(mode != DS_RPC_PRINT_SHORT && node->dlist[j].attrs.body.s!=NULL) { if(rpc->struct_add(vh, "Ssd{", "URI", &node->dlist[j].uri, "FLAGS", c, "PRIORITY", node->dlist[j].priority, @@ -1709,6 +1714,16 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) { void *th; void *ih; + int n; + str smode; + int vmode = DS_RPC_PRINT_NORMAL; + + n = rpc->scan(ctx, "*S", &smode); + if(n == 1) { + if(smode.len==5 && strncasecmp(smode.s, "short", 5)==0) { + vmode = DS_RPC_PRINT_SHORT; + } + } ds_set_t *dslist = ds_get_list(); int dslistnr = ds_get_list_nr(); @@ -1729,7 +1744,7 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) return; } - ds_rpc_print_set(dslist, rpc, ctx, ih); + ds_rpc_print_set(dslist, rpc, ctx, ih, vmode); return; }

1 0

git:master:3f84e45e: dispatcher: docs updated for rpc dispatcher.list
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 3f84e45edc0d00866b76b7f35d569f02ff72eff2 URL: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T21:07:31+02:00 dispatcher: docs updated for rpc dispatcher.list --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… Patch: https://github.com/kamailio/kamailio/commit/3f84e45edc0d00866b76b7f35d569f0… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 78523a7c1b..bcd0a49a71 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1923,12 +1923,19 @@ onreply_route { <function moreinfo="none">dispatcher.list</function> </title> <para> - Lists the groups and included destinations. + Lists the routing groups with destination addresses and corresponding + attributes. </para> <para> Name: <emphasis>dispatcher.list</emphasis> </para> - <para>Parameters: <emphasis>none</emphasis></para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>_rmode_ - (optional) response mode - can be 'short' to get a + shorter version of groups and destinations</para> + </listitem> + </itemizedlist> <para> Example: </para>

1 0

git:master:e680b6b7: dispatcher: option to do srv dns query for target addresses
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: e680b6b7f7fc33c98720b928b505e8ac96980186 URL: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T13:02:06+02:00 dispatcher: option to do srv dns query for target addresses --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a… Patch: https://github.com/kamailio/kamailio/commit/e680b6b7f7fc33c98720b928b505e8a…

1 0

git:master:03f844bb: dispatcher: fix compile error by previous commit pushing unsaved files
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: 03f844bbe842107ad09cbf46bfcbff722e788937 URL: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T11:07:56+02:00 dispatcher: fix compile error by previous commit pushing unsaved files --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… Patch: https://github.com/kamailio/kamailio/commit/03f844bbe842107ad09cbf46bfcbff7… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b770a02a40..c62f484b8f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3352,7 +3352,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, /* dst record using hotname with dns not done - no ip to match */ continue; } - if(ds_dns_mode != DS_DNS_MODE_ALWAYS) { + if(!(ds_dns_mode & DS_DNS_MODE_ALWAYS)) { ipa = &node->dlist[j].ip_address; } else { memcpy(hn, node->dlist[j].host.s, node->dlist[j].host.len); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6a1b88c484..8ff3307548 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,7 +120,7 @@ int ds_hash_check_interval = 30; int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; -uint32_t ds_dns_mode = DS_DNS_INIT; +uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_mode_param = 0; str ds_outbound_proxy = STR_NULL;

1 0

git:master:bf6b1fef: dispatcher: turned ds_dns_mode values in bit flags
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: bf6b1feffeef81f43c9bffc75f7a1fbf5cd9caa7 URL: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T10:29:57+02:00 dispatcher: turned ds_dns_mode values in bit flags --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… Patch: https://github.com/kamailio/kamailio/commit/bf6b1feffeef81f43c9bffc75f7a1fb… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d59eebe23e..b770a02a40 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -111,7 +111,7 @@ extern float ds_latency_estimator_alpha; extern int ds_attrs_none; extern param_t *ds_db_extra_attrs_list; extern int ds_load_mode; -extern int ds_dns_mode; +extern uint32_t ds_dns_mode; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -486,7 +486,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /* Do a DNS-Lookup for the Host-Name, if not disabled via dst flags */ if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; - } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_TIMER) { + } else if (ds_dns_mode & (DS_DNS_MODE_INIT|DS_DNS_MODE_TIMER)) { he = resolvehost(hn); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 36e01e96ef..0d79386906 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -74,9 +74,9 @@ #define DS_IRMODE_NOIPADDR 1 -#define DS_DNS_MODE_INIT 0 -#define DS_DNS_MODE_ALWAYS 1 -#define DS_DNS_MODE_TIMER 2 +#define DS_DNS_MODE_INIT 1 +#define DS_DNS_MODE_ALWAYS (1<<1) +#define DS_DNS_MODE_TIMER (1<<2) /* clang-format on */ typedef struct ds_rctx { diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6317334fba..6a1b88c484 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -120,7 +120,8 @@ int ds_hash_check_interval = 30; int ds_timer_mode = 0; int ds_attrs_none = 0; int ds_load_mode = 0; -int ds_dns_mode = 0; +uint32_t ds_dns_mode = DS_DNS_INIT; +static int ds_dns_mode_param = 0; str ds_outbound_proxy = STR_NULL; @@ -297,7 +298,7 @@ static param_export_t params[]={ {"ds_db_extra_attrs", PARAM_STR, &ds_db_extra_attrs}, {"ds_load_mode", PARAM_INT, &ds_load_mode}, {"reload_delta", PARAM_INT, &ds_reload_delta }, - {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, + {"ds_dns_mode", PARAM_INT, &ds_dns_mode_param}, {0,0,0} }; @@ -327,11 +328,7 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; - if(ds_dns_mode!=DS_DNS_MODE_INIT && ds_dns_mode!=DS_DNS_MODE_ALWAYS - && ds_dns_mode!=DS_DNS_MODE_TIMER) { - LM_ERR("invalid dns mode %d\n", ds_dns_mode); - return -1; - } + ds_dns_mode = 1U<<(unsigned int)ds_dns_mode_param; if(ds_ping_active_init() < 0) { return -1;

1 0

git:master:cdf8cb64: dispatcher: check valid values for ds_dns_mode
by Daniel-Constantin Mierla 05 Apr '22

05 Apr '22

Module: kamailio Branch: master Commit: cdf8cb6444f3b3f9aeb76053edc05bf595d4a583 URL: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-05T07:54:15+02:00 dispatcher: check valid values for ds_dns_mode --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… Patch: https://github.com/kamailio/kamailio/commit/cdf8cb6444f3b3f9aeb76053edc05bf… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0ca8839c89..d59eebe23e 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -82,10 +82,6 @@ #define DS_HN_SIZE 256 -#define DS_DNS_MODE_INIT 0 -#define DS_DNS_MODE_ALWAYS 1 -#define DS_DNS_MODE_CACHE 2 - /* increment call load */ #define DS_LOAD_INC(dgrp, didx) do { \ lock_get(&(dgrp)->lock); \ @@ -490,7 +486,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) /* Do a DNS-Lookup for the Host-Name, if not disabled via dst flags */ if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; - } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_CACHE) { + } else if (ds_dns_mode==DS_DNS_MODE_INIT || ds_dns_mode==DS_DNS_MODE_TIMER) { he = resolvehost(hn); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index e360e67592..36e01e96ef 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -73,8 +73,12 @@ #define DS_XAVP_CTX_SKIP_CNT 1 #define DS_IRMODE_NOIPADDR 1 -/* clang-format on */ +#define DS_DNS_MODE_INIT 0 +#define DS_DNS_MODE_ALWAYS 1 +#define DS_DNS_MODE_TIMER 2 + +/* clang-format on */ typedef struct ds_rctx { int flags; int code; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 42b1a41aa8..6317334fba 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -327,6 +327,12 @@ static int mod_init(void) param_hooks_t phooks; param_t *pit = NULL; + if(ds_dns_mode!=DS_DNS_MODE_INIT && ds_dns_mode!=DS_DNS_MODE_ALWAYS + && ds_dns_mode!=DS_DNS_MODE_TIMER) { + LM_ERR("invalid dns mode %d\n", ds_dns_mode); + return -1; + } + if(ds_ping_active_init() < 0) { return -1; }

1 0

git:master:1b5b0aa9: dispatcher: added ds_dns_mode parameter
by Daniel-Constantin Mierla 04 Apr '22

04 Apr '22

Module: kamailio Branch: master Commit: 1b5b0aa94b82845995791a356b68ed6e1cbc3491 URL: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T19:34:55+02:00 dispatcher: added ds_dns_mode parameter - control when dns resolving is done for hostnames in target addresses from dispatcher groups (wip) --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6… Patch: https://github.com/kamailio/kamailio/commit/1b5b0aa94b82845995791a356b68ed6…

1 0

git:master:5555e893: mqueue: use local variable to lock early only when needed
by Daniel-Constantin Mierla 04 Apr '22

04 Apr '22

Module: kamailio Branch: master Commit: 5555e893ea0997a7c71a3e424ef09c4570f122f6 URL: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-04T08:02:44+02:00 mqueue: use local variable to lock early only when needed --- Modified: src/modules/mqueue/mqueue_api.c --- Diff: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… Patch: https://github.com/kamailio/kamailio/commit/5555e893ea0997a7c71a3e424ef09c4… --- diff --git a/src/modules/mqueue/mqueue_api.c b/src/modules/mqueue/mqueue_api.c index 59421f6e2f..b38f0a1069 100644 --- a/src/modules/mqueue/mqueue_api.c +++ b/src/modules/mqueue/mqueue_api.c @@ -293,6 +293,7 @@ int mq_item_add(str *qname, str *key, str *val) mq_item_t *mi = NULL; mq_item_t *miter = NULL; mq_item_t *miter_prev = NULL; + int oplock = 0; int len; mh = mq_head_get(qname); @@ -301,9 +302,10 @@ int mq_item_add(str *qname, str *key, str *val) LM_ERR("mqueue not found: %.*s\n", qname->len, qname->s); return -1; } - - lock_get(&mh->lock); + if (mh->addmode == 1 || mh->addmode == 2) { + lock_get(&mh->lock); + oplock = 1; miter = mh->ifirst; miter_prev = mh->ifirst; while (miter) { @@ -344,7 +346,9 @@ int mq_item_add(str *qname, str *key, str *val) if(mi==NULL) { LM_ERR("no more shm to add to: %.*s\n", qname->len, qname->s); - lock_release(&mh->lock); + if(oplock) { + lock_release(&mh->lock); + } return -1; } memset(mi, 0, len); @@ -352,12 +356,15 @@ int mq_item_add(str *qname, str *key, str *val) memcpy(mi->key.s, key->s, key->len); mi->key.len = key->len; mi->key.s[key->len] = '\0'; - + mi->val.s = mi->key.s + mi->key.len + 1; memcpy(mi->val.s, val->s, val->len); mi->val.len = val->len; mi->val.s[val->len] = '\0'; + if(oplock==0) { + lock_get(&mh->lock); + } if(mh->ifirst==NULL) { mh->ifirst = mi;

1 0

git:master:c09daf26: modules: readme files regenerated - ims_qos ... [skip ci]
by Kamailio Dev 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: c09daf26a58f23483c2b8cf1f40c990f20e4d215 URL: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-01T14:16:20+02:00 modules: readme files regenerated - ims_qos ... [skip ci] --- Modified: src/modules/ims_qos/README Modified: src/modules/mqueue/README Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990… Patch: https://github.com/kamailio/kamailio/commit/c09daf26a58f23483c2b8cf1f40c990…

1 0

git:master:20559f64: ims_qos: removed angle brakets in the text
by Daniel-Constantin Mierla 01 Apr '22

01 Apr '22

Module: kamailio Branch: master Commit: 20559f647fee0dc46fef83f8f7782ec24a1f0b94 URL: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-01T14:04:27+02:00 ims_qos: removed angle brakets in the text --- Modified: src/modules/ims_qos/doc/ims_qos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… Patch: https://github.com/kamailio/kamailio/commit/20559f647fee0dc46fef83f8f7782ec… --- diff --git a/src/modules/ims_qos/doc/ims_qos_admin.xml b/src/modules/ims_qos/doc/ims_qos_admin.xml index 3a72257f7d..0ff629e17e 100644 --- a/src/modules/ims_qos/doc/ims_qos_admin.xml +++ b/src/modules/ims_qos/doc/ims_qos_admin.xml @@ -388,7 +388,7 @@ modparam("ims_qos", "include_rtcp_fd", 1) <section> <title><varname>af_signaling_ip</varname> (String)</title> - <para>Set P-CSCF IPv4 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv4 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is 127.0.0.1</emphasis></para> @@ -407,7 +407,7 @@ modparam("ims_qos", "af_signaling_ip", "127.0.0.1") <section> <title><varname>af_signaling_ip6</varname> (String)</title> - <para>Set P-CSCF IPv6 address to generate the flows for the UE<->PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> + <para>Set P-CSCF IPv6 address to generate the flows for the UE - PCSCF signaling path. Used only for AAR register, Flow-Description AVP (507)</para> <para><emphasis> Default value is ""</emphasis></para>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev