sr-dev March 2022

sr-dev@lists.kamailio.org

10 participants
243 discussions

git:master:23c8ba29: corex: support adding dns srv records via dns_cache param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 23c8ba29ac4cd0ccbc3012e87e48f289bfb9d200 URL: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-03-01T13:45:54+01:00 corex: support adding dns srv records via dns_cache param --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… Patch: https://github.com/kamailio/kamailio/commit/23c8ba29ac4cd0ccbc3012e87e48f28… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index b4e0b67a87..b2fc9c09b2 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -383,6 +383,10 @@ static int corex_dns_cache_param_add(str *pval) unsigned short dns_type = 0; int dns_ttl = 0; int dns_flags = 0; + int dns_priority = 0; + int dns_weight = 0; + int dns_port = 0; + if(pval==NULL) { LM_ERR("invalid parameter\n"); @@ -414,8 +418,11 @@ static int corex_dns_cache_param_add(str *pval) || (pit->body.s[0]=='A'))) { dns_type = T_A; } else if((pit->body.len == 4) - && strncasecmp(pit->name.s, "aaaa", 4)==0) { + && strncasecmp(pit->body.s, "aaaa", 4)==0) { dns_type = T_AAAA; + } else if((pit->body.len == 3) + && strncasecmp(pit->body.s, "srv", 3)==0) { + dns_type = T_SRV; } } else if(pit->name.len==3 && strncasecmp(pit->name.s, "ttl", 3)==0) { @@ -433,6 +440,30 @@ static int corex_dns_cache_param_add(str *pval) return -1; } } + } else if(pit->name.len==8 + && strncasecmp(pit->name.s, "priority", 8)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_priority) < 0) { + LM_ERR("invalid priority: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==6 + && strncasecmp(pit->name.s, "weight", 6)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_weight) < 0) { + LM_ERR("invalid weight: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==4 + && strncasecmp(pit->name.s, "port", 4)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_port) < 0) { + LM_ERR("invalid port: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } } } @@ -440,9 +471,9 @@ static int corex_dns_cache_param_add(str *pval) &dns_name, dns_ttl, &dns_addr, - 0 /* priority */, - 0 /* weight */, - 0 /* port */, + dns_priority, /* priority */ + dns_weight, /* weight */ + dns_port, /* port */ dns_flags) == 0) { return 0; }

2 years, 9 months

git:master:78c8d084: db_redis: clean previous connection before trying to reconnect

by Victor Seva

Module: kamailio Branch: master Commit: 78c8d084e30373aacc456fd41062b68e6e82ea6f URL: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-03-01T10:35:23+01:00 db_redis: clean previous connection before trying to reconnect --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… Patch: https://github.com/kamailio/kamailio/commit/78c8d084e30373aacc456fd41062b68… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index 1166117961..5cf36ffb36 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -124,6 +124,11 @@ int db_redis_connect(km_redis_con_t *con) { #endif reply = NULL; + if(con->con) { + LM_DBG("free old connection first\n"); + redisFree(con->con); + } + // TODO: introduce require_master mod-param and check if we're indeed master // TODO: on carrier, if we have db fail-over, the currently connected // redis server will become slave without dropping connections?

2 years, 9 months

[kamailio/kamailio] add duk_module_node to module app_jsdt (PR #3038)

by Ian Carlson

#### 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:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #3037 #### Description I can not remember the last time I wrote any C which was likely a class assignment last century. Anyways I came across this issue and it seemed in reach to get the ball rolling. I know this PR needs more work but my goal is to share my progress to help move this feature forward. Based on https://github.com/svaarala/duktape/tree/master/extras/module-node added: - duk_module_node.h - duk_module_node.c updated: - app_jsdt_api.h - app_jsdt_api.c Included the extra header and initialize the bindings after 'load JS context' was created. added `cb_resolve_module` to resolve the full file system path for requested_id and parent_id added `cb_load_module` function which uses `jsdt_load_file` to load resolved file With absolute and relative modules working I met my current requirements to allow breaking routing into multiple smaller files. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3038 -- Commit Summary -- * app_jsdt: add duk_module_node for JS module resolution -- File Changes -- M src/modules/app_jsdt/app_jsdt_api.c (65) M src/modules/app_jsdt/app_jsdt_api.h (3) A src/modules/app_jsdt/duk_module_node.c (333) A src/modules/app_jsdt/duk_module_node.h (17) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3038.patch https://github.com/kamailio/kamailio/pull/3038.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3038 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3038(a)github.com>

2 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2022