sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
284 discussions

git:master:ac376471: ipops: added function to set local ttl for dns queries

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ac376471d95ab7a350d9d7cc124c06a157776dff URL: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:31:20+02:00 ipops: added function to set local ttl for dns queries --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… Patch: https://github.com/kamailio/kamailio/commit/ac376471d95ab7a350d9d7cc124c06a… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 273f232fa7..49b9ceb653 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -46,6 +46,7 @@ #include "../../core/mod_fix.h" #include "../../core/pvar.h" #include "../../core/resolve.h" +#include "../../core/dns_cache.h" #include "../../core/lvalue.h" #include "../../core/kemi.h" #include "api.h" @@ -110,6 +111,7 @@ static int fixup_free_detailed_ip_type(void** param, int param_no); static int w_dns_query(sip_msg_t* msg, char* str1, char* str2); static int w_srv_query(sip_msg_t* msg, char* str1, char* str2); static int w_naptr_query(sip_msg_t* msg, char* str1, char* str2); +static int w_dns_set_local_ttl(sip_msg_t*, char*, char*); static int mod_init(void); static pv_export_t mod_pvs[] = { @@ -165,6 +167,8 @@ static cmd_export_t cmds[] = ANY_ROUTE }, { "naptr_query", (cmd_function)w_naptr_query, 2, fixup_spve_spve, 0, ANY_ROUTE }, + { "dns_set_local_ttl", (cmd_function)w_dns_set_local_ttl, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, { "bind_ipops", (cmd_function)bind_ipops, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0 } }; @@ -1358,6 +1362,30 @@ static int ki_naptr_query(sip_msg_t* msg, str* naptrname, str* pvid) return naptr_update_pv(naptrname, pvid); } +/** + * + */ +static int ki_dns_set_local_ttl(sip_msg_t* msg, int vttl) +{ + dns_set_local_ttl(vttl); + return 1; +} + +/** + * + */ +static int w_dns_set_local_ttl(sip_msg_t *msg, char *pttl, char *p2) +{ + int vttl = 0; + + if(fixup_get_ivalue(msg, (gparam_t*)pttl, &vttl)<0) { + LM_ERR("cannot get the ttl value\n"); + return -1; + } + + return ki_dns_set_local_ttl(msg, vttl); +} + /** * */ @@ -1458,6 +1486,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("dns_set_local_ttl"), + SR_KEMIP_INT, ki_dns_set_local_ttl, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

2 years, 7 months

git:master:1c67548e: dispatcher: docs for ds_dns_ttl

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c67548e9e3c78040fac933a6b59397f2ebb329e URL: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-11T08:22:16+02:00 dispatcher: docs for ds_dns_ttl --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… Patch: https://github.com/kamailio/kamailio/commit/1c67548e9e3c78040fac933a6b59397… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 1e67256c88..a910b8480c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1162,6 +1162,28 @@ modparam("dispatcher", "ds_interval_mode", 1800) </example> </section> + <section id="dispatcher.p.ds_dns_ttl"> + <title><varname>ds_dns_ttl</varname> (int)</title> + <para> + The interval in seconds to set TTL for DNS results received for + queries dones inside this module. If 0, this TTL is not set, + result and core values are used. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set the <quote>ds_dns_ttl</quote> parameter</title> +<programlisting format="linespecific"> +... +modparam("dispatcher", "ds_interval_mode", 7200) +... +</programlisting> + </example> + </section> + </section> <section>

2 years, 7 months

