sr-dev

sr-dev@lists.kamailio.org

21 participants
45182 discussions

git:master:72d830ce: dlgs: register callback for core event SREV_SIP_REPLY_OUT
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 72d830ce66b40c0f3bd6589b24835d378dda64e5 URL: https://github.com/kamailio/kamailio/commit/72d830ce66b40c0f3bd6589b24835d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T18:45:58+02:00 dlgs: register callback for core event SREV_SIP_REPLY_OUT --- Modified: src/modules/dlgs/dlgs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/72d830ce66b40c0f3bd6589b24835d3… Patch: https://github.com/kamailio/kamailio/commit/72d830ce66b40c0f3bd6589b24835d3… --- diff --git a/src/modules/dlgs/dlgs_mod.c b/src/modules/dlgs/dlgs_mod.c index 499de84563..c2f1a8146c 100644 --- a/src/modules/dlgs/dlgs_mod.c +++ b/src/modules/dlgs/dlgs_mod.c @@ -30,6 +30,7 @@ #include "../../core/mod_fix.h" #include "../../core/ut.h" #include "../../core/kemi.h" +#include "../../core/events.h" #include "../../core/utils/sruid.h" #include "../../core/timer_proc.h" @@ -58,6 +59,8 @@ static int w_dlgs_tags_add(sip_msg_t *msg, char *ptags, char *p2); static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2); static int w_dlgs_tags_count(sip_msg_t *msg, char *ptags, char *p2); +static int dlgs_sip_reply_out(sr_event_param_t *evp); + /* clang-format off */ static cmd_export_t cmds[]={ {"dlgs_init", (cmd_function)w_dlgs_init, 3, fixup_spve_all, @@ -125,6 +128,8 @@ static int mod_init(void) return -1; } + sr_event_register_cb(SREV_SIP_REPLY_OUT, dlgs_sip_reply_out); + if(dlgs_init()<0) { return -1; } @@ -261,6 +266,17 @@ static int w_dlgs_tags_count(sip_msg_t *msg, char *ptags, char *p2) return 1; } +/** + * + */ +static int dlgs_sip_reply_out(sr_event_param_t *evp) +{ + if(evp->rpl!=NULL) { + dlgs_update_item(evp->rpl); + } + return 0; +} + /** * */

1 0

git:master:936a49a1: core: events - added out buffer field to event structure
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 936a49a11ea88425bec4ad9b9e6ec69549e0fe34 URL: https://github.com/kamailio/kamailio/commit/936a49a11ea88425bec4ad9b9e6ec69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T18:45:58+02:00 core: events - added out buffer field to event structure --- Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/936a49a11ea88425bec4ad9b9e6ec69… Patch: https://github.com/kamailio/kamailio/commit/936a49a11ea88425bec4ad9b9e6ec69… --- diff --git a/src/core/events.h b/src/core/events.h index f13c64a83a..2208d8038d 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -43,6 +43,7 @@ typedef struct sr_event_param { void *data; + str obuf; receive_info_t* rcv; dest_info_t *dst; sip_msg_t *req;

1 0

