sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

git:master:1124beaa: modules: readme files regenerated - htable ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 1124beaa61b4a02f47080e6524ae961cff1822bc URL: https://github.com/kamailio/kamailio/commit/1124beaa61b4a02f47080e6524ae961… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-06-28T16:10:09+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/presence/README Modified: src/modules/rls/README Modified: src/modules/rtpengine/README Modified: src/modules/userblacklist/README --- Diff: https://github.com/kamailio/kamailio/commit/1124beaa61b4a02f47080e6524ae961… Patch: https://github.com/kamailio/kamailio/commit/1124beaa61b4a02f47080e6524ae961…

5 years, 4 months

git:master:1c4af823: pv: relax uri and params transfromation parsing when separator is last char

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1c4af823c39d28b694c1dec607d8d72c5b726456 URL: https://github.com/kamailio/kamailio/commit/1c4af823c39d28b694c1dec607d8d72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-28T16:01:43+02:00 pv: relax uri and params transfromation parsing when separator is last char - more flexible in parsing custom values, detection done in transformations code --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/1c4af823c39d28b694c1dec607d8d72… Patch: https://github.com/kamailio/kamailio/commit/1c4af823c39d28b694c1dec607d8d72… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 17c6a3e204..8ab46d328f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1232,6 +1232,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, param_hooks_t phooks; param_t *pit=NULL; str sproto; + int dlen = 0; if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1; @@ -1266,8 +1267,11 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, free_params(_tr_uri_params); _tr_uri_params = 0; } + if(_tr_uri.len>4 && _tr_uri.s[_tr_uri.len-1]==';') { + dlen = 1; + } /* parse uri -- params only when requested */ - if(parse_uri(_tr_uri.s, _tr_uri.len, &_tr_parsed_uri)!=0) + if(parse_uri(_tr_uri.s, _tr_uri.len - dlen, &_tr_parsed_uri)!=0) { LM_ERR("invalid uri [%.*s]\n", val->rs.len, val->rs.s); @@ -1505,6 +1509,9 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, /* parse params */ sv = _tr_params_str; + if(sv.len>1 && sv.s[sv.len - 1] == _tr_params_separator) { + sv.len--; + } if (parse_params2(&sv, CLASS_ANY, &phooks, &_tr_params_list, _tr_params_separator)<0) return -1;

5 years, 4 months

git:master:f87adf6a: htable: docs - rephrased info for db_expires to clarify its purpose

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f87adf6aba3fcebfe162341bc45d130365d34f5e URL: https://github.com/kamailio/kamailio/commit/f87adf6aba3fcebfe162341bc45d130… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-28T14:53:02+02:00 htable: docs - rephrased info for db_expires to clarify its purpose --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f87adf6aba3fcebfe162341bc45d130… Patch: https://github.com/kamailio/kamailio/commit/f87adf6aba3fcebfe162341bc45d130… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 859f7787ca..d814881044 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -600,9 +600,16 @@ modparam("htable", "timer_interval", 10) <section id="htable.p.db_expires"> <title><varname>db_expires</varname> (integer)</title> <para> - If set to 1, the module will load/save the expires values of the items in - hash table from/to database. It applies only to hash tables that - have the auto-expires attribute defined. + If set to 1, the module loads/saves the value for expire of + the items in hash table from/to database. It applies only to hash + tables that have the auto-expires attribute defined. If set to 0, + only the key name and the value are loaded, the expires for each + item being set to 0. + </para> + <para> + Note that the module is not reloading automatically the items from + database when they expire, the reloading can be done only via RPC + command. </para> <para> <emphasis>

5 years, 4 months

git:master:0fcb2607: uac: debug messages when initializing the remote uac registration

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0fcb2607d2d63a0e10fce189b6881ac15b985bb4 URL: https://github.com/kamailio/kamailio/commit/0fcb2607d2d63a0e10fce189b6881ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-28T08:07:02+02:00 uac: debug messages when initializing the remote uac registration --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/0fcb2607d2d63a0e10fce189b6881ac… Patch: https://github.com/kamailio/kamailio/commit/0fcb2607d2d63a0e10fce189b6881ac… --- diff --git a/src/modules/uac/uac.c b/src/modules/uac/uac.c index 5a99e0820b..53a1b13cdf 100644 --- a/src/modules/uac/uac.c +++ b/src/modules/uac/uac.c @@ -382,6 +382,7 @@ static int child_init(int rank) kam_srand(getpid() * 17 + time(0)); uac_reg_load_db(); + LM_DBG("run initial uac registration routine\n"); uac_reg_timer(0); for(;;){ /* update the local config framework structures */ diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 625cd434be..f75c7cf38a 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -579,6 +579,8 @@ int reg_ht_add(reg_uac_t *reg) reg_ht_add_byuuid(nr); counter_inc(regtotal); + LM_DBG("added uuid: %.*s - l_user: %.*s\n", nr->l_uuid.len, nr->l_uuid.s, + nr->l_username.len, nr->l_username.s); return 0; }

