sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:master:e1ef9f7f: modules: readme files regenerated - textops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e1ef9f7ffb8a720f9dfd6602bb8e36070148a706 URL: https://github.com/kamailio/kamailio/commit/e1ef9f7ffb8a720f9dfd6602bb8e360… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-31T17:16:25+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/e1ef9f7ffb8a720f9dfd6602bb8e360… Patch: https://github.com/kamailio/kamailio/commit/e1ef9f7ffb8a720f9dfd6602bb8e360… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 698c3858b3..00875a04b0 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -23,6 +23,12 @@ Juha Heinanen <jh(a)tutpro.com> +Edited by + +Ovidiu Sas + + <osas(a)voipembedded.com> + Copyright © 2003 FhG FOKUS __________________________________________________________________ @@ -904,7 +910,9 @@ if(has_body("application/sdp")) 4.32. is_audio_on_hold() The function returns true if the SIP message has a body attached and at - least one audio stream in on hold. + least one audio stream in on hold. Only RFC2543 is supported + (c=0.0.0.0). Hold detection based on RFC3264 is not supported + (a=sendonly/inactive). This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE.

7 years

git:master:be51e338: textops: documentaton updated for is_audio_on_hold()

by Ovidiu Sas

Module: kamailio Branch: master Commit: be51e338830f960cc27845136feaee4f101ed2c1 URL: https://github.com/kamailio/kamailio/commit/be51e338830f960cc27845136feaee4… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-10-31T12:13:51-04:00 textops: documentaton updated for is_audio_on_hold() - reported by Julia Boudniatsky <juliabo(a)gmail.com> --- Modified: src/modules/textops/doc/textops.xml Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/be51e338830f960cc27845136feaee4… Patch: https://github.com/kamailio/kamailio/commit/be51e338830f960cc27845136feaee4… --- diff --git a/src/modules/textops/doc/textops.xml b/src/modules/textops/doc/textops.xml index 3cc28dcb0a..d1b6e135e4 100644 --- a/src/modules/textops/doc/textops.xml +++ b/src/modules/textops/doc/textops.xml @@ -34,6 +34,11 @@ <surname>Heinanen</surname> <email>jh(a)tutpro.com</email> </editor> + <editor> + <firstname>Ovidiu</firstname> + <surname>Sas</surname> + <email>osas(a)voipembedded.com</email> + </editor> </authorgroup> <copyright> <year>2003</year> diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4cb99d708e..f94183dabf 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1258,6 +1258,8 @@ if(has_body("application/sdp")) <para> The function returns <emphasis>true</emphasis> if the SIP message has a body attached and at least one audio stream in on hold. + Only RFC2543 is supported (c=0.0.0.0). + Hold detection based on RFC3264 is not supported (a=sendonly/inactive). </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

7 years

git:5.0:d0b49abb: acc: allow accounting only for external accounting engine

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: d0b49abb54a6e15edb53f4d8bc7030e4078bb2ad URL: https://github.com/kamailio/kamailio/commit/d0b49abb54a6e15edb53f4d8bc7030e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-31T12:38:47+01:00 acc: allow accounting only for external accounting engine - have accounting via external engines without a need to have log flag set - backport of ccf71c68f7c0af4ac761e2e0c2dc1ac11662261f --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/d0b49abb54a6e15edb53f4d8bc7030e… Patch: https://github.com/kamailio/kamailio/commit/d0b49abb54a6e15edb53f4d8bc7030e… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index a7ba8c0d75..84e9b16bdc 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -781,6 +781,52 @@ int acc_diam_request( struct sip_msg *req ) #endif /** + * @brief test if acc flag from enternal engines is set + */ +int is_eng_acc_on(sip_msg_t *msg) +{ + acc_engine_t *e; + + e = acc_api_get_engines(); + + if(e==NULL) { + return 0; + } + while(e) { + if(e->flags & 1) { + if(msg->flags & e->acc_flag) { + return 1; + } + } + e = e->next; + } + return 0; +} + +/** + * @brief test if acc flag from enternal engines is set + */ +int is_eng_mc_on(sip_msg_t *msg) +{ + acc_engine_t *e; + + e = acc_api_get_engines(); + + if(e==NULL) { + return 0; + } + while(e) { + if(e->flags & 1) { + if(msg->flags & e->missed_flag) { + return 1; + } + } + e = e->next; + } + return 0; +} + +/** * @brief execute all acc engines for a SIP request event */ int acc_run_engines(struct sip_msg *msg, int type, int *reset) diff --git a/src/modules/acc/acc.h b/src/modules/acc/acc.h index 248c2cf4d9..3c25bdcaf5 100644 --- a/src/modules/acc/acc.h +++ b/src/modules/acc/acc.h @@ -90,4 +90,7 @@ int acc_diam_init(void); int acc_diam_request( struct sip_msg *req ); #endif +int is_eng_acc_on(sip_msg_t *msg); +int is_eng_mc_on(sip_msg_t *msg); + #endif diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index 58418441d9..7042aca56c 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -79,11 +79,11 @@ struct acc_enviroment acc_env; #define is_acc_on(_rq) \ ( (is_log_acc_on(_rq)) || (is_db_acc_on(_rq)) \ - || (is_diam_acc_on(_rq)) ) + || (is_diam_acc_on(_rq)) || (is_eng_acc_on(_rq)) ) #define is_mc_on(_rq) \ ( (is_log_mc_on(_rq)) || (is_db_mc_on(_rq)) \ - || (is_diam_mc_on(_rq)) ) + || (is_diam_mc_on(_rq)) || (is_eng_mc_on(_rq)) ) #define skip_cancel(_rq) \ (((_rq)->REQ_METHOD==METHOD_CANCEL) && report_cancels==0)

