sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:master:65a777f3: http_client: add missed useragent parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 65a777f3316fb3a3adfa61739a091bb9d61582a8 URL: https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb… Author: Vasiliy Ganchev <vance(a)ukr.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:16:55+01:00 http_client: add missed useragent parameter While preparing query_params, "useragent" was missed - add it. --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb… Patch: https://github.com/kamailio/kamailio/commit/65a777f3316fb3a3adfa61739a091bb… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index d19910f90f..3dfe21a8a9 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -552,6 +552,7 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, query_params.cacert = default_tls_cacert; query_params.ciphersuites = conn->ciphersuites; query_params.tlsversion = conn->tlsversion; + query_params.useragent = conn->useragent; query_params.verify_peer = conn->verify_peer; query_params.verify_host = conn->verify_host; query_params.timeout = conn->timeout;

7 years

[kamailio/kamailio] http_client: add missed useragent parameter (#1331)

by Vasiliy Ganchev

While preparing query_params, "useragent" was missed - add it. As before User-Agent was never present in HTTP requests. #### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1331 -- Commit Summary -- * http_client: add missed useragent parameter -- File Changes -- M src/modules/http_client/functions.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1331.patch https://github.com/kamailio/kamailio/pull/1331.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/1331

7 years

[kamailio/kamailio] Update textops.c (#1332)

by Sam

textops: fixed naming convention - The original function is named in_ rather than is_, updating to the same standard You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1332 -- Commit Summary -- * Update textops.c -- File Changes -- M src/modules/textops/textops.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1332.patch https://github.com/kamailio/kamailio/pull/1332.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/1332

7 years

git:master:ebd51dae: textops: fixed name of in_list() function export to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ebd51daea816a6bab3436e24de22d23d079d7c91 URL: https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:13:20+01:00 textops: fixed name of in_list() function export to kemi - reported by GH #1332 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23… Patch: https://github.com/kamailio/kamailio/commit/ebd51daea816a6bab3436e24de22d23… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cafb4520be..b05fdd6b31 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3940,7 +3940,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("textops"), str_init("is_list"), + { str_init("textops"), str_init("in_list"), SR_KEMIP_INT, ki_in_list, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

7 years

git:master:b524d25a: textops: kemi search_append() and search_append_body() have two params

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b524d25a3ba327d7a52544489d847932f1ee1a28 URL: https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d84793… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-25T08:09:49+01:00 textops: kemi search_append() and search_append_body() have two params - reported by GH #1333 --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d84793… Patch: https://github.com/kamailio/kamailio/commit/b524d25a3ba327d7a52544489d84793… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 7d2f71cf21..cafb4520be 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3832,12 +3832,12 @@ static sr_kemi_t sr_kemi_textops_exports[] = { }, { str_init("textops"), str_init("search_append"), SR_KEMIP_INT, ki_search_append, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("search_append_body"), SR_KEMIP_INT, ki_search_append_body, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("is_present_hf"),

7 years

git:master:f95fda89: app_lua: count also the special function when generating the rpc response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f95fda89d4532ba333aed835c72f102a7c032980 URL: https://github.com/kamailio/kamailio/commit/f95fda89d4532ba333aed835c72f102… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:50:05+01:00 app_lua: count also the special function when generating the rpc response --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f95fda89d4532ba333aed835c72f102… Patch: https://github.com/kamailio/kamailio/commit/f95fda89d4532ba333aed835c72f102… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index b4a44fab70..ac536878c9 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -673,12 +673,17 @@ static void app_lua_rpc_api_list(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error root reply"); return; } + + /* count the number of exported functions */ n = 0; for(i=0; i<SR_KEMI_LUA_EXPORT_SIZE; i++) { ket = sr_kemi_lua_export_get(i); if(ket==NULL) continue; n++; } + for(i=0; sr_kemi_app_lua_rpc_exports[i].fname.s!=NULL; i++) { + n++; + } if(rpc->struct_add(th, "d[", "msize", n,

7 years

git:master:7cbece0e: app_lua: print special kemi functions via rpc

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7cbece0e2e60f8c334bea97333b029d51e5b7e33 URL: https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:39:27+01:00 app_lua: print special kemi functions via rpc --- Modified: src/modules/app_lua/app_lua_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d… Patch: https://github.com/kamailio/kamailio/commit/7cbece0e2e60f8c334bea97333b029d… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index 4c431dd3ed..b4a44fab70 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -606,6 +606,54 @@ static void app_lua_rpc_list(rpc_t* rpc, void* ctx) return; } +/** + * only prototypes of special kemi exports in order to list via rpc + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_app_lua_rpc_exports[] = { + { str_init("pv"), str_init("get"), + SR_KEMIP_STR, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("seti"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("sets"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("unset"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pv"), str_init("is_null"), + SR_KEMIP_BOOL, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("x"), str_init("modf"), + SR_KEMIP_INT, NULL, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("x"), str_init("exit"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("x"), str_init("drop"), + SR_KEMIP_NONE, NULL, + { SR_KEMIP_NONE, 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 } } +}; static const char* app_lua_rpc_api_list_doc[2] = { "list kemi exports to lua", @@ -656,6 +704,22 @@ static void app_lua_rpc_api_list(rpc_t* rpc, void* ctx) return; } } + for(i=0; sr_kemi_app_lua_rpc_exports[i].fname.s!=NULL; i++) { + ket = &sr_kemi_app_lua_rpc_exports[i]; + if(rpc->struct_add(ih, "{", "func", &sh)<0) { + rpc->fault(ctx, 500, "Internal error internal structure"); + return; + } + if(rpc->struct_add(sh, "SSSS", + "ret", sr_kemi_param_map_get_name(ket->rtype), + "module", &ket->mname, + "name", &ket->fname, + "params", sr_kemi_param_map_get_params(ket->ptypes))<0) { + LM_ERR("failed to add the structure with attributes (%d)\n", i); + rpc->fault(ctx, 500, "Internal error creating dest struct"); + return; + } + } } rpc_export_t app_lua_rpc_cmds[] = {

7 years

git:master:e177266e: app_sqlang: detect if a kemi function was already added in exports list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e177266e8f113f1541b31496f9fb0c71ac751f17 URL: https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:15:42+01:00 app_sqlang: detect if a kemi function was already added in exports list --- Modified: src/modules/app_sqlang/app_sqlang_kemi_export.c Modified: src/modules/app_sqlang/utils/app_sqlang_ctl --- Diff: https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c7… Patch: https://github.com/kamailio/kamailio/commit/e177266e8f113f1541b31496f9fb0c7… --- diff --git a/src/modules/app_sqlang/app_sqlang_kemi_export.c b/src/modules/app_sqlang/app_sqlang_kemi_export.c index 52a79df9a3..08d045306c 100644 --- a/src/modules/app_sqlang/app_sqlang_kemi_export.c +++ b/src/modules/app_sqlang/app_sqlang_kemi_export.c @@ -9277,6 +9277,9 @@ SQFUNCTION sr_kemi_sqlang_export_associate(sr_kemi_t *ket) _sr_kemi_sqlang_export_list[i].ket = ket; return _sr_kemi_sqlang_export_list[i].pfunc; } + if(_sr_kemi_sqlang_export_list[i].ket==ket) { + return _sr_kemi_sqlang_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL; diff --git a/src/modules/app_sqlang/utils/app_sqlang_ctl b/src/modules/app_sqlang/utils/app_sqlang_ctl index f5a8375d4a..006dc82321 100755 --- a/src/modules/app_sqlang/utils/app_sqlang_ctl +++ b/src/modules/app_sqlang/utils/app_sqlang_ctl @@ -136,6 +136,9 @@ SQFUNCTION sr_kemi_sqlang_export_associate(sr_kemi_t *ket) _sr_kemi_sqlang_export_list[i].ket = ket; return _sr_kemi_sqlang_export_list[i].pfunc; } + if(_sr_kemi_sqlang_export_list[i].ket==ket) { + return _sr_kemi_sqlang_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

7 years

git:master:48d55652: app_jsdt: detect if a kemi function is already in exported list

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 48d55652fa36cb2b20540d1ebc7665476dfb1b1e URL: https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc76654… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:11:44+01:00 app_jsdt: detect if a kemi function is already in exported list --- Modified: src/modules/app_jsdt/app_jsdt_kemi_export.c Modified: src/modules/app_jsdt/utils/app_jsdt_ctl --- Diff: https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc76654… Patch: https://github.com/kamailio/kamailio/commit/48d55652fa36cb2b20540d1ebc76654… --- diff --git a/src/modules/app_jsdt/app_jsdt_kemi_export.c b/src/modules/app_jsdt/app_jsdt_kemi_export.c index a1f398f022..2150ab3dcc 100644 --- a/src/modules/app_jsdt/app_jsdt_kemi_export.c +++ b/src/modules/app_jsdt/app_jsdt_kemi_export.c @@ -9277,6 +9277,9 @@ duk_c_function sr_kemi_jsdt_export_associate(sr_kemi_t *ket) _sr_kemi_jsdt_export_list[i].ket = ket; return _sr_kemi_jsdt_export_list[i].pfunc; } + if(_sr_kemi_jsdt_export_list[i].ket==ket) { + return _sr_kemi_jsdt_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL; diff --git a/src/modules/app_jsdt/utils/app_jsdt_ctl b/src/modules/app_jsdt/utils/app_jsdt_ctl index eb1bd4c682..26e37aa4ca 100755 --- a/src/modules/app_jsdt/utils/app_jsdt_ctl +++ b/src/modules/app_jsdt/utils/app_jsdt_ctl @@ -136,6 +136,9 @@ duk_c_function sr_kemi_jsdt_export_associate(sr_kemi_t *ket) _sr_kemi_jsdt_export_list[i].ket = ket; return _sr_kemi_jsdt_export_list[i].pfunc; } + if(_sr_kemi_jsdt_export_list[i].ket==ket) { + return _sr_kemi_jsdt_export_list[i].pfunc; + } } LM_ERR("no more indexing slots\n"); return NULL;

7 years

git:master:50a9e2ec: app_lua: updated paths to included files from core in the ctl tool

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 50a9e2ec1cb86590a067dc23b2298b96a12bc232 URL: https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-24T19:05:58+01:00 app_lua: updated paths to included files from core in the ctl tool --- Modified: src/modules/app_lua/utils/app_lua_ctl --- Diff: https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b9… Patch: https://github.com/kamailio/kamailio/commit/50a9e2ec1cb86590a067dc23b2298b9… --- diff --git a/src/modules/app_lua/utils/app_lua_ctl b/src/modules/app_lua/utils/app_lua_ctl index e4ef9aca8c..a14c160b1d 100755 --- a/src/modules/app_lua/utils/app_lua_ctl +++ b/src/modules/app_lua/utils/app_lua_ctl @@ -36,7 +36,7 @@ cat > ../app_lua_kemi_export.h <<EOF #include <lua.h> #include <lauxlib.h> #include <lualib.h> -#include "../../kemi.h" +#include "../../core/kemi.h" #define SR_KEMI_LUA_EXPORT_SIZE ${KEMI_MAX_SIZE} @@ -87,7 +87,7 @@ cat > ../app_lua_kemi_export.c <<EOF #include <lauxlib.h> #include <lualib.h> -#include "../../dprint.h" +#include "../../core/dprint.h" #include "app_lua_sr.h" #include "app_lua_kemi_export.h"

7 years

← Newer
1
...
14
15
16
17
18
19
20
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017