5 years, 4 months

git:master:3716541d: sdpops: exported to kemi the functions to detect sdp with codecs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3716541db01c09bd00998bdbd0c35b3a842cdaf5 URL: https://github.com/kamailio/kamailio/commit/3716541db01c09bd00998bdbd0c35b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-27T16:26:20+02:00 sdpops: exported to kemi the functions to detect sdp with codecs - sdp_with_codecs_by_id() and sdp_with_codecs_by_name() --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3716541db01c09bd00998bdbd0c35b3… Patch: https://github.com/kamailio/kamailio/commit/3716541db01c09bd00998bdbd0c35b3… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index 11d8d69c2a..f71dfcf46b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -2209,6 +2209,16 @@ static sr_kemi_t sr_kemi_sdpops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sdpops"), str_init("sdp_with_codecs_by_id"), + SR_KEMIP_INT, sdp_with_codecs_by_id, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("sdp_with_codecs_by_name"), + SR_KEMIP_INT, sdp_with_codecs_by_name, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("sdpops"), str_init("sdp_get"), SR_KEMIP_INT, ki_sdp_get, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

5 years, 4 months

git:master:8266f0ee: call_obj: b/f acept optional limit parameter.

by Vicente Hernando

Module: kamailio Branch: master Commit: 8266f0ee05b1f2faf2d4148efca257f7322da4ce URL: https://github.com/kamailio/kamailio/commit/8266f0ee05b1f2faf2d4148efca257f… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-06-27T12:38:56+02:00 call_obj: b/f acept optional limit parameter. --- Modified: src/modules/call_obj/call_obj_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8266f0ee05b1f2faf2d4148efca257f… Patch: https://github.com/kamailio/kamailio/commit/8266f0ee05b1f2faf2d4148efca257f… --- diff --git a/src/modules/call_obj/call_obj_mod.c b/src/modules/call_obj/call_obj_mod.c index 1b5decb24c..72307e2d86 100644 --- a/src/modules/call_obj/call_obj_mod.c +++ b/src/modules/call_obj/call_obj_mod.c @@ -106,7 +106,7 @@ static void rpc_call_obj_list(rpc_t *rpc, void *ctx) cobj_elem_t *list = NULL; int rc = rpc->scan(ctx, "d*d", &duration, &limit); - if (rc != -1 && rc != 2) { + if (rc != 1 && rc != 2) { rpc->fault(ctx, 400, "requires arguments for duration number (and optionally limit)"); goto clean; }

5 years, 4 months

git:master:0669b71f: call_obj: KEMI functions call_obj.get and call_obj.free

by Vicente Hernando

Module: kamailio Branch: master Commit: 0669b71f52e5c5e1ee942921251787e28c968ea4 URL: https://github.com/kamailio/kamailio/commit/0669b71f52e5c5e1ee942921251787e… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-06-27T12:38:44+02:00 call_obj: KEMI functions call_obj.get and call_obj.free --- Modified: src/modules/call_obj/call_obj_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0669b71f52e5c5e1ee942921251787e… Patch: https://github.com/kamailio/kamailio/commit/0669b71f52e5c5e1ee942921251787e… --- diff --git a/src/modules/call_obj/call_obj_mod.c b/src/modules/call_obj/call_obj_mod.c index c8bc1786f0..1b5decb24c 100644 --- a/src/modules/call_obj/call_obj_mod.c +++ b/src/modules/call_obj/call_obj_mod.c @@ -9,6 +9,7 @@ #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" #include "../../core/trim.h" +#include "../../core/kemi.h" MODULE_VERSION @@ -363,3 +364,82 @@ static int w_call_obj_free(struct sip_msg* msg, char* num_obj) return 1; } + +/** + * Get a free object. + * + * /return -1 on error. + * /return number of free object on success. + */ +static int ki_call_obj_get(sip_msg_t *msg) +{ + str call_id; + if (get_call_id(msg, &call_id)) { + LM_ERR("Cannot get callid header\n"); + goto error; + } + LM_DBG("CallId: %.*s\n", call_id.len, call_id.s); + + uint64_t current_ts; + if (get_timestamp(&current_ts)) { + LM_ERR("error getting timestamp"); + goto error; + } + + int obj = cobj_get(current_ts, &call_id); + if (obj == -1) { + LM_ERR("Getting object\n"); + goto error; + } + /* obj >= 0 */ + + return obj; + +error: + return -1; +} + +/** + * Free an object. + * + * /param num_obj number of the object to free. + * /return 1 on success. + * /return 0 on error. + */ +static int ki_call_obj_free(sip_msg_t *msg, int num_obj) +{ + if (cobj_free(num_obj)) { + LM_ERR("Freeing object: %d\n", num_obj); + return 0; + } + + return 1; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_call_obj_exports[] = { + { str_init("call_obj"), str_init("get"), + SR_KEMIP_INT, ki_call_obj_get, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("call_obj"), str_init("free"), + SR_KEMIP_INT, ki_call_obj_free, + { 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_call_obj_exports); + return 0; +}

