sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:d705fe4c: modules: readme files regenerated - xhttp ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d705fe4ce0c18e0f97f4c57aaa1e18971787f305 URL: https://github.com/kamailio/kamailio/commit/d705fe4ce0c18e0f97f4c57aaa1e189… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-18T14:16:42+02:00 modules: readme files regenerated - xhttp ... [skip ci] --- Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/d705fe4ce0c18e0f97f4c57aaa1e189… Patch: https://github.com/kamailio/kamailio/commit/d705fe4ce0c18e0f97f4c57aaa1e189…

7 years, 7 months

git:master:f8bd4dcb: geoip2: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f8bd4dcb68a513c525df5d54c4cb6accb1888b88 URL: https://github.com/kamailio/kamailio/commit/f8bd4dcb68a513c525df5d54c4cb6ac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-18T14:07:48+02:00 geoip2: exported functions to kemi framework --- Modified: src/modules/geoip2/geoip2_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f8bd4dcb68a513c525df5d54c4cb6ac… Patch: https://github.com/kamailio/kamailio/commit/f8bd4dcb68a513c525df5d54c4cb6ac… --- diff --git a/src/modules/geoip2/geoip2_mod.c b/src/modules/geoip2/geoip2_mod.c index 382a540..ffa083d 100644 --- a/src/modules/geoip2/geoip2_mod.c +++ b/src/modules/geoip2/geoip2_mod.c @@ -28,6 +28,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "../../core/kemi.h" #include "../../core/mod_fix.h" #include "geoip2_pv.h" @@ -40,7 +41,7 @@ static int mod_init(void); static void mod_destroy(void); static int w_geoip2_match(struct sip_msg* msg, char* str1, char* str2); -static int geoip2_match(struct sip_msg *msg, gparam_t *target, gparam_t *pvname); +static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass); static pv_export_t mod_pvs[] = { { {"gip2", sizeof("gip2")-1}, PVT_OTHER, pv_get_geoip2, 0, @@ -76,7 +77,6 @@ struct module_exports exports = { }; - /** * init module function */ @@ -105,34 +105,49 @@ static void mod_destroy(void) geoip2_destroy_pv(); } -static int w_geoip2_match(struct sip_msg* msg, char* str1, char* str2) +static int geoip2_match(sip_msg_t *msg, str *tomatch, str *pvclass) { - return geoip2_match(msg, (gparam_t*)str1, (gparam_t*)str2); + geoip2_pv_reset(pvclass); + + return geoip2_update_pv(tomatch, pvclass); } -static int geoip2_match(struct sip_msg *msg, gparam_t *target, gparam_t *pvname) +static int w_geoip2_match(sip_msg_t* msg, char* target, char* pvname) { - str tomatch; - str pvclass; + str tomatch = STR_NULL; + str pvclass = STR_NULL; - if(msg==NULL) - { + if(msg==NULL) { LM_ERR("received null msg\n"); return -1; } - if(fixup_get_svalue(msg, target, &tomatch)<0) - { + if(fixup_get_svalue(msg, (gparam_t*)target, &tomatch)<0) { LM_ERR("cannot get the address\n"); return -1; } - if(fixup_get_svalue(msg, pvname, &pvclass)<0) - { + if(fixup_get_svalue(msg, (gparam_t*)pvname, &pvclass)<0) { LM_ERR("cannot get the pv class\n"); return -1; } - geoip2_pv_reset(&pvclass); - return geoip2_update_pv(&tomatch, &pvclass); + return geoip2_match(msg, &tomatch, &pvclass); } +/** + * + */ +static sr_kemi_t sr_kemi_geoip2_exports[] = { + { str_init("geoip2"), str_init("match"), + SR_KEMIP_INT, geoip2_match, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; + +int mod_register(char *path, int *dlflags, void *p1, void *p2) { + sr_kemi_modules_add(sr_kemi_geoip2_exports); + return 0; +} \ No newline at end of file