git:master:700261df: sl: execute core event SREV_SIP_REPLY_OUT
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 700261dff422693fb78dbe5062998bed3eddb397 URL: https://github.com/kamailio/kamailio/commit/700261dff422693fb78dbe5062998be… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T18:45:58+02:00 sl: execute core event SREV_SIP_REPLY_OUT --- Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/700261dff422693fb78dbe5062998be… Patch: https://github.com/kamailio/kamailio/commit/700261dff422693fb78dbe5062998be… --- diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index c832f4fb09..e6f643c861 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -214,7 +214,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) mhomed=backup_mhomed; keng = sr_kemi_eng_get(); - if (_sl_evrt_local_response >= 0 || keng!=NULL) + if (_sl_evrt_local_response >= 0 || keng!=NULL + || sr_event_enabled(SREV_SIP_REPLY_OUT)) { if (likely(build_sip_msg_from_buf(&pmsg, buf.s, buf.len, inc_msg_no()) == 0)) @@ -226,10 +227,8 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) onsnd_info.send_sock=dst.send_sock; onsnd_info.buf=buf.s; onsnd_info.len=buf.len; - p_onsend=&onsnd_info; - if (unlikely(!IS_SIP(msg))) - { + if (unlikely(!IS_SIP(msg))) { /* This is an HTTP reply... So fudge in a CSeq into * the parsed message message structure so that $rm will * work in the route */ @@ -293,6 +292,20 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) } } + if(IS_SIP(msg) && sr_event_enabled(SREV_SIP_REPLY_OUT)) { + sr_event_param_t evp; + memset(&evp, 0, sizeof(sr_event_param_t)); + evp.obuf = buf; + evp.rcv = &msg->rcv; + evp.dst = &dst; + evp.req = msg; + evp.rpl = &pmsg; + evp.rplcode = code; + evp.mode = 1; + sr_event_exec(SREV_SIP_REPLY_OUT, &evp); + } + + p_onsend=&onsnd_info; backup_rt = get_route_type(); set_route_type(LOCAL_ROUTE); init_run_actions_ctx(&ctx);

1 0

git:master:13329ce0: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 13329ce04a6c082920b959e47d49bee1b8171e70 URL: https://github.com/kamailio/kamailio/commit/13329ce04a6c082920b959e47d49bee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-18T17:16:17+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/13329ce04a6c082920b959e47d49bee… Patch: https://github.com/kamailio/kamailio/commit/13329ce04a6c082920b959e47d49bee…

1 0

git:master:5e9a0dba: corex: docs for evcb_reply_out param and event_route[corex:reply-out]
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 5e9a0dba1f1f12222c807332ef6fc8df233fc7ab URL: https://github.com/kamailio/kamailio/commit/5e9a0dba1f1f12222c807332ef6fc8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T17:09:50+02:00 corex: docs for evcb_reply_out param and event_route[corex:reply-out] --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e9a0dba1f1f12222c807332ef6fc8d… Patch: https://github.com/kamailio/kamailio/commit/5e9a0dba1f1f12222c807332ef6fc8d… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 203ada5d2f..96c6fe4ae3 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -147,6 +147,26 @@ modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") ... +</programlisting> + </example> + </section> + <section id="corex.p.evcb_reply_out"> + <title><varname>evcb_reply_out</varname> (string)</title> + <para> + Name of KEMI callback function to be executed instead of + event_route[corex:reply-out]. + </para> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>evcb_reply_out</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("corex", "evcb_reply_out", "ksr_corex_reply_out") +... </programlisting> </example> </section> @@ -953,7 +973,7 @@ event_route[dispatcher:dst-down] { <section> <title>Event Routes</title> - <section id="async.evr.network_io"> + <section id="corex.evr.network_msg"> <title> <function moreinfo="none">event_route[network:msg]</function> </title> @@ -981,6 +1001,14 @@ event_route[dispatcher:dst-down] { no module functions or pseudo variables are available in this event route. </para> </section> + <section id="corex.evr.reply_out"> + <title> + <function moreinfo="none">event_route[corex:reply-out]</function> + </title> + <para> + Event route block to be executed when a SIP reply is sent out. + </para> + </section> </section> <section>

1 0