7 years

git:master:ccf71c68: acc: allow accounting only for external accounting engine

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ccf71c68f7c0af4ac761e2e0c2dc1ac11662261f URL: https://github.com/kamailio/kamailio/commit/ccf71c68f7c0af4ac761e2e0c2dc1ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-31T12:31:26+01:00 acc: allow accounting only for external accounting engine - have accounting via external engines without a need to have log flag set --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/ccf71c68f7c0af4ac761e2e0c2dc1ac… Patch: https://github.com/kamailio/kamailio/commit/ccf71c68f7c0af4ac761e2e0c2dc1ac… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index b5c304a801..ad2df5a6c2 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -511,6 +511,52 @@ int acc_db_request( struct sip_msg *rq) } /** + * @brief test if acc flag from enternal engines is set + */ +int is_eng_acc_on(sip_msg_t *msg) +{ + acc_engine_t *e; + + e = acc_api_get_engines(); + + if(e==NULL) { + return 0; + } + while(e) { + if(e->flags & 1) { + if(msg->flags & e->acc_flag) { + return 1; + } + } + e = e->next; + } + return 0; +} + +/** + * @brief test if acc flag from enternal engines is set + */ +int is_eng_mc_on(sip_msg_t *msg) +{ + acc_engine_t *e; + + e = acc_api_get_engines(); + + if(e==NULL) { + return 0; + } + while(e) { + if(e->flags & 1) { + if(msg->flags & e->missed_flag) { + return 1; + } + } + e = e->next; + } + return 0; +} + +/** * @brief execute all acc engines for a SIP request event */ int acc_run_engines(struct sip_msg *msg, int type, int *reset) diff --git a/src/modules/acc/acc.h b/src/modules/acc/acc.h index 6089e49abc..a764a694fc 100644 --- a/src/modules/acc/acc.h +++ b/src/modules/acc/acc.h @@ -83,6 +83,9 @@ int acc_db_init(const str* db_url); int acc_db_init_child(const str* db_url); void acc_db_close(void); int acc_db_request( struct sip_msg *req); -int acc_get_db_handlers(void **vf, void **vh); +int acc_get_db_handlers(void **vf, void **vh); + +int is_eng_acc_on(sip_msg_t *msg); +int is_eng_mc_on(sip_msg_t *msg); #endif diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index da0b6d4e78..d41108d3bc 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -66,10 +66,10 @@ struct acc_enviroment acc_env; #define is_db_mc_on(_rq) is_acc_flag_set(_rq,db_missed_flag) #define is_acc_on(_rq) \ - ( (is_log_acc_on(_rq)) || (is_db_acc_on(_rq)) ) + ( (is_log_acc_on(_rq)) || (is_db_acc_on(_rq)) || (is_eng_acc_on(_rq)) ) #define is_mc_on(_rq) \ - ( (is_log_mc_on(_rq)) || (is_db_mc_on(_rq)) ) + ( (is_log_mc_on(_rq)) || (is_db_mc_on(_rq)) || (is_eng_mc_on(_rq)) ) #define skip_cancel(_rq) \ (((_rq)->REQ_METHOD==METHOD_CANCEL) && report_cancels==0)

7 years