7 years, 7 months

git:master:a138f65c: geoip: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a138f65cd5e4f810d3311891ac01a323a76c4807 URL: https://github.com/kamailio/kamailio/commit/a138f65cd5e4f810d3311891ac01a32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-18T14:07:27+02:00 geoip: exported functions to kemi framework --- Modified: src/modules/geoip/geoip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a138f65cd5e4f810d3311891ac01a32… Patch: https://github.com/kamailio/kamailio/commit/a138f65cd5e4f810d3311891ac01a32… --- diff --git a/src/modules/geoip/geoip_mod.c b/src/modules/geoip/geoip_mod.c index 1962172..ab827a1 100644 --- a/src/modules/geoip/geoip_mod.c +++ b/src/modules/geoip/geoip_mod.c @@ -30,6 +30,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/pvar.h" +#include "../../core/kemi.h" #include "../../core/mod_fix.h" #include "geoip_pv.h" @@ -42,7 +43,7 @@ static int mod_init(void); static void mod_destroy(void); static int w_geoip_match(struct sip_msg* msg, char* str1, char* str2); -static int geoip_match(struct sip_msg *msg, gparam_t *target, gparam_t *pvname); +static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass); static pv_export_t mod_pvs[] = { { {"gip", sizeof("git")-1}, PVT_OTHER, pv_get_geoip, 0, @@ -78,7 +79,6 @@ struct module_exports exports = { }; - /** * init module function */ @@ -107,34 +107,50 @@ static void mod_destroy(void) geoip_destroy_pv(); } -static int w_geoip_match(struct sip_msg* msg, char* str1, char* str2) + +static int geoip_match(sip_msg_t *msg, str *tomatch, str *pvclass) { - return geoip_match(msg, (gparam_t*)str1, (gparam_t*)str2); + geoip_pv_reset(pvclass); + + return geoip_update_pv(tomatch, pvclass); } -static int geoip_match(struct sip_msg *msg, gparam_t *target, gparam_t *pvname) +static int w_geoip_match(sip_msg_t* msg, char* target, char* pvname) { - str tomatch; - str pvclass; + str tomatch = STR_NULL; + str pvclass = STR_NULL; - if(msg==NULL) - { + if(msg==NULL) { LM_ERR("received null msg\n"); return -1; } - if(fixup_get_svalue(msg, target, &tomatch)<0) - { + if(fixup_get_svalue(msg, (gparam_t*)target, &tomatch)<0) { LM_ERR("cannot get the address\n"); return -1; } - if(fixup_get_svalue(msg, pvname, &pvclass)<0) - { + if(fixup_get_svalue(msg, (gparam_t*)pvname, &pvclass)<0) { LM_ERR("cannot get the pv class\n"); return -1; } - geoip_pv_reset(&pvclass); - return geoip_update_pv(&tomatch, &pvclass); + return geoip_match(msg, &tomatch, &pvclass); } +/** + * + */ +static sr_kemi_t sr_kemi_geoip_exports[] = { + { str_init("geoip"), str_init("match"), + SR_KEMIP_INT, geoip_match, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; + +int mod_register(char *path, int *dlflags, void *p1, void *p2) { + sr_kemi_modules_add(sr_kemi_geoip_exports); + return 0; +} \ No newline at end of file

7 years, 7 months

git:master:39d23767: rtpengine: exported more functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 39d23767a0b86c385b1ab02d6d8523840796ff76 URL: https://github.com/kamailio/kamailio/commit/39d23767a0b86c385b1ab02d6d85238… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-18T14:06:58+02:00 rtpengine: exported more functions to kemi framework --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/39d23767a0b86c385b1ab02d6d85238… Patch: https://github.com/kamailio/kamailio/commit/39d23767a0b86c385b1ab02d6d85238…

7 years, 7 months

git:master:6ce0b3db: rtpproxy: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6ce0b3dbc36418c5daa93c366c0402f4a40f3f36 URL: https://github.com/kamailio/kamailio/commit/6ce0b3dbc36418c5daa93c366c0402f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 rtpproxy: exported functions to kemi framework --- Modified: src/modules/rtpproxy/rtpproxy.c Modified: src/modules/rtpproxy/rtpproxy_stream.c Modified: src/modules/rtpproxy/rtpproxy_stream.h --- Diff: https://github.com/kamailio/kamailio/commit/6ce0b3dbc36418c5daa93c366c0402f… Patch: https://github.com/kamailio/kamailio/commit/6ce0b3dbc36418c5daa93c366c0402f…

7 years, 7 months

git:master:bb8d0ac4: textops: exported several functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bb8d0ac4900f72c6c77a45f3e60f775f7a131de9 URL: https://github.com/kamailio/kamailio/commit/bb8d0ac4900f72c6c77a45f3e60f775… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 textops: exported several functions to kemi framework --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/bb8d0ac4900f72c6c77a45f3e60f775… Patch: https://github.com/kamailio/kamailio/commit/bb8d0ac4900f72c6c77a45f3e60f775…

7 years, 7 months

git:master:450c9eb2: xhttp: documented event_callback parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 450c9eb23e248c9dcd32a4a398f4585719c5bcd5 URL: https://github.com/kamailio/kamailio/commit/450c9eb23e248c9dcd32a4a398f4585… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 xhttp: documented event_callback parameter --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/450c9eb23e248c9dcd32a4a398f4585… Patch: https://github.com/kamailio/kamailio/commit/450c9eb23e248c9dcd32a4a398f4585… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index 869a1d5..90708ce 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -156,6 +156,33 @@ modparam("xhttp", "url_match", "^/sip/") </programlisting> </example> </section> + <section id="xhttp.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the kemi configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[xhttp:request] block. + </para> + <para> + The function has one string parameter with the value "xhttp:request". + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xhttp", "event_callback", "ksr_xhttp_event") +... +-- event callback function implemented in Lua +function ksr_xhttp_event(evname) + KSR.info("===== xhttp module triggered event: " .. evname .. "\n"); + return 1; +end +... </section> <section>

7 years, 7 months

git:master:1a38dd7b: dialog: exported profile functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1a38dd7be8bdee8bebe2420b46b9be82c1e52927 URL: https://github.com/kamailio/kamailio/commit/1a38dd7be8bdee8bebe2420b46b9be8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 dialog: exported profile functions to kemi framework --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/1a38dd7be8bdee8bebe2420b46b9be8… Patch: https://github.com/kamailio/kamailio/commit/1a38dd7be8bdee8bebe2420b46b9be8…

7 years, 7 months

git:master:7b190e64: xhttp: allow execution of callback function for event route via kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7b190e644c4b1c18055ededa7f4b5d5f2c1b6ca1 URL: https://github.com/kamailio/kamailio/commit/7b190e644c4b1c18055ededa7f4b5d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 xhttp: allow execution of callback function for event route via kemi - new parameter event_callback --- Modified: src/modules/xhttp/xhttp_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7b190e644c4b1c18055ededa7f4b5d5… Patch: https://github.com/kamailio/kamailio/commit/7b190e644c4b1c18055ededa7f4b5d5… --- diff --git a/src/modules/xhttp/xhttp_mod.c b/src/modules/xhttp/xhttp_mod.c index d104883..d41fc47 100644 --- a/src/modules/xhttp/xhttp_mod.c +++ b/src/modules/xhttp/xhttp_mod.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * Copyright (C) 2010-2017 Daniel-Constantin Mierla (asipto.com) * * This file is part of Kamailio, a free SIP server. * @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -67,6 +67,7 @@ static regex_t xhttp_url_skip_regexp; /** SL API structure */ sl_api_t slb; +static str xhttp_event_callback = STR_NULL; static cmd_export_t cmds[] = { {"xhttp_reply", (cmd_function)w_xhttp_send_reply, @@ -87,6 +88,7 @@ static pv_export_t mod_pvs[] = { static param_export_t params[] = { {"url_match", PARAM_STRING, &xhttp_url_match}, {"url_skip", PARAM_STRING, &xhttp_url_skip}, + {"event_callback", PARAM_STR, &xhttp_event_callback}, {0, 0, 0} }; @@ -120,18 +122,28 @@ static int mod_init(void) { struct nonsip_hook nsh; int route_no; - - route_no=route_get(&event_rt, "xhttp:request"); - if (route_no==-1) - { - LM_ERR("failed to find event_route[xhttp:request]\n"); - return -1; - } - if (event_rt.rlist[route_no]==0) - { - LM_WARN("event_route[xhttp:request] is empty\n"); + sr_kemi_eng_t *keng = NULL; + + if(xhttp_event_callback.s!=NULL && xhttp_event_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_ERR("failed to find kemi engine\n"); + return -1; + } + xhttp_route_no=-1; + } else { + route_no=route_lookup(&event_rt, "xhttp:request"); + if (route_no==-1) + { + LM_ERR("failed to find event_route[xhttp:request]\n"); + return -1; + } + if (event_rt.rlist[route_no]==0) + { + LM_WARN("event_route[xhttp:request] is empty\n"); + } + xhttp_route_no=route_no; } - xhttp_route_no=route_no; /* bind the SL API */ if (sl_load_api(&slb)!=0) { @@ -241,10 +253,14 @@ static int xhttp_process_request(sip_msg_t* orig_msg, char* new_buf, unsigned int new_len) { int ret; + int backup_rt; sip_msg_t tmp_msg, *msg; struct run_act_ctx ra_ctx; - + sr_kemi_eng_t *keng = NULL; + str evrtname = str_init("xhttp:request"); + ret=0; + backup_rt = get_route_type(); if (new_buf && new_len) { memset(&tmp_msg, 0, sizeof(sip_msg_t)); @@ -270,17 +286,31 @@ static int xhttp_process_request(sip_msg_t* orig_msg, LM_CRIT("strange message: %.*s\n", msg->len, msg->buf); goto error; } + + set_route_type(EVENT_ROUTE); if (exec_pre_script_cb(msg, REQUEST_CB_TYPE) == 0) { goto done; } init_run_actions_ctx(&ra_ctx); - if (run_actions(&ra_ctx, event_rt.rlist[xhttp_route_no], msg) < 0) - { - ret=-1; - LM_DBG("error while trying script\n"); - goto done; + if(xhttp_route_no>=0) { + if (run_actions(&ra_ctx, event_rt.rlist[xhttp_route_no], msg) < 0) + { + ret=-1; + LM_DBG("error while trying script\n"); + goto done; + } + } else { + keng = sr_kemi_eng_get(); + if(keng!=NULL) { + if(keng->froute(msg, EVENT_ROUTE, + &xhttp_event_callback, &evrtname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } else { + LM_ERR("no event route or kemi callback found for execution\n"); + } } done: @@ -289,6 +319,7 @@ static int xhttp_process_request(sip_msg_t* orig_msg, { free_sip_msg(msg); } + set_route_type(backup_rt); return ret; error: @@ -538,4 +569,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) return register_trans_mod(path, mod_trans); } -/** @} */ \ No newline at end of file +/** @} */

7 years, 7 months

git:master:06ba0b3c: xhttp: added section ids

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 06ba0b3c77d4747686e58c0083eb318a579798cf URL: https://github.com/kamailio/kamailio/commit/06ba0b3c77d4747686e58c0083eb318… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-17T20:27:01+02:00 xhttp: added section ids --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/06ba0b3c77d4747686e58c0083eb318… Patch: https://github.com/kamailio/kamailio/commit/06ba0b3c77d4747686e58c0083eb318…

7 years, 7 months

← Newer
1
...
22
23
24
25
26
27
28
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017