git:master:35360a5f: corex: event route when a sip reply is sent out
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 35360a5f99eb96d57d7bdab9d32f1f7db6dc0006 URL: https://github.com/kamailio/kamailio/commit/35360a5f99eb96d57d7bdab9d32f1f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T16:40:37+02:00 corex: event route when a sip reply is sent out --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/35360a5f99eb96d57d7bdab9d32f1f7… Patch: https://github.com/kamailio/kamailio/commit/35360a5f99eb96d57d7bdab9d32f1f7… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index b8b5de0046..8d0e649548 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -31,6 +31,8 @@ #include "../../core/pvar.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/events.h" +#include "../../core/onsend.h" #include "../../core/dns_cache.h" #include "../../core/parser/parse_uri.h" #include "../../core/parser/parse_param.h" @@ -69,6 +71,8 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int fixup_file_op(void** param, int param_no); static sr_kemi_xval_t _sr_kemi_corex_xval = {0}; +static str corex_evcb_reply_out = STR_NULL; +static int corex_evrt_reply_out_no = -1; int corex_alias_subdomains_param(modparam_t type, void *val); int corex_dns_cache_param(modparam_t type, void *val); @@ -77,6 +81,8 @@ static int mod_init(void); static int child_init(int); static void mod_destroy(void); +static int corex_sip_reply_out(sr_event_param_t *evp); + static pv_export_t mod_pvs[] = { { {"cfg", (sizeof("cfg")-1)}, PVT_OTHER, pv_get_cfg, 0, pv_parse_cfg_name, 0, 0, 0 }, @@ -151,6 +157,7 @@ static param_export_t params[]={ {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, + {"evcb_reply_out", PARAM_STR, &corex_evcb_reply_out}, {0, 0, 0} }; @@ -193,6 +200,11 @@ static int mod_init(void) return -1; } + corex_evrt_reply_out_no = route_lookup(&event_rt, "corex:reply-out"); + + if(corex_evrt_reply_out_no>=0 || corex_evcb_reply_out.len>0) { + sr_event_register_cb(SREV_SIP_REPLY_OUT, corex_sip_reply_out); + } return 0; } @@ -1090,6 +1102,25 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2) return -1; } +/** + * + */ +static int corex_sip_reply_out(sr_event_param_t *evp) +{ + onsend_info_t sndinfo; + str evname = str_init("corex:reply-out"); + + memset(&sndinfo, 0, sizeof(onsend_info_t)); + + if(corex_evrt_reply_out_no>=0 || corex_evcb_reply_out.len>0) { + run_onsend_evroute(&sndinfo, corex_evrt_reply_out_no, + &corex_evcb_reply_out, &evname); + } + + return 0; +} + + /** * */

1 0

git:master:b49b5661: core: extend onsend structure to include runtime mode and reply code
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: b49b56614db5e5d32ba415755bdac75478cc08f2 URL: https://github.com/kamailio/kamailio/commit/b49b56614db5e5d32ba415755bdac75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T15:38:53+02:00 core: extend onsend structure to include runtime mode and reply code - runtime mode to be set to local or network traffic on specific cases --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/b49b56614db5e5d32ba415755bdac75… Patch: https://github.com/kamailio/kamailio/commit/b49b56614db5e5d32ba415755bdac75… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index e435a27f0a..7913e7dda4 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -42,6 +42,8 @@ typedef struct onsend_info{ char* buf; /* outgoing buffer */ int len; /* outgoing buffer len */ sip_msg_t *msg; /* original sip msg struct */ + int rmode; /* runtime execution mode */ + int rplcode; /* reply code */ } onsend_info_t; extern onsend_info_t* p_onsend;

1 0

git:master:05e87e66: core: c code for executing route blocks on send out events moved to onsend.c
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 05e87e66cdb398ea9fe5aecc09d521a25a4f5c8e URL: https://github.com/kamailio/kamailio/commit/05e87e66cdb398ea9fe5aecc09d521a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T16:14:14+02:00 core: c code for executing route blocks on send out events moved to onsend.c - helper functions for executing event_route blocks for send out cases --- Added: src/core/onsend.c Modified: src/core/action.c Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/05e87e66cdb398ea9fe5aecc09d521a… Patch: https://github.com/kamailio/kamailio/commit/05e87e66cdb398ea9fe5aecc09d521a…

1 0