git:master:3492ea4c: xhttp_rpc: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3492ea4c1783fd3a56ad159e98d6dbab76e9bd4e URL: https://github.com/kamailio/kamailio/commit/3492ea4c1783fd3a56ad159e98d6dba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-31T08:43:07+01:00 xhttp_rpc: exported functions to kemi framework --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/3492ea4c1783fd3a56ad159e98d6dba… Patch: https://github.com/kamailio/kamailio/commit/3492ea4c1783fd3a56ad159e98d6dba… --- diff --git a/src/modules/xhttp_rpc/xhttp_rpc.c b/src/modules/xhttp_rpc/xhttp_rpc.c index 6e27409435..4e3c62e474 100644 --- a/src/modules/xhttp_rpc/xhttp_rpc.c +++ b/src/modules/xhttp_rpc/xhttp_rpc.c @@ -28,6 +28,7 @@ #include "../../core/trim.h" #include "../../core/sr_module.h" #include "../../core/nonsip_hooks.h" +#include "../../core/kemi.h" #include "../../modules/xhttp/api.h" #include "xhttp_rpc.h" #include "xhttp_rpc_fnc.h" @@ -85,7 +86,8 @@ int buf_size = 0; char error_buf[ERROR_REASON_BUF_LEN]; static cmd_export_t cmds[] = { - {"dispatch_xhttp_rpc",(cmd_function)xhttp_rpc_dispatch,0,0,0,REQUEST_ROUTE}, + {"dispatch_xhttp_rpc",(cmd_function)xhttp_rpc_dispatch,0,0,0, + REQUEST_ROUTE|EVENT_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -766,7 +768,7 @@ static int child_init(int rank) } -static int xhttp_rpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +static int ki_xhttp_rpc_dispatch(sip_msg_t* msg) { rpc_export_t* rpc_e; str arg = {NULL, 0}; @@ -837,3 +839,31 @@ static int xhttp_rpc_dispatch(sip_msg_t* msg, char* s1, char* s2) return 0; } +static int xhttp_rpc_dispatch(sip_msg_t* msg, char* s1, char* s2) +{ + return ki_xhttp_rpc_dispatch(msg); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_xhttp_rpc_exports[] = { + { str_init("xhttp_rpc"), str_init("dispatch"), + SR_KEMIP_INT, ki_xhttp_rpc_dispatch, + { 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_xhttp_rpc_exports); + return 0; +} \ No newline at end of file

7 years

git:master:8d55e51f: xhttp_pi: export functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8d55e51f6c7e7c3381f397023f6553b921ae173f URL: https://github.com/kamailio/kamailio/commit/8d55e51f6c7e7c3381f397023f6553b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-31T08:37:51+01:00 xhttp_pi: export functions to kemi framework --- Modified: src/modules/xcap_server/xcap_server.c Modified: src/modules/xhttp_pi/xhttp_pi.c --- Diff: https://github.com/kamailio/kamailio/commit/8d55e51f6c7e7c3381f397023f6553b… Patch: https://github.com/kamailio/kamailio/commit/8d55e51f6c7e7c3381f397023f6553b… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 3d92ad9c68..578a03b0f7 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -1714,7 +1714,7 @@ static int check_match_header(str body, str *etag) static sr_kemi_t sr_kemi_xcap_server_exports[] = { { str_init("xcap_server"), str_init("xcaps_put"), SR_KEMIP_INT, ki_xcaps_put, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_STR, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("xcap_server"), str_init("xcaps_get"), diff --git a/src/modules/xhttp_pi/xhttp_pi.c b/src/modules/xhttp_pi/xhttp_pi.c index ac7aaf0a18..dfa28c2035 100644 --- a/src/modules/xhttp_pi/xhttp_pi.c +++ b/src/modules/xhttp_pi/xhttp_pi.c @@ -39,6 +39,7 @@ #include "../../core/nonsip_hooks.h" #include "../../modules/xhttp/api.h" #include "../../core/rpc_lookup.h" +#include "../../core/kemi.h" #include "xhttp_pi.h" #include "xhttp_pi_fnc.h" #include "http_db_handler.h" @@ -87,7 +88,8 @@ int buf_size = 0; char error_buf[ERROR_REASON_BUF_LEN]; static cmd_export_t cmds[] = { - {"dispatch_xhttp_pi",(cmd_function)xhttp_pi_dispatch,0,0,0,REQUEST_ROUTE}, + {"dispatch_xhttp_pi",(cmd_function)xhttp_pi_dispatch,0,0,0, + REQUEST_ROUTE|EVENT_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -309,7 +311,7 @@ int destroy(void) } -static int xhttp_pi_dispatch(sip_msg_t* msg, char* s1, char* s2) +static int ki_xhttp_pi_dispatch(sip_msg_t* msg) { str arg = {NULL, 0}; int ret = 0; @@ -369,6 +371,10 @@ static int xhttp_pi_dispatch(sip_msg_t* msg, char* s1, char* s2) return 0; } +static int xhttp_pi_dispatch(sip_msg_t* msg, char* s1, char* s2) +{ + return ki_xhttp_pi_dispatch(msg); +} /* rpc function documentation */ static const char *rpc_reload_doc[2] = { @@ -392,3 +398,26 @@ static rpc_export_t rpc_methods[] = { {0, 0, 0, 0} }; +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_xhttp_pi_exports[] = { + { str_init("xhttp_pi"), str_init("dispatch"), + SR_KEMIP_INT, ki_xhttp_pi_dispatch, + { 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 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_xhttp_pi_exports); + return 0; +} \ No newline at end of file