git:master:6074d5ce: dispatcher: new ds_dns_ttl

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6074d5cecf3f7f009d5a33678843926b57f34520 URL: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-09T21:27:21+02:00 dispatcher: new ds_dns_ttl - option to set ttl for dns queries done by dispatcher --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… Patch: https://github.com/kamailio/kamailio/commit/6074d5cecf3f7f009d5a33678843926… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 9d9b849183..d19098800a 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -112,6 +112,7 @@ extern int ds_attrs_none; extern param_t *ds_db_extra_attrs_list; extern int ds_load_mode; extern uint32_t ds_dns_mode; +extern int ds_dns_ttl; static db_func_t ds_dbf; static db1_con_t *ds_db_handle = NULL; @@ -490,6 +491,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) if(dp->flags & DS_NODNSARES_DST) { dp->irmode |= DS_IRMODE_NOIPADDR; } else if (ds_dns_mode & (DS_DNS_MODE_INIT|DS_DNS_MODE_TIMER)) { + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = dp->port; sproto = (char)dp->proto; @@ -509,6 +511,7 @@ ds_dest_t *pack_dest(str iuri, int flags, int priority, str *attrs, int dload) hn[puri.host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s (missing no-probing flag?!?)\n", puri.host.len, puri.host.s); @@ -3372,6 +3375,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, if(!(ds_dns_mode & DS_DNS_MODE_ALWAYS)) { ipa = &node->dlist[j].ip_address; } else { + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = node->dlist[j].port; sproto = (char)node->dlist[j].proto; @@ -3389,6 +3393,7 @@ int ds_is_addr_from_set(sip_msg_t *_m, struct ip_addr *pipaddr, hn[node->dlist[j].host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_WARN("could not resolve %.*s (skipping)\n", node->dlist[j].host.len, node->dlist[j].host.s); @@ -3485,6 +3490,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) } tport = puri.port_no; tproto = puri.proto; + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = tport; sproto = (char)tproto; @@ -3502,6 +3508,7 @@ int ds_is_addr_from_list(sip_msg_t *_m, int group, str *uri, int mode) hn[puri.host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s\n", puri.host.len, puri.host.s); return -1; @@ -3863,6 +3870,7 @@ void ds_dns_update_set(ds_set_t *node) } LM_DBG("resolving [%.*s] - mode: %d\n", node->dlist[j].host.len, node->dlist[j].host.s, ds_dns_mode); + dns_set_local_ttl(ds_dns_ttl); if (ds_dns_mode & DS_DNS_MODE_QSRV) { sport = node->dlist[j].port; sproto = (char)node->dlist[j].proto; @@ -3882,6 +3890,7 @@ void ds_dns_update_set(ds_set_t *node) hn[node->dlist[j].host.len] = '\0'; he = resolvehost(hn); } + dns_set_local_ttl(0); if(he == 0) { LM_ERR("could not resolve %.*s\n", node->dlist[j].host.len, node->dlist[j].host.s); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 8dea1f29f3..827d925ed8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -122,6 +122,7 @@ int ds_attrs_none = 0; int ds_load_mode = 0; uint32_t ds_dns_mode = DS_DNS_MODE_INIT; static int ds_dns_interval = 600; +int ds_dns_ttl = 0; str ds_outbound_proxy = STR_NULL; @@ -300,6 +301,7 @@ static param_export_t params[]={ {"reload_delta", PARAM_INT, &ds_reload_delta }, {"ds_dns_mode", PARAM_INT, &ds_dns_mode}, {"ds_dns_interval", PARAM_INT, &ds_dns_interval}, + {"ds_dns_ttl", PARAM_INT, &ds_dns_ttl}, {0,0,0} }; @@ -338,6 +340,9 @@ static int mod_init(void) return -1; } } + if(ds_dns_ttl<0) { + ds_dns_ttl = 0; + } if(ds_ping_active_init() < 0) { return -1; }

2 years, 7 months

git:master:0846ddd9: core: dns cache - option to set local ttl to overwrite the global value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0846ddd9eb79eeb0f93535ad65c75670f026941b URL: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-09T15:36:32+02:00 core: dns cache - option to set local ttl to overwrite the global value --- Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… Patch: https://github.com/kamailio/kamailio/commit/0846ddd9eb79eeb0f93535ad65c7567… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 58247265eb..d6826f0707 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -88,12 +88,15 @@ struct t_dns_cache_stats* dns_cache_stats=0; #define LOCK_DNS_HASH() lock_get(dns_hash_lock) #define UNLOCK_DNS_HASH() lock_release(dns_hash_lock) +static int _dns_local_ttl = 0; + #define FIX_TTL(t) \ - (((t)<cfg_get(core, core_cfg, dns_cache_min_ttl))? \ - cfg_get(core, core_cfg, dns_cache_min_ttl): \ - (((t)>cfg_get(core, core_cfg, dns_cache_max_ttl))? \ - cfg_get(core, core_cfg, dns_cache_max_ttl): \ - (t))) + ((_dns_local_ttl>0)?_dns_local_ttl: \ + (((t)<cfg_get(core, core_cfg, dns_cache_min_ttl))? \ + cfg_get(core, core_cfg, dns_cache_min_ttl): \ + (((t)>cfg_get(core, core_cfg, dns_cache_max_ttl))? \ + cfg_get(core, core_cfg, dns_cache_max_ttl): \ + (t)))) struct dns_hash_head{ @@ -132,6 +135,10 @@ static const char* dns_str_errors[]={ }; +void dns_set_local_ttl(int ttl) +{ + _dns_local_ttl = ttl; +} /* param: err (negative error number) */ const char* dns_strerror(int err) diff --git a/src/core/dns_cache.h b/src/core/dns_cache.h index 0ec919f2d2..f8ae153a30 100644 --- a/src/core/dns_cache.h +++ b/src/core/dns_cache.h @@ -374,5 +374,6 @@ int dns_cache_delete_single_record(unsigned short type, str *value, int flags); +void dns_set_local_ttl(int ttl); #endif

2 years, 7 months

git:master:ba28855a: pv: added set function for variable $rcv(buf)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ba28855a1745e0b084d230958bd3fbb5b0e23847 URL: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T19:17:35+02:00 pv: added set function for variable $rcv(buf) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_branch.c Modified: src/modules/pv/pv_branch.h --- Diff: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… Patch: https://github.com/kamailio/kamailio/commit/ba28855a1745e0b084d230958bd3fbb… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c34ce5dd31..cdd34ce5b9 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -91,7 +91,7 @@ static pv_export_t mod_pvs[] = { pv_parse_snd_name, 0, 0, 0 }, { {"sndfrom", (sizeof("sndfrom")-1)}, PVT_OTHER, pv_get_sndfrom, 0, pv_parse_snd_name, 0, 0, 0 }, - { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, 0, + { {"rcv", (sizeof("rcv")-1)}, PVT_OTHER, pv_get_rcv, pv_set_rcv, pv_parse_rcv_name, 0, 0, 0 }, { {"xavp", sizeof("xavp")-1}, /* xavp */ PVT_XAVP, pv_get_xavp, pv_set_xavp, diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index ecce3156e7..83cc273f12 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -617,6 +617,60 @@ int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, return 0; } +int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val) +{ + sr_net_info_t *neti = NULL; + str s; + + neti = ksr_evrt_rcvnetinfo_get(); + + if (neti==NULL || neti->rcv==NULL || neti->rcv->bind_address==NULL) { + LM_ERR("received info not set\n"); + return -1; + } + + if(param==NULL) { + LM_ERR("bad parameters\n"); + return -1; + } + switch(param->pvn.u.isname.name.n) + { + case 1: /* buf */ + if (neti->bufsize <= 0) { + LM_ERR("received data cannot be changed\n"); + return -1; + } + if(val==NULL || (val->flags&PV_VAL_NULL)) { + neti->data.s[0] = '\0'; + neti->data.len = 0; + break; + } + if(!(val->flags&PV_VAL_STR)) { + LM_ERR("str value required to set received data\n"); + return -1; + } + if(val->rs.len<=0) { + neti->data.s[0] = '\0'; + neti->data.len = 0; + break; + } + + if (unlikely(val->rs.len >= neti->bufsize - 1)) { + LM_ERR("new data is too long: %.*s\n", + val->rs.len, val->rs.s); + return -1; + } + memcpy(neti->data.s, val->rs.s, val->rs.len); + neti->data.s[val->rs.len] = '\0'; + neti->data.len = val->rs.len; + break; + default: + LM_DBG("set operation not supported for field %d\n", + param->pvn.u.isname.name.n); + } + return 0; +} + int pv_parse_rcv_name(pv_spec_p sp, str *in) { if(sp==NULL || in==NULL || in->len<=0) diff --git a/src/modules/pv/pv_branch.h b/src/modules/pv/pv_branch.h index a83c98208b..5252db0d6b 100644 --- a/src/modules/pv/pv_branch.h +++ b/src/modules/pv/pv_branch.h @@ -42,6 +42,7 @@ int pv_parse_snd_name(pv_spec_p sp, str *in); int pv_get_rcv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_set_rcv(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val); int pv_parse_rcv_name(pv_spec_p sp, str *in); int pv_get_nh(struct sip_msg *msg, pv_param_t *param,

2 years, 7 months