git:master:93ab0791: core: event hook for sip reply out
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 93ab0791b409b9a708a1c7ac5cc4f94f7537d2ca URL: https://github.com/kamailio/kamailio/commit/93ab0791b409b9a708a1c7ac5cc4f94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T13:18:39+02:00 core: event hook for sip reply out --- Modified: src/core/events.c Modified: src/core/events.h --- Diff: https://github.com/kamailio/kamailio/commit/93ab0791b409b9a708a1c7ac5cc4f94… Patch: https://github.com/kamailio/kamailio/commit/93ab0791b409b9a708a1c7ac5cc4f94… --- diff --git a/src/core/events.c b/src/core/events.c index 70d7179697..ebe47ee4b1 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -180,6 +180,15 @@ int sr_event_register_cb(int type, sr_event_cb_f f) _sr_events_list.net_data_send = f; else return -1; break; + case SREV_SIP_REPLY_OUT: + for(i=0; i<SREV_CB_LIST_SIZE; i++) { + if(_sr_events_list.sip_reply_out[i]==0) { + _sr_events_list.sip_reply_out[i] = f; + break; + } + } + if(i==SREV_CB_LIST_SIZE) return -1; + break; default: return -1; } @@ -317,6 +326,15 @@ int sr_event_exec(int type, sr_event_param_t *evp) ret = _sr_events_list.net_data_send(evp); return ret; } else return 1; + case SREV_SIP_REPLY_OUT: + if(unlikely(_sr_events_list.net_data_in[0]!=0)) + { + ret = 0; + for(i=0; i<SREV_CB_LIST_SIZE + && _sr_events_list.sip_reply_out[i]; i++) { + ret |= _sr_events_list.sip_reply_out[i](evp); + } + } else return 1; default: return -1; } @@ -358,6 +376,8 @@ int sr_event_enabled(int type) return (_sr_events_list.net_data_recv!=0)?1:0; case SREV_NET_DATA_SEND: return (_sr_events_list.net_data_send!=0)?1:0; + case SREV_SIP_REPLY_OUT: + return (_sr_events_list.sip_reply_out[0]!=0)?1:0; } return 0; } diff --git a/src/core/events.h b/src/core/events.h index df8a313055..f13c64a83a 100644 --- a/src/core/events.h +++ b/src/core/events.h @@ -37,6 +37,7 @@ #define SREV_TCP_CLOSED 13 #define SREV_NET_DATA_RECV 14 #define SREV_NET_DATA_SEND 15 +#define SREV_SIP_REPLY_OUT 16 #define SREV_CB_LIST_SIZE 8 @@ -44,6 +45,10 @@ typedef struct sr_event_param { void *data; receive_info_t* rcv; dest_info_t *dst; + sip_msg_t *req; + sip_msg_t *rpl; + int rplcode; + int mode; } sr_event_param_t; typedef int (*sr_event_cb_f)(sr_event_param_t *evp); @@ -64,6 +69,7 @@ typedef struct sr_event_cb { sr_event_cb_f tcp_closed; sr_event_cb_f net_data_recv; sr_event_cb_f net_data_send; + sr_event_cb_f sip_reply_out[SREV_CB_LIST_SIZE]; } sr_event_cb_t; void sr_event_cb_init(void);

1 0

git:master:7e402da2: pv: use SIP_REQUEST/SIP_REPLY for value of $mt
by Daniel-Constantin Mierla 18 Jun '20

18 Jun '20

Module: kamailio Branch: master Commit: 7e402da261e1ced56019037d3dce9e72b5b2b0ea URL: https://github.com/kamailio/kamailio/commit/7e402da261e1ced56019037d3dce9e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-18T10:31:38+02:00 pv: use SIP_REQUEST/SIP_REPLY for value of $mt --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7e402da261e1ced56019037d3dce9e7… Patch: https://github.com/kamailio/kamailio/commit/7e402da261e1ced56019037d3dce9e7… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 7b28fb966e..f7af431341 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -188,9 +188,9 @@ int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, return -1; if(msg->first_line.type == SIP_REQUEST) - type = 1; + type = SIP_REQUEST; /* 1 */ else if(msg->first_line.type == SIP_REPLY) - type = 2; + type = SIP_REPLY; /* 2 */ return pv_get_uintval(msg, param, res, type); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev