sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:34db0b1f: pv: added transformations for base58

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 34db0b1f5b0d57e938a7a74ce9787b9c1e63bf46 URL: https://github.com/kamailio/kamailio/commit/34db0b1f5b0d57e938a7a74ce9787b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-12T13:10:36+02:00 pv: added transformations for base58 - {s.encode.base58} - {s.decode.base58} --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/34db0b1f5b0d57e938a7a74ce9787b9… Patch: https://github.com/kamailio/kamailio/commit/34db0b1f5b0d57e938a7a74ce9787b9… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index ef88423838..3012126ff6 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -413,6 +413,30 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s = _tr_buffer; val->rs.len = i; break; + case TR_S_ENCODEBASE58: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + st.len = TR_BUFFER_SIZE-1; + st.s = b58_encode(_tr_buffer, &st.len, val->rs.s, val->rs.len); + if (st.s==NULL) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = st.s; + val->rs.len = st.len; + break; + case TR_S_DECODEBASE58: + if(!(val->flags&PV_VAL_STR)) + val->rs.s = int2str(val->ri, &val->rs.len); + st.len = TR_BUFFER_SIZE-1; + st.s = b58_decode(_tr_buffer, &st.len, val->rs.s, val->rs.len); + if (st.s==NULL) + return -1; + memset(val, 0, sizeof(pv_value_t)); + val->flags = PV_VAL_STR; + val->rs.s = st.s; + val->rs.len = st.len; + break; case TR_S_ENCODEBASE64: if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); @@ -2111,6 +2135,12 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==11 && strncasecmp(name.s, "decode.7bit", 11)==0) { t->subtype = TR_S_DECODE7BIT; goto done; + } else if(name.len==13 && strncasecmp(name.s, "encode.base58", 13)==0) { + t->subtype = TR_S_ENCODEBASE58; + goto done; + } else if(name.len==13 && strncasecmp(name.s, "decode.base58", 13)==0) { + t->subtype = TR_S_DECODEBASE58; + goto done; } else if(name.len==13 && strncasecmp(name.s, "encode.base64", 13)==0) { t->subtype = TR_S_ENCODEBASE64; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index ec6bb7fb37..7b7b15fb03 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -32,7 +32,7 @@ enum _tr_type { TR_NONE=0, TR_STRING, TR_URI, TR_PARAMLIST, TR_NAMEADDR, TR_TOBODY, TR_LINE }; -enum _tr_s_subtype { +enum _tr_s_subtype { TR_S_NONE=0, TR_S_LEN, TR_S_INT, TR_S_MD5, TR_S_SHA256, TR_S_SHA384, TR_S_SHA512, TR_S_SUBSTR, TR_S_SELECT, TR_S_ENCODEHEXA, TR_S_DECODEHEXA, TR_S_ENCODE7BIT, TR_S_DECODE7BIT, TR_S_ENCODEBASE64, TR_S_DECODEBASE64, @@ -40,7 +40,8 @@ enum _tr_s_subtype { TR_S_ESCAPEPARAM, TR_S_UNESCAPEPARAM, TR_S_TOLOWER, TR_S_TOUPPER, TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, - TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV + TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, + TR_S_ENCODEBASE58, TR_S_DECODEBASE58 }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

7 years

git:master:a937c093: core: added base58 encoding and decoding

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a937c093b183c57badcd09c8d996c4f8ad60b2a7 URL: https://github.com/kamailio/kamailio/commit/a937c093b183c57badcd09c8d996c4f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-12T12:59:21+02:00 core: added base58 encoding and decoding --- Modified: src/core/basex.c Modified: src/core/basex.h --- Diff: https://github.com/kamailio/kamailio/commit/a937c093b183c57badcd09c8d996c4f… Patch: https://github.com/kamailio/kamailio/commit/a937c093b183c57badcd09c8d996c4f…

7 years

git:5.0:56466265: core: return aliases list as an array in core.aliases_list

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: 5646626518d670954158e59a5e501f7b5714dea3 URL: https://github.com/kamailio/kamailio/commit/5646626518d670954158e59a5e501f7… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-12T10:53:36+02:00 core: return aliases list as an array in core.aliases_list (cherry picked from commit 13c84b8275f2539e8ca03bec38b79110043d75d2) --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/5646626518d670954158e59a5e501f7… Patch: https://github.com/kamailio/kamailio/commit/5646626518d670954158e59a5e501f7… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index fadabf5a7f..b7e4b020bb 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -876,14 +876,16 @@ static const char* core_aliases_list_doc[] = { static void core_aliases_list(rpc_t* rpc, void* c) { void *hr; + void *hs; void *ha; struct host_alias* a; rpc->add(c, "{", &hr); rpc->struct_add(hr, "s", "myself_callbacks", is_check_self_func_list_set()?"yes":"no"); + rpc->struct_add(hr, "[", "aliases", &hs); for(a=aliases; a; a=a->next) { - rpc->struct_add(hr, "{", "alias", &ha); + rpc->struct_add(hs, "{", "alias", &ha); rpc->struct_add(ha, "sS", "proto", proto2a(a->proto), "address", &a->alias

7 years

git:5.0:adb39eb5: core: set RET_ARRAY flag for core.sockets_list command

by Federico Cabiddu

Module: kamailio Branch: 5.0 Commit: adb39eb5ad3f9d71f6e4eb3ab49682a38185171b URL: https://github.com/kamailio/kamailio/commit/adb39eb5ad3f9d71f6e4eb3ab49682a… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-07-12T10:53:29+02:00 core: set RET_ARRAY flag for core.sockets_list command (cherry picked from commit 38f514064a326f759e0e88adeffd03b32b35d6c0) --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/adb39eb5ad3f9d71f6e4eb3ab49682a… Patch: https://github.com/kamailio/kamailio/commit/adb39eb5ad3f9d71f6e4eb3ab49682a… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 9d62617bdd..fadabf5a7f 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -989,7 +989,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

7 years

git:master:272783e7: Merge pull request #1185 from grumvalski/core_rpc_fmt

by GitHub

Module: kamailio Branch: master Commit: 272783e770c440c7a19ab986c1d757ebe8217905 URL: https://github.com/kamailio/kamailio/commit/272783e770c440c7a19ab986c1d757e… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-12T10:52:25+02:00 Merge pull request #1185 from grumvalski/core_rpc_fmt Adapt some core rpc command to json --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/272783e770c440c7a19ab986c1d757e… Patch: https://github.com/kamailio/kamailio/commit/272783e770c440c7a19ab986c1d757e… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 9d62617bdd..b7e4b020bb 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -876,14 +876,16 @@ static const char* core_aliases_list_doc[] = { static void core_aliases_list(rpc_t* rpc, void* c) { void *hr; + void *hs; void *ha; struct host_alias* a; rpc->add(c, "{", &hr); rpc->struct_add(hr, "s", "myself_callbacks", is_check_self_func_list_set()?"yes":"no"); + rpc->struct_add(hr, "[", "aliases", &hs); for(a=aliases; a; a=a->next) { - rpc->struct_add(hr, "{", "alias", &ha); + rpc->struct_add(hs, "{", "alias", &ha); rpc->struct_add(ha, "sS", "proto", proto2a(a->proto), "address", &a->alias @@ -989,7 +991,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

7 years

git:master:13c84b82: core: return aliases list as an array in core.aliases_list

by grumvalski

Module: kamailio Branch: master Commit: 13c84b8275f2539e8ca03bec38b79110043d75d2 URL: https://github.com/kamailio/kamailio/commit/13c84b8275f2539e8ca03bec38b7911… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-07-12T09:11:16+02:00 core: return aliases list as an array in core.aliases_list --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/13c84b8275f2539e8ca03bec38b7911… Patch: https://github.com/kamailio/kamailio/commit/13c84b8275f2539e8ca03bec38b7911… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index fadabf5a7f..b7e4b020bb 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -876,14 +876,16 @@ static const char* core_aliases_list_doc[] = { static void core_aliases_list(rpc_t* rpc, void* c) { void *hr; + void *hs; void *ha; struct host_alias* a; rpc->add(c, "{", &hr); rpc->struct_add(hr, "s", "myself_callbacks", is_check_self_func_list_set()?"yes":"no"); + rpc->struct_add(hr, "[", "aliases", &hs); for(a=aliases; a; a=a->next) { - rpc->struct_add(hr, "{", "alias", &ha); + rpc->struct_add(hs, "{", "alias", &ha); rpc->struct_add(ha, "sS", "proto", proto2a(a->proto), "address", &a->alias

7 years

git:master:38f51406: core: set RET_ARRAY flag for core.sockets_list command

by grumvalski

Module: kamailio Branch: master Commit: 38f514064a326f759e0e88adeffd03b32b35d6c0 URL: https://github.com/kamailio/kamailio/commit/38f514064a326f759e0e88adeffd03b… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-07-12T09:04:13+02:00 core: set RET_ARRAY flag for core.sockets_list command --- Modified: src/core/core_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/38f514064a326f759e0e88adeffd03b… Patch: https://github.com/kamailio/kamailio/commit/38f514064a326f759e0e88adeffd03b… --- diff --git a/src/core/core_cmd.c b/src/core/core_cmd.c index 9d62617bdd..fadabf5a7f 100644 --- a/src/core/core_cmd.c +++ b/src/core/core_cmd.c @@ -989,7 +989,7 @@ static rpc_export_t core_rpc_methods[] = { {"core.udp4_raw_info", core_udp4rawinfo, core_udp4rawinfo_doc, 0}, {"core.aliases_list", core_aliases_list, core_aliases_list_doc, 0}, - {"core.sockets_list", core_sockets_list, core_sockets_list_doc, 0}, + {"core.sockets_list", core_sockets_list, core_sockets_list_doc, RET_ARRAY}, #ifdef USE_DNS_CACHE {"dns.mem_info", dns_cache_mem_info, dns_cache_mem_info_doc, 0 },

7 years

[kamailio/kamailio] Adapt some core rpc command to json (#1185)

by Federico Cabiddu

Recently playing with jsonrpcs I found an issue with core.sockets_list and core.aliases_list commands called via jsonrpc_dispatch. The problem for the first is that the socket's list is that the JSON produced is like { "jsonrpc": "2.0", "result": { "socket": { "proto": "udp", "address": "XX.XX.XX.XX", "ipaddress": "XX.XX.XX.XX", "port": "5060", "mcast": "no", "mhomed": "no" }, "socket": { "proto": "udp", "address": "XX.XX.XX.XX", "ipaddress": "XX.XX.XX.XX", "port": "5060", "mcast": "no", "mhomed": "no" }, .... }, "id": 1 } While this is a valid JSON document, the fact that the "socket" key is defined several time in the same object makes many parsers not to properly parse it and only keep the last value. Solution for this is to set the RET_ARRAY flag for the rpc command core.sockets_list reply so that the jsonrpcs module will create an array for the sockets instead on an object. Similar issue for the aliases list returned by the core.aliases_list command: in this case the proposed solution is to add an "aliases" array to the rpc reply. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1185 -- Commit Summary -- * core: set RET_ARRAY flag for core.sockets_list command * core: return aliases list as an array in core.aliases_list -- File Changes -- M src/core/core_cmd.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1185.patch https://github.com/kamailio/kamailio/pull/1185.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/1185

7 years

git:master:76911ea0: modules: readme files regenerated - cplc ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 76911ea023f2a1b261015aa8569380e7f286be2e URL: https://github.com/kamailio/kamailio/commit/76911ea023f2a1b261015aa8569380e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-12T10:46:34+02:00 modules: readme files regenerated - cplc ... [skip ci] --- Modified: src/modules/cplc/README --- Diff: https://github.com/kamailio/kamailio/commit/76911ea023f2a1b261015aa8569380e… Patch: https://github.com/kamailio/kamailio/commit/76911ea023f2a1b261015aa8569380e… --- diff --git a/src/modules/cplc/README b/src/modules/cplc/README index 58d17ec8e9..903fa0fc86 100644 --- a/src/modules/cplc/README +++ b/src/modules/cplc/README @@ -32,7 +32,7 @@ Bogdan-Andrei Iancu 3.7. cpl_dtd_file (string) 3.8. log_dir (string) 3.9. proxy_recurse (int) - 3.10. proxy_route (int) + 3.10. proxy_route (string) 3.11. case_sensitive (int) 3.12. realm_prefix (string) 3.13. timer_avp (string) @@ -99,7 +99,7 @@ Chapter 1. Admin Guide 3.7. cpl_dtd_file (string) 3.8. log_dir (string) 3.9. proxy_recurse (int) - 3.10. proxy_route (int) + 3.10. proxy_route (string) 3.11. case_sensitive (int) 3.12. realm_prefix (string) 3.13. timer_avp (string) @@ -168,7 +168,7 @@ Chapter 1. Admin Guide 3.7. cpl_dtd_file (string) 3.8. log_dir (string) 3.9. proxy_recurse (int) - 3.10. proxy_route (int) + 3.10. proxy_route (string) 3.11. case_sensitive (int) 3.12. realm_prefix (string) 3.13. timer_avp (string) @@ -293,17 +293,17 @@ modparam("cpl-c","log_dir","/var/log/kamailio/cpl") modparam("cpl-c","proxy_recurse",2) ... -3.10. proxy_route (int) +3.10. proxy_route (string) Before doing proxy (forward), a script route can be executed. All modifications made by that route will be reflected only for the current branch. - Default value of this parameter is 0 (none). + Default value of this parameter is NULL (none). Example 1.10. Set proxy_route parameter ... -modparam("cpl-c","proxy_route",1) +modparam("cpl-c","proxy_route","1") ... 3.11. case_sensitive (int)

7 years

git:master:027871f7: cplc: use route names to set proxy_route modparam

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 027871f7a91cf288d36029a4f339801e8b620d10 URL: https://github.com/kamailio/kamailio/commit/027871f7a91cf288d36029a4f339801… Author: Oriol Capsada <ocapsada(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-12T10:42:48+02:00 cplc: use route names to set proxy_route modparam - Changed proxy_route modparam type to string. The route to be executed needs to be defined by name as the current id definition led to some unpredictable behavior. --- Modified: src/modules/cplc/cplc.c Modified: src/modules/cplc/doc/cplc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/027871f7a91cf288d36029a4f339801… Patch: https://github.com/kamailio/kamailio/commit/027871f7a91cf288d36029a4f339801… --- diff --git a/src/modules/cplc/cplc.c b/src/modules/cplc/cplc.c index 5a2b8972dc..cb47ffc4e0 100644 --- a/src/modules/cplc/cplc.c +++ b/src/modules/cplc/cplc.c @@ -62,6 +62,7 @@ static str db_table = str_init("cpl"); /* database table */ static char *dtd_file = 0; /* name of the DTD file for CPL parser */ static char *lookup_domain = 0; static str timer_avp = STR_NULL; /* name of variable timer AVP */ +static str proxy_route = STR_NULL; struct cpl_enviroment cpl_env = { @@ -132,7 +133,7 @@ static param_export_t params[] = { {"db_table", PARAM_STR, &db_table }, {"cpl_dtd_file", PARAM_STRING, &dtd_file }, {"proxy_recurse", INT_PARAM, &cpl_env.proxy_recurse }, - {"proxy_route", INT_PARAM, &cpl_env.proxy_route }, + {"proxy_route", PARAM_STR, &proxy_route }, {"log_dir", PARAM_STRING, &cpl_env.log_dir }, {"case_sensitive", INT_PARAM, &cpl_env.case_sensitive }, {"realm_prefix", PARAM_STR, &cpl_env.realm_prefix }, @@ -232,6 +233,14 @@ static int cpl_init(void) goto error; } + if (proxy_route.len>0) { + cpl_env.proxy_route=route_lookup(&main_rt, proxy_route.s); + if (cpl_env.proxy_route==-1) { + LM_CRIT("route <%s> defined in proxy_route does not exist\n",proxy_route.s); + goto error; + } + } + /* fix the timer_avp name */ if (timer_avp.s && timer_avp.len > 0) { if (pv_parse_spec(&timer_avp, &avp_spec)==0 diff --git a/src/modules/cplc/doc/cplc_admin.xml b/src/modules/cplc/doc/cplc_admin.xml index ac832a1e5f..9d7ed7749e 100644 --- a/src/modules/cplc/doc/cplc_admin.xml +++ b/src/modules/cplc/doc/cplc_admin.xml @@ -280,7 +280,7 @@ modparam("cpl-c","proxy_recurse",2) </example> </section> <section> - <title><varname>proxy_route</varname> (int)</title> + <title><varname>proxy_route</varname> (string)</title> <para> Before doing proxy (forward), a script route can be executed. All modifications made by that route will be reflected only for @@ -288,14 +288,14 @@ modparam("cpl-c","proxy_recurse",2) </para> <para> <emphasis> - Default value of this parameter is 0 (none). + Default value of this parameter is NULL (none). </emphasis> </para> <example> <title>Set <varname>proxy_route</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("cpl-c","proxy_route",1) +modparam("cpl-c","proxy_route","1") ... </programlisting> </example>

7 years

← Newer
1
...
28
29
30
31
32
33
34
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017