git:master:d5e29886: core: enable updating received data via $rcv(buf)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d5e29886ccca6e4384859523e8b923761532c513 URL: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T19:15:26+02:00 core: enable updating received data via $rcv(buf) - on event_route[core:msg-received] --- Modified: src/core/ip_addr.h Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… Patch: https://github.com/kamailio/kamailio/commit/d5e29886ccca6e4384859523e8b9237… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index c3f423123e..2f7770f81d 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -203,6 +203,7 @@ typedef struct ksr_coninfo { typedef struct sr_net_info { str data; + unsigned int bufsize; receive_info_t* rcv; dest_info_t* dst; } sr_net_info_t; diff --git a/src/core/receive.c b/src/core/receive.c index b3e6aee8b8..5ed35a584c 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -161,7 +161,7 @@ sr_net_info_t *ksr_evrt_rcvnetinfo_get(void) /** * */ -int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) +int ksr_evrt_received(char *buf, unsigned int *len, receive_info_t *rcv_info) { sr_kemi_eng_t *keng = NULL; sr_net_info_t netinfo; @@ -192,7 +192,8 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) } memset(&netinfo, 0, sizeof(sr_net_info_t)); netinfo.data.s = buf; - netinfo.data.len = len; + netinfo.data.len = *len; + netinfo.bufsize = BUF_SIZE; netinfo.rcv = rcv_info; ksr_evrt_rcvnetinfo = &netinfo; @@ -212,6 +213,7 @@ int ksr_evrt_received(char *buf, unsigned int len, receive_info_t *rcv_info) LM_DBG("dropping received message\n"); ret = -1; } + *len = netinfo.data.len; ksr_evrt_rcvnetinfo = NULL; return ret; @@ -312,7 +314,7 @@ int receive_msg(char *buf, unsigned int len, receive_info_t *rcv_info) } if(ksr_evrt_received_mode!=0) { - if(ksr_evrt_received(buf, len, rcv_info)<0) { + if(ksr_evrt_received(buf, &len, rcv_info)<0) { LM_DBG("dropping the received message\n"); goto error00; }

2 years, 7 months

git:master:f10f3b51: dispatcher: track time of last dns timer update

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f10f3b516ccab7f2bca8ff71c3fa34b915fc03f6 URL: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T16:17:02+02:00 dispatcher: track time of last dns timer update --- 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/f10f3b516ccab7f2bca8ff71c3fa34b… Patch: https://github.com/kamailio/kamailio/commit/f10f3b516ccab7f2bca8ff71c3fa34b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 0f6a6b178f..9d9b849183 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3889,6 +3889,7 @@ void ds_dns_update_set(ds_set_t *node) } else { /* Store hostent in the dispatcher structure */ hostent2ip_addr(&node->dlist[j].ip_address, he, 0); + gettimeofday(&node->dlist[j].dnstime, NULL); } } } diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 3eaa9894dd..99c63eb7b9 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -29,6 +29,7 @@ #define _DISPATCH_H_ #include <stdio.h> +#include <sys/time.h> #include "../../core/pvar.h" #include "../../core/xavp.h" #include "../../core/parser/msg_parser.h" @@ -231,6 +232,7 @@ typedef struct _ds_dest { unsigned short int port; /*!< port of the URI */ unsigned short int proto; /*!< protocol of the URI */ int message_count; + struct timeval dnstime; struct _ds_dest *next; } ds_dest_t; diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index ccf579fba8..8dea1f29f3 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1664,9 +1664,11 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, if(mode == DS_RPC_PRINT_FULL) { ipbuf[0] = '\0'; ip_addr2sbufz(&node->dlist[j].ip_address, ipbuf, IP_ADDR_MAX_STRZ_SIZE); - if(rpc->struct_add(vh, "Ssdd", "HOST", &node->dlist[j].host, + if(rpc->struct_add(vh, "Ssddjj", "HOST", &node->dlist[j].host, "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, - "PROTOID", (int)node->dlist[j].proto) < 0) { + "PROTOID", (int)node->dlist[j].proto, + "DNSTIME_SEC", (unsigned long)node->dlist[j].dnstime.tv_sec, + "DNSTIME_USEC", (unsigned long)node->dlist[j].dnstime.tv_usec) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; }

2 years, 7 months

git:master:a7e9eb08: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a7e9eb0897a0ea512a4c72c44ced9a14113099ff URL: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-08T13:31:17+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… Patch: https://github.com/kamailio/kamailio/commit/a7e9eb0897a0ea512a4c72c44ced9a1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 66659be123..b74ca1841a 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1684,15 +1684,18 @@ kamcmd dispatcher.ping_active 0 * _group_: destination group id * _address_: address of the destination in the _group_ * _flags_ (optional): as described in the list file format, default 0 + * _priority_ (optional): as described in the list file format, + default 0 * _attrs_ (optional): as described in the list file format, default "" Example: ... -# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _attrs_ +# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _priority_ _attrs_ kamcmd dispatcher.add 2 sip:127.0.0.1:5080 kamcmd dispatcher.add 3 sip:127.0.0.1:5075 8 -kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 +kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 0 duid=abc;socket=udp:127.0.0.1:506 +0 ... 5.7. dispatcher.remove

2 years, 7 months

git:master:8e211bc1: dispatcher: docs updated for rpc add command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8e211bc196abd49a635192f788364afad13c5a45 URL: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T13:28:23+02:00 dispatcher: docs updated for rpc add command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… Patch: https://github.com/kamailio/kamailio/commit/8e211bc196abd49a635192f788364af… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 23dcb513e6..1e67256c88 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -2082,8 +2082,9 @@ DEST: { <function moreinfo="none">dispatcher.add</function> </title> <para> - Add a destination address to the in-memory dispatcher list. Reloading the dispatcher will remove - any destinations that are only added to the in-memory dispatcher list. + Add a destination address to the in-memory dispatcher list. Reloading + the dispatcher will remove any destinations that are only added to the + in-memory dispatcher list. </para> <para> Name: <emphasis>dispatcher.add</emphasis> @@ -2097,6 +2098,9 @@ DEST: { <listitem><para>_flags_ (optional): as described in the list file format, default 0</para></listitem> + <listitem><para>_priority_ (optional): as described in the list file format, + default 0</para></listitem> + <listitem><para>_attrs_ (optional): as described in the list file format, default ""</para></listitem> @@ -2106,10 +2110,10 @@ DEST: { </para> <programlisting format="linespecific"> ... -# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _attrs_ +# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _priority_ _attrs_ &sercmd; dispatcher.add 2 sip:127.0.0.1:5080 &sercmd; dispatcher.add 3 sip:127.0.0.1:5075 8 -&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 +&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 0 duid=abc;socket=udp:127.0.0.1:5060 ... </programlisting> </section>

2 years, 7 months

git:master:a7ade4f3: dispatcher: rpc command to add a record updated to get priority

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a7ade4f3c6c2439ebc286c0c595c92b88550dbc3 URL: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-08T13:25:31+02:00 dispatcher: rpc command to add a record updated to get priority --- 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/a7ade4f3c6c2439ebc286c0c595c92b… Patch: https://github.com/kamailio/kamailio/commit/a7ade4f3c6c2439ebc286c0c595c92b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b82bc89b90..0f6a6b178f 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2611,12 +2611,11 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) } /* add dispatcher entry to in-memory dispatcher list */ -int ds_add_dst(int group, str *address, int flags, str *attrs) +int ds_add_dst(int group, str *address, int flags, int priority, str *attrs) { - int setn, priority; + int setn; setn = _ds_list_nr; - priority = 0; *ds_next_idx = (*ds_crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*ds_next_idx]); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index fec204bfff..3eaa9894dd 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -145,7 +145,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit, int mode); int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_update_dst(struct sip_msg *msg, int upos, int mode); -int ds_add_dst(int group, str *address, int flags, str *attrs); +int ds_add_dst(int group, str *address, int flags, int priority, str *attrs); int ds_remove_dst(int group, str *address); int ds_update_state(sip_msg_t *msg, int group, str *address, int state, ds_rctx_t *rctx); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index e877e3bf6c..ccf579fba8 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1907,7 +1907,7 @@ static const char *dispatcher_rpc_add_doc[2] = { */ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { - int group, flags, nparams; + int group, flags, priority, nparams; str dest; str attrs = STR_NULL; @@ -1924,17 +1924,18 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) *ds_rpc_reload_time = time(NULL); flags = 0; + priority = 0; - nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); + nparams = rpc->scan(ctx, "dS*ddS", &group, &dest, &flags, &priority, &attrs); if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; - } else if (nparams <= 3) { + } else if (nparams <= 4) { attrs.s = 0; attrs.len = 0; } - if(ds_add_dst(group, &dest, flags, &attrs) != 0) { + if(ds_add_dst(group, &dest, flags, priority, &attrs) != 0) { rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; }

2 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022