sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
283 discussions

[kamailio/kamailio] mqueue: add mqueue_mode modparam (PR #3053)

by Stefan Mititelu

#### 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:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a mqueue parameter to control the mq_add() mode. 0 - default, no changes in behavior 1 - add unique keys, keep oldest 2 - add unique keys, keep newest You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3053 -- Commit Summary -- * mqueue: add mqueue_mode modparam -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (40) M src/modules/mqueue/mqueue_api.c (44) M src/modules/mqueue/mqueue_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3053.patch https://github.com/kamailio/kamailio/pull/3053.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3053 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3053(a)github.com>

2 years, 1 month

git:master:19a8c97b: corex: new transformation {sock.attr}

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 19a8c97b0b4089966af6b1705bf5eaee7554e30b URL: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T09:39:29+02:00 corex: new transformation {sock.attr} - get attributes of a socket address proto:host:port --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_var.c Modified: src/modules/corex/corex_var.h --- Diff: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae… Patch: https://github.com/kamailio/kamailio/commit/19a8c97b0b4089966af6b1705bf5eae…

2 years, 1 month

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

by Kamailio Dev

Module: kamailio Branch: master Commit: a3d88ed0128d5d9d94af3bc5b9bbc3e1dbe9aea7 URL: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-04-07T08:31:25+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… Patch: https://github.com/kamailio/kamailio/commit/a3d88ed0128d5d9d94af3bc5b9bbc3e… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index ff24e03f26..5472fd15ba 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1575,8 +1575,9 @@ kamcmd dispatcher.set_duid_state ip 2 xyz Name: dispatcher.list Parameters: - * _rmode_ - (optional) response mode - can be 'short' to get a - shorter version of groups and destinations + * _rmode_ - (optional) response mode - can be: 'short' to get a + shorter version of groups and destinations; 'full' to get more + attributes per destination Example: kamcmd dispatcher.list

2 years, 1 month

git:master:4e08fbcd: dispatcher: docs updated for rpc dispatcher.list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4e08fbcd45886dfa7d687cda68540ef548b23cf9 URL: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T08:27:19+02:00 dispatcher: docs updated for rpc dispatcher.list --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… Patch: https://github.com/kamailio/kamailio/commit/4e08fbcd45886dfa7d687cda68540ef… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index bcd0a49a71..6075d110fe 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1932,8 +1932,9 @@ onreply_route { <para>Parameters:</para> <itemizedlist> <listitem> - <para>_rmode_ - (optional) response mode - can be 'short' to get a - shorter version of groups and destinations</para> + <para>_rmode_ - (optional) response mode - can be: 'short' to get a + shorter version of groups and destinations; 'full' to get more + attributes per destination</para> </listitem> </itemizedlist> <para>

2 years, 1 month

git:master:68901fca: dispatcher: new option for rpc list command to print more attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 68901fca96a2ebfa812dd2b2c857e020e08e7331 URL: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-07T08:23:59+02:00 dispatcher: new option for rpc list command to print more attributes --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… Patch: https://github.com/kamailio/kamailio/commit/68901fca96a2ebfa812dd2b2c857e02… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index ccb8b1334a..8ae2fb7b68 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1587,6 +1587,7 @@ static const char *dispatcher_rpc_list_doc[2] = { #define DS_RPC_PRINT_NORMAL 1 #define DS_RPC_PRINT_SHORT 2 +#define DS_RPC_PRINT_FULL 3 /** * @@ -1604,6 +1605,7 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, int j; char c[3]; str data = STR_NULL; + char ipbuf[IP_ADDR_MAX_STRZ_SIZE]; if(!node) return 0; @@ -1644,11 +1646,26 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, else c[1] = 'X'; + if(rpc->struct_add(vh, "Ssd", "URI", &node->dlist[j].uri, "FLAGS", + c, "PRIORITY", node->dlist[j].priority) + < 0) { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return -1; + } + + 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, + "IPADDR", ipbuf, "PORT", (int)node->dlist[j].port, + "PROTOID", (int)node->dlist[j].proto) < 0) { + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return -1; + } + } + 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, - "ATTRS", &wh) < 0) { + if(rpc->struct_add(vh, "{", "ATTRS", &wh) < 0) { rpc->fault(ctx, 500, "Internal error creating dest struct"); return -1; } @@ -1669,13 +1686,6 @@ int ds_rpc_print_set(ds_set_t *node, rpc_t *rpc, void *ctx, void *rpc_handle, rpc->fault(ctx, 500, "Internal error creating attrs struct"); return -1; } - } else { - if(rpc->struct_add(vh, "Ssd", "URI", &node->dlist[j].uri, "FLAGS", - c, "PRIORITY", node->dlist[j].priority) - < 0) { - rpc->fault(ctx, 500, "Internal error creating dest struct"); - return -1; - } } if (ds_ping_latency_stats) { if(rpc->struct_add(vh, "{", "LATENCY", &lh) < 0) { @@ -1722,6 +1732,8 @@ static void dispatcher_rpc_list(rpc_t *rpc, void *ctx) if(n == 1) { if(smode.len==5 && strncasecmp(smode.s, "short", 5)==0) { vmode = DS_RPC_PRINT_SHORT; + } else if(smode.len==4 && strncasecmp(smode.s, "full", 4)==0) { + vmode = DS_RPC_PRINT_FULL; } }

2 years, 1 month

git:master:2eac6a0c: core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2eac6a0c2f2dd7c8831ef65fa9d92b88a79d23af URL: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T20:36:26+02:00 core: zero-ending ipv4 string in ip_addr2sbufz() like done for ipv6 --- Modified: src/core/ip_addr.c --- Diff: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… Patch: https://github.com/kamailio/kamailio/commit/2eac6a0c2f2dd7c8831ef65fa9d92b8… --- diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index cb07a3e60d..77ac233eee 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -237,7 +237,7 @@ int ip_addr2sbuf(struct ip_addr* ip, char* buff, int len) } -/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses */ +/* same as ip_addr2sbuf, but with [ ] around IPv6 addresses and ending \0 */ int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) { char *p; @@ -247,15 +247,15 @@ int ip_addr2sbufz(struct ip_addr* ip, char* buff, int len) switch(ip->af){ case AF_INET6: *p++ = '['; - sz = ip6tosbuf(ip->u.addr, p, len-2); + sz = ip6tosbuf(ip->u.addr, p, len-3); p += sz; *p++ = ']'; - *p=0; + *p = '\0'; return sz + 2; - break; case AF_INET: - return ip4tosbuf(ip->u.addr, buff, len); - break; + sz = ip4tosbuf(ip->u.addr, buff, len-1); + buff[sz] = '\0'; + return sz; default: LM_CRIT("unknown address family %d\n", ip->af); return 0;

2 years, 1 month

git:master:1dfeba4a: corex: support matching on listen string for $lsock(...) variable

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1dfeba4aeed8cd76c630108b2363155eab07801c URL: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T17:20:02+02:00 corex: support matching on listen string for $lsock(...) variable --- Modified: src/modules/corex/corex_var.c --- Diff: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… Patch: https://github.com/kamailio/kamailio/commit/1dfeba4aeed8cd76c630108b2363155… --- diff --git a/src/modules/corex/corex_var.c b/src/modules/corex/corex_var.c index 9fd1061184..b7575ec043 100644 --- a/src/modules/corex/corex_var.c +++ b/src/modules/corex/corex_var.c @@ -210,6 +210,9 @@ int pv_get_lsock(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) case 'n': si = ksr_get_socket_by_name(&lexpr.val); break; + case 'l': + si = ksr_get_socket_by_listen(&lexpr.val); + break; } if(si == NULL) { return pv_get_null(msg, param, res);

2 years, 1 month

git:master:bed923dd: core: helper function to get socket by listen string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bed923ddb92d9d7b694167f0276414373d3297c4 URL: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T17:00:02+02:00 core: helper function to get socket by listen string --- Modified: src/core/socket_info.c Modified: src/core/socket_info.h --- Diff: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… Patch: https://github.com/kamailio/kamailio/commit/bed923ddb92d9d7b694167f02764143… --- diff --git a/src/core/socket_info.c b/src/core/socket_info.c index a60c4c5678..2b29d2b95c 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -844,6 +844,40 @@ socket_info_t* ksr_get_socket_by_name(str *sockname) return NULL; } +socket_info_t* ksr_get_socket_by_listen(str *sockstr) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->sock_str.s == NULL) { + continue; + } + LM_DBG("checking if listen %.*s matches %.*s\n", + sockstr->len, sockstr->s, + si->sock_str.len, si->sock_str.s); + if (sockstr->len == si->sock_str.len + && strncasecmp(sockstr->s, si->sock_str.s, + sockstr->len)==0) { + return si; + } + } + } while((c_proto = next_proto(c_proto))!=0); + + return NULL; +} + /* checks if the proto:port is one of the ports we listen on * and returns the corresponding socket_info structure. * if proto==0 (PROTO_NONE) the protocol is ignored diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 77baeb42fb..0b517de2de 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -104,6 +104,7 @@ struct socket_info* grep_sock_info_by_port(unsigned short port, struct socket_info* find_si(struct ip_addr* ip, unsigned short port, unsigned short proto); socket_info_t* ksr_get_socket_by_name(str *sockname); +socket_info_t* ksr_get_socket_by_listen(str *sockstr); struct socket_info** get_sock_info_list(unsigned short proto);

2 years, 1 month

git:master:507b8ab6: corex: new variable $lsock(expr) - get listen socket attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 507b8ab6e109e8b8ec231b2436324c534497c794 URL: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T14:02:10+02:00 corex: new variable $lsock(expr) - get listen socket attributes - the expr is an expression to match the socket and specify the field to return - example: "n/s1/listen" - match the socket with the n[ame] "s1" and return the listen address - wip --- Modified: src/modules/corex/corex_mod.c Modified: src/modules/corex/corex_var.c Modified: src/modules/corex/corex_var.h --- Diff: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5… Patch: https://github.com/kamailio/kamailio/commit/507b8ab6e109e8b8ec231b2436324c5…

2 years, 1 month

git:master:61b32b46: core: count and store global index for listen sockets at startup

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 61b32b46afd7cc0a82f33aa3d92a5e76c4d87fee URL: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-06T13:54:59+02:00 core: count and store global index for listen sockets at startup --- Modified: src/core/ip_addr.h Modified: src/core/socket_info.c Modified: src/core/socket_info.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… Patch: https://github.com/kamailio/kamailio/commit/61b32b46afd7cc0a82f33aa3d92a5e7… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 9205def123..c3f423123e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -110,6 +110,7 @@ typedef struct advertise_info { typedef struct socket_info { int socket; + int gindex; /* global index in the lists of all sockets */ str name; /* name - eg.: foo.bar or 10.0.0.1 */ struct ip_addr address; /* ip address */ str address_str; /*ip address converted to string -- optimization*/ diff --git a/src/core/socket_info.c b/src/core/socket_info.c index 500945a22a..a60c4c5678 100644 --- a/src/core/socket_info.c +++ b/src/core/socket_info.c @@ -762,6 +762,54 @@ struct socket_info* grep_sock_info(str* host, unsigned short port, return si; } +/** + * + */ +static int _ksr_sockets_no = 0; + +/** + * + */ +int ksr_sockets_no_get(void) +{ + return _ksr_sockets_no; +} + +/** + * + */ +void ksr_sockets_index(void) +{ + socket_info_t *si = NULL; + struct socket_info** list; + unsigned short c_proto; + + if(_ksr_sockets_no > 0) { + return; + } + + c_proto = PROTO_UDP; + do { + /* get the proper sock_list */ + list=get_sock_info_list(c_proto); + + if (list==0) { + /* disabled or unknown protocol */ + continue; + } + + for (si=*list; si; si=si->next) { + if(si->sockname.s == NULL) { + continue; + } + si->gindex = _ksr_sockets_no; + _ksr_sockets_no++; + } + } while((c_proto = next_proto(c_proto))!=0); + + LM_DBG("number of listen sockets: %d\n", _ksr_sockets_no); +} + socket_info_t* ksr_get_socket_by_name(str *sockname) { socket_info_t *si = NULL; diff --git a/src/core/socket_info.h b/src/core/socket_info.h index 50e4a063c1..77baeb42fb 100644 --- a/src/core/socket_info.h +++ b/src/core/socket_info.h @@ -163,4 +163,7 @@ int parse_protohostport(str* ins, sr_phostp_t *r); unsigned int ipv6_get_netif_scope(char *ipval); +int ksr_sockets_no_get(void); +void ksr_sockets_index(void); + #endif diff --git a/src/main.c b/src/main.c index 016a90cabe..2a268a689b 100644 --- a/src/main.c +++ b/src/main.c @@ -2851,6 +2851,7 @@ int main(int argc, char** argv) fprintf(stderr, "failed to initialize list addresses\n"); goto error; } + ksr_sockets_index(); if (default_core_cfg.dns_try_ipv6 && !(socket_types & SOCKET_T_IPV6)){ /* if we are not listening on any ipv6 address => no point * to try to resovle ipv6 addresses */

2 years, 1 month

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022