5 years, 4 months

git:master:a58b4c2a: call_obj_mod: no need to use a free function for call_obj_get.

by Vicente Hernando

Module: kamailio Branch: master Commit: a58b4c2afbffdd2584f553f8d7d36a84d40e2aee URL: https://github.com/kamailio/kamailio/commit/a58b4c2afbffdd2584f553f8d7d36a8… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2019-06-27T12:38:26+02:00 call_obj_mod: no need to use a free function for call_obj_get. --- Modified: src/modules/call_obj/call_obj_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a58b4c2afbffdd2584f553f8d7d36a8… Patch: https://github.com/kamailio/kamailio/commit/a58b4c2afbffdd2584f553f8d7d36a8… --- diff --git a/src/modules/call_obj/call_obj_mod.c b/src/modules/call_obj/call_obj_mod.c index 250a4003b4..c8bc1786f0 100644 --- a/src/modules/call_obj/call_obj_mod.c +++ b/src/modules/call_obj/call_obj_mod.c @@ -28,7 +28,7 @@ int call_obj_end = 0; /* module commands */ static cmd_export_t cmds[] = { - {"call_obj_get", (cmd_function)w_call_obj_get, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, + {"call_obj_get", (cmd_function)w_call_obj_get, 1, fixup_pvar_null, 0, ANY_ROUTE}, {"call_obj_free", (cmd_function)w_call_obj_free, 1, fixup_var_str_1, 0, ANY_ROUTE}, { 0, 0, 0, 0, 0, 0} };

5 years, 4 months

[kamailio/kamailio] Adding Support for Azure Database for MySQL Service (#1992)

by Mack Hendricks

#### 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 - [X] 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:  - [X ] PR should be backported to stable branches - [ X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The Azure Database for MySQL Service requires that usernames have the format of username@databasename. In the current implementation, the @ denotes that the next set of characters contains the database hostname, port (optionally) and database name. This patch modifies the parse_db_url() to look for multiple @ signs. If multiple exists, then the first @ sign will be used as part of the username. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1992 -- Commit Summary -- * db_mysql: added support for Azure Database for MySQL * db_mysql: added support for Azure Database for MySQL -- File Changes -- M src/lib/srdb1/db_id.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1992.patch https://github.com/kamailio/kamailio/pull/1992.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1992

5 years, 4 months

git:master:d419f427: lib/srdb1: support for username@domain in user id part of db url

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d419f427d2acf890e5e45c4f3e8e7a2b2fe4cead URL: https://github.com/kamailio/kamailio/commit/d419f427d2acf890e5e45c4f3e8e7a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-27T09:36:21+02:00 lib/srdb1: support for username@domain in user id part of db url - used by some cloud database services - reworked patch from GH #1992 --- Modified: src/lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/d419f427d2acf890e5e45c4f3e8e7a2… Patch: https://github.com/kamailio/kamailio/commit/d419f427d2acf890e5e45c4f3e8e7a2… --- diff --git a/src/lib/srdb1/db_id.c b/src/lib/srdb1/db_id.c index 9857f5a29c..35bf228a8f 100644 --- a/src/lib/srdb1/db_id.c +++ b/src/lib/srdb1/db_id.c @@ -107,21 +107,22 @@ static int parse_db_url(struct db_id* id, const str* url) }; enum state st; - unsigned int len, i, j, a; + unsigned int len, i, j, a, foundanother; const char* begin; char* prev_token; + foundanother = 0; prev_token = 0; if (!id || !url || !url->s) { goto err; } - + len = url->len; if (len < SHORTEST_DB_URL_LEN) { goto err; } - + /* Initialize all attributes to 0 */ memset(id, 0, sizeof(struct db_id)); st = ST_SCHEME; @@ -155,7 +156,7 @@ static int parse_db_url(struct db_id* id, const str* url) st = ST_USER_HOST; begin = url->s + i + 1; break; - + default: goto err; } @@ -164,6 +165,20 @@ static int parse_db_url(struct db_id* id, const str* url) case ST_USER_HOST: switch(url->s[i]) { case '@': + /* look for another @ to cope with username@domain user id */ + if (foundanother == 0) { + for (j = i + 1; j < url->len; j++) { + if (url->s[j] == '@') { + foundanother = 1; + break; + } + } + if (foundanother == 1) { + /* keep the current @ in the username */ + st = ST_USER_HOST; + break; + } + } st = ST_HOST; if (dupl_string(&id->username, begin, url->s + i) < 0) goto err; begin = url->s + i + 1; @@ -232,7 +247,7 @@ static int parse_db_url(struct db_id* id, const str* url) return 0; } break; - + case ST_DB: break; }

5 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019