7 years

git:master:982eaff9: xcap_server: functions exported to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 982eaff9d55e4269216b88be7d21233dfe280e5a URL: https://github.com/kamailio/kamailio/commit/982eaff9d55e4269216b88be7d21233… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-31T08:31:26+01:00 xcap_server: functions exported to kemi framework --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/982eaff9d55e4269216b88be7d21233… Patch: https://github.com/kamailio/kamailio/commit/982eaff9d55e4269216b88be7d21233…

7 years

RPC command for changing debug log level

by Alex Hermann

Hi, Now that MI is gone, how do i change the debug log level at run-time? I can't find an appropriate function in http://www.kamailio.org/docs/docbooks/ devel/rpc_list/rpc_list.html -- Alex Hermann

7 years

git:5.0:7649fa6b: cfg_rpc: cfg.list rpc command returns an array of string values

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 7649fa6b3b14426ace8b2ec63975d4274c296d67 URL: https://github.com/kamailio/kamailio/commit/7649fa6b3b14426ace8b2ec63975d42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-30T18:31:54+01:00 cfg_rpc: cfg.list rpc command returns an array of string values (cherry picked from commit 47f2731503faf84b1e666753bcb2db03772224b4) --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/7649fa6b3b14426ace8b2ec63975d42… Patch: https://github.com/kamailio/kamailio/commit/7649fa6b3b14426ace8b2ec63975d42… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index b694d06088..0b6d290e54 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -547,7 +547,7 @@ static rpc_export_t rpc_calls[] = { {"cfg.rollback", rpc_rollback, rpc_rollback_doc, 0}, {"cfg.get", rpc_get, rpc_get_doc, 0}, {"cfg.help", rpc_help, rpc_help_doc, 0}, - {"cfg.list", rpc_list, rpc_list_doc, 0}, + {"cfg.list", rpc_list, rpc_list_doc, RET_ARRAY}, {"cfg.diff", rpc_diff, rpc_diff_doc, 0}, {"cfg.add_group_inst", rpc_add_group_inst, rpc_add_group_inst_doc, 0}, {"cfg.del_group_inst", rpc_del_group_inst, rpc_del_group_inst_doc, 0},

7 years

git:master:47f27315: cfg_rpc: cfg.list rpc command returns an array of string values

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 47f2731503faf84b1e666753bcb2db03772224b4 URL: https://github.com/kamailio/kamailio/commit/47f2731503faf84b1e666753bcb2db0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-30T18:30:45+01:00 cfg_rpc: cfg.list rpc command returns an array of string values --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/47f2731503faf84b1e666753bcb2db0… Patch: https://github.com/kamailio/kamailio/commit/47f2731503faf84b1e666753bcb2db0… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index a9c42dc1e3..f62855b092 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -614,7 +614,7 @@ static rpc_export_t rpc_calls[] = { {"cfg.get", rpc_get, rpc_get_doc, 0}, {"cfg.reset", rpc_cfg_var_reset, rpc_cfg_var_reset_doc, 0}, {"cfg.help", rpc_help, rpc_help_doc, 0}, - {"cfg.list", rpc_list, rpc_list_doc, 0}, + {"cfg.list", rpc_list, rpc_list_doc, RET_ARRAY}, {"cfg.diff", rpc_diff, rpc_diff_doc, 0}, {"cfg.add_group_inst", rpc_add_group_inst, rpc_add_group_inst_doc, 0}, {"cfg.del_group_inst", rpc_del_group_inst, rpc_del_group_inst_doc, 0},

7 years

← Newer
1
...
6
7
8
9
10
11
12
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017