sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
307 discussions

git:master:9ce38204: http_client: proper free for curl params in case of failover connection
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 9ce38204d8a59e5d83cc50a2c809d1306346f9b7 URL: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:54:00+02:00 http_client: proper free for curl params in case of failover connection --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… Patch: https://github.com/kamailio/kamailio/commit/9ce38204d8a59e5d83cc50a2c809d13… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 1bdae25df7..ca26998606 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -464,12 +464,15 @@ int curl_get_redirect(struct sip_msg* _m, const str *connection, str* result) /*! Run a query based on a connection definition */ -int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* url, str* result, const char *contenttype, const str* post, int failover) +int curl_con_query_url_f(struct sip_msg* _m, const str *connection, + const str* url, str* result, const char *contenttype, + const str* post, int failover) { curl_con_t *conn = NULL; curl_con_pkg_t *pconn = NULL; char *urlbuf = NULL; char *postdata = NULL; + char *failovercon = NULL; curl_query_t query_params; unsigned int maxdatasize = default_maxdatasize; @@ -495,7 +498,6 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u LM_DBG("******** CURL Connection found %.*s\n", connection->len, connection->s); maxdatasize = conn->maxdatasize; - if (url && (url->len > 0) && (url->s != NULL)) { int url_len = conn->schema.len + 3 + conn->url.len + 1 + url->len + 1; urlbuf = pkg_malloc(url_len); @@ -552,7 +554,10 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u query_params.oneline = 0; query_params.maxdatasize = maxdatasize; query_params.http_proxy_port = conn->http_proxy_port; - query_params.failovercon = conn->failover.s ? as_asciiz(&conn->failover) : NULL; + if(conn->failover.s) { + failovercon = as_asciiz(&conn->failover); + } + query_params.failovercon = failovercon; query_params.pconn = pconn; if (conn->http_proxy) { query_params.http_proxy = conn->http_proxy; @@ -567,14 +572,19 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u int counter = failover + 1; if (counter >= 2) { LM_DBG("**** No more failovers - returning failure\n"); - return (res - 1000); + res = (res - 1000); + goto error; } /* Time for failover */ - return curl_con_query_url_f(_m, &conn->failover, url, result, contenttype, post, counter); + res = curl_con_query_url_f(_m, &conn->failover, url, result, + contenttype, post, counter); } - LM_DBG("***** #### ***** CURL DONE : %s \n", urlbuf); + LM_DBG("***** #### ***** CURL DONE: %s (%d)\n", urlbuf, res); error: + if (failovercon != NULL) { + pkg_free(failovercon); + } if (urlbuf != NULL) { pkg_free(urlbuf); }

1 0

git:master:1948fa53: kamailio.cfg: filter out sip scanner even when anti-flood is not enabled
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 1948fa5312b8ab836ace4ab76a383ed29b049ae6 URL: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T14:21:08+02:00 kamailio.cfg: filter out sip scanner even when anti-flood is not enabled - better protection with default installation --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… Patch: https://github.com/kamailio/kamailio/commit/1948fa5312b8ab836ace4ab76a383ed… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index bce9d41a7e..067f0f680e 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -562,12 +562,12 @@ route[REQINIT] { exit; } } - if($ua =~ "friendly-scanner|sipcli") { +#!endif + if($ua =~ "friendly-scanner|sipcli|VaxSIPUserAgent") { # silent drop for scanners - uncomment next line if want to reply # sl_send_reply("200", "OK"); exit; } -#!endif if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops");

1 0

git:master:37830f53: topos: use branch attributes to handle PRACK
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 37830f53b1f21fba5beef5d8e22913c431dcd708 URL: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:52:45+02:00 topos: use branch attributes to handle PRACK --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… Patch: https://github.com/kamailio/kamailio/commit/37830f53b1f21fba5beef5d8e22913c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 37b075ae94..23cfb07412 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -735,6 +735,7 @@ int tps_request_received(sip_msg_t *msg, int dialog) str nuri; uint32_t direction = TPS_DIR_DOWNSTREAM; int ret; + int use_branch = 0; LM_DBG("handling incoming request\n"); @@ -761,8 +762,15 @@ int tps_request_received(sip_msg_t *msg, int dialog) tps_storage_lock_get(&lkey); - if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { - goto error; + if((get_cseq(msg)->method_id)&(METHOD_PRACK)) { + if(tps_storage_load_branch(msg, &mtsd, &stsd)<0) { + goto error; + } + use_branch = 1; + } else { + if(tps_storage_load_dialog(msg, &mtsd, &stsd)<0) { + goto error; + } } /* detect direction - via from-tag */ @@ -791,14 +799,28 @@ int tps_request_received(sip_msg_t *msg, int dialog) return -1; } if(direction == TPS_DIR_UPSTREAM) { - if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { - LM_ERR("failed to reappend a-route\n"); - return -1; + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.x_rr, 0)<0) { + LM_ERR("failed to reappend x-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.a_rr, 0)<0) { + LM_ERR("failed to reappend a-route\n"); + return -1; + } } } else { - if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { - LM_ERR("failed to reappend b-route\n"); - return -1; + if(use_branch) { + if(tps_reappend_route(msg, &stsd, &stsd.y_rr, 1)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } + } else { + if(tps_reappend_route(msg, &stsd, &stsd.b_rr, 1)<0) { + LM_ERR("failed to reappend b-route\n"); + return -1; + } } } if(dialog!=0) {

1 0

git:master:8be0f000: tm: cleaner handling of dynamic regex param for t_check_status()
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 8be0f000f74cf08e0be6bc7d0a72cae948483416 URL: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:39:38+02:00 tm: cleaner handling of dynamic regex param for t_check_status() --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… Patch: https://github.com/kamailio/kamailio/commit/8be0f000f74cf08e0be6bc7d0a72cae… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 5adef0f02f..68071c3fe4 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -862,6 +862,7 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) char backup; int lowest_status, n, ret; fparam_t* fp; + regex_t* re0 = NULL; regex_t* re = NULL; str tmp; @@ -892,17 +893,18 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) memcpy(s, tmp.s, tmp.len); s[tmp.len] = '\0'; - if ((re = pkg_malloc(sizeof(regex_t))) == 0) { + if ((re0 = pkg_malloc(sizeof(regex_t))) == 0) { LM_ERR("No memory left\n"); goto error; } - if (regcomp(re, s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { + if (regcomp(re0, s, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { LM_ERR("Bad regular expression '%s'\n", s); - pkg_free(re); - re = NULL; + pkg_free(re0); + re0 = NULL; goto error; } + re = re0; break; } @@ -953,9 +955,9 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) if (backup) status[msg->first_line.u.reply.status.len] = backup; if (s) pkg_free(s); - if (fp->type != FPARAM_REGEX) { - regfree(re); - pkg_free(re); + if (re0) { + regfree(re0); + pkg_free(re0); } if (unlikely(t && is_route_type(CORE_ONREPLY_ROUTE))){ @@ -975,9 +977,9 @@ static int t_check_status(struct sip_msg* msg, char *p1, char *foo) set_t(T_UNDEFINED, T_BR_UNDEFINED); } if (s) pkg_free(s); - if ((fp->type != FPARAM_REGEX) && re) { - regfree(re); - pkg_free(re); + if (re0) { + regfree(re0); + pkg_free(re0); } return -1; }

1 0

git:master:72e0ebcd: ctl: proper handling of realloc failure to avoid leak
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 72e0ebcdcbc5ffcd7ea475334437e56b22e143d4 URL: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T13:33:46+02:00 ctl: proper handling of realloc failure to avoid leak --- Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… Patch: https://github.com/kamailio/kamailio/commit/72e0ebcdcbc5ffcd7ea475334437e56… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index a84073a802..18122bfcef 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -1277,6 +1277,7 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) { int n, buf_size; char* buf; + char* buf0; va_list ap; str s; struct text_chunk* l; @@ -1287,7 +1288,7 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) ERR("No memory left\n"); return -1; } - + buf_size = RPC_BUF_SIZE; while (1) { /* Try to print in the allocated space. */ @@ -1314,11 +1315,12 @@ static int rpc_rpl_printf(rpc_ctx_t* ctx, char* fmt, ...) } else { /* glibc 2.0 */ buf_size *= 2; /* twice the old size */ } - if ((buf = ctl_realloc(buf, buf_size)) == 0) { + if ((buf0 = ctl_realloc(buf, buf_size)) == 0) { rpc_fault(ctx, 500, "Internal Server Error (No memory left)"); ERR("No memory left\n"); goto err; } + buf = buf0; } return 0; err:

1 0

git:master:91ebd257: path: fix for handling received parameter, issue added by format support
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 91ebd25726c7f4b8870e8934d60cdc7cb90d1970 URL: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T12:23:18+02:00 path: fix for handling received parameter, issue added by format support - reported by GH #1205 --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7… Patch: https://github.com/kamailio/kamailio/commit/91ebd25726c7f4b8870e8934d60cdc7…

1 0

git:master:5f0792e7: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: 5f0792e7ee985b80601e6f952269bc48031e6356 URL: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-08-07T11:31:22+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… Patch: https://github.com/kamailio/kamailio/commit/5f0792e7ee985b80601e6f952269bc4… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 3e42389014..cf4bce61f6 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -32,6 +32,11 @@ Daniel-Constantin Mierla 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) + + 4. Event Routes + + 4.1. event_route[topos:msg-outgoing] List of Examples @@ -42,6 +47,8 @@ Daniel-Constantin Mierla 1.5. Set branch_expire parameter 1.6. Set dialog_expire parameter 1.7. Set clean_interval parameter + 1.8. Set event_callback parameter + 1.9. Usage of event_route[topos:msg-outgoing] Chapter 1. Admin Guide @@ -62,6 +69,11 @@ Chapter 1. Admin Guide 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) + + 4. Event Routes + + 4.1. event_route[topos:msg-outgoing] 1. Overview @@ -102,6 +114,7 @@ Chapter 1. Admin Guide 3.5. branch_expire (int) 3.6. dialog_expire (int) 3.7. clean_interval (int) + 3.8. event_callback (str) 3.1. storage (str) @@ -188,3 +201,49 @@ modparam("topos", "dialog_expire", 3600) ... modparam("topos", "clean_interval", 30) ... + +3.8. event_callback (str) + + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead of + event_route[...] blocks. + + The function receives a string parameter with the name of the event. + + Default value is 'empty' (no function is executed for events). + + Example 1.8. Set event_callback parameter +... +modparam("topos", "event_callback", "ksr_topos_event") +... +-- event callback function implemented in Lua +function ksr_topos_event(evname) + KSR.info("===== topos module triggered event: " .. evname .. "\n"); + return 1; +end +... + +4. Event Routes + + 4.1. event_route[topos:msg-outgoing] + +4.1. event_route[topos:msg-outgoing] + + It is executed before doing topology stripping processing for an + outgoing SIP message. If 'drop' is executed inside the event route, + then the module skips doing the topology hiding. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + + Example 1.9. Usage of event_route[topos:msg-outgoing] +... +event_route[topos:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +...

1 0

git:master:f6dc8715: topos: docs for event_callback param and event_route[topos:msg-outgoing]
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f6dc87151138e600d593a345109ba2028d2dc16f URL: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T11:23:53+02:00 topos: docs for event_callback param and event_route[topos:msg-outgoing] --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… Patch: https://github.com/kamailio/kamailio/commit/f6dc87151138e600d593a345109ba20… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 77de4b8cbd..bda8ab766d 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -223,7 +223,66 @@ modparam("topos", "clean_interval", 30) </programlisting> </example> </section> - + <section id="topos.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[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event. + </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("topos", "event_callback", "ksr_topos_event") +... +-- event callback function implemented in Lua +function ksr_topos_event(evname) + KSR.info("===== topos module triggered event: " .. evname .. "\n"); + return 1; +end +... +</programlisting> + </example> + </section> + </section> + <section> + <title>Event Routes</title> + <section> + <title>event_route[topos:msg-outgoing]</title> + <para> + It is executed before doing topology stripping processing for an outgoing + SIP message. If 'drop' is executed inside the event route, then the + module skips doing the topology hiding. + </para> + <para> + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is not the one + to be sent out, but an internally generated one at startup, to avoid + reparsing the outgoing SIP message for the cases when topology hiding + is not wanted. + </para> + <example> + <title>Usage of event_route[topos:msg-outgoing]</title> + <programlisting format="linespecific"> +... +event_route[topos:msg-outgoing] { + if($sndto(ip)=="10.1.1.10") { + drop; + } +} +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master:f16c0433: topos: added support for event_route[topos:msg-outgoing]
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f16c0433e0190736b16d8346d1521e3c32b2e219 URL: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T11:15:33+02:00 topos: added support for event_route[topos:msg-outgoing] - executed when a request is sent out - if drop() is used inside the event_route, then the request is no longer handled with topos --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… Patch: https://github.com/kamailio/kamailio/commit/f16c0433e0190736b16d8346d1521e3… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 0141c0f2c3..4ed2628291 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -50,6 +50,9 @@ #include "../../core/parser/parse_to.h" #include "../../core/parser/parse_from.h" #include "../../core/timer_proc.h" +#include "../../core/fmsg.h" +#include "../../core/onsend.h" +#include "../../core/kemi.h" #include "../../lib/srdb1/db.h" #include "../../lib/srutils/sruid.h" @@ -81,11 +84,17 @@ extern int _tps_dialog_expire; int _tps_clean_interval = 60; +static int _tps_eventrt_outgoing = -1; +static str _tps_eventrt_callback = STR_NULL; +static str _tps_eventrt_name = str_init("topos:msg-outgoing"); + sanity_api_t scb; int tps_msg_received(sr_event_param_t *evp); int tps_msg_sent(sr_event_param_t *evp); +static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp); + /** module functions */ /* Module init function prototype */ static int mod_init(void); @@ -111,6 +120,7 @@ static param_export_t params[]={ {"branch_expire", PARAM_INT, &_tps_branch_expire}, {"dialog_expire", PARAM_INT, &_tps_dialog_expire}, {"clean_interval", PARAM_INT, &_tps_clean_interval}, + {"event_callback", PARAM_STR, &_tps_eventrt_callback}, {0,0,0} }; @@ -136,6 +146,17 @@ struct module_exports exports= { */ static int mod_init(void) { + _tps_eventrt_outgoing = route_lookup(&event_rt, _tps_eventrt_name.s); + if(_tps_eventrt_outgoing<0 + || event_rt.rlist[_tps_eventrt_outgoing]==NULL) { + _tps_eventrt_outgoing = -1; + } + + if(faked_msg_init()<0) { + LM_ERR("failed to init fmsg\n"); + return -1; + } + if(_tps_storage.len==2 && strncmp(_tps_storage.s, "db", 2)==0) { /* Find a database module */ if (db_bind_mod(&_tps_db_url, &_tpsdbf)) { @@ -352,6 +373,11 @@ int tps_msg_sent(sr_event_param_t *evp) int local; obuf = (str*)evp->data; + + if(tps_execute_event_route(NULL, evp)==1) { + return 0; + } + memset(&msg, 0, sizeof(sip_msg_t)); msg.buf = obuf->s; msg.len = obuf->len; @@ -408,6 +434,76 @@ int tps_get_branch_expire(void) /** * */ +static int tps_execute_event_route(sip_msg_t *msg, sr_event_param_t *evp) +{ + struct sip_msg *fmsg; + struct run_act_ctx ctx; + int rtb; + sr_kemi_eng_t *keng = NULL; + struct onsend_info onsnd_info = {0}; + + if(_tps_eventrt_outgoing<0) { + if(_tps_eventrt_callback.s!=NULL || _tps_eventrt_callback.len>0) { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + _tps_eventrt_callback.s); + goto done; + } + } + } + + if(_tps_eventrt_outgoing<0 && keng==NULL) { + return 0; + } + + LM_DBG("executing event_route[topos:...] (%d)\n", + _tps_eventrt_outgoing); + fmsg = faked_msg_next(); + + onsnd_info.to = &evp->dst->to; + onsnd_info.send_sock = evp->dst->send_sock; + if(msg!=NULL) { + onsnd_info.buf = msg->buf; + onsnd_info.len = msg->len; + onsnd_info.msg = msg; + } else { + onsnd_info.buf = fmsg->buf; + onsnd_info.len = fmsg->len; + onsnd_info.msg = fmsg; + } + p_onsend = &onsnd_info; + + rtb = get_route_type(); + set_route_type(REQUEST_ROUTE); + init_run_actions_ctx(&ctx); + if(_tps_eventrt_outgoing>=0) { + run_top_route(event_rt.rlist[_tps_eventrt_outgoing], fmsg, &ctx); + } else { + if(keng!=NULL) { + if(keng->froute(fmsg, EVENT_ROUTE, + &_tps_eventrt_callback, &_tps_eventrt_name)<0) { + LM_ERR("error running event route kemi callback\n"); + p_onsend=NULL; + return -1; + } + } + } + set_route_type(rtb); + if(ctx.run_flags&DROP_R_F) { + LM_DBG("exit due to 'drop' in event route\n"); + p_onsend=NULL; + return 1; + } + +done: + p_onsend=NULL; + return 0; +} + +/** + * + */ int bind_topos(topos_api_t *api) { if (!api) { @@ -420,4 +516,4 @@ int bind_topos(topos_api_t *api) api->get_branch_expire = tps_get_branch_expire; return 0; -} +} \ No newline at end of file

1 0

git:master:f6b8bd17: core: parser - converted old log macros
by Daniel-Constantin Mierla 07 Aug '17

07 Aug '17

Module: kamailio Branch: master Commit: f6b8bd17f167c0527fb240a9de71539e29b85f07 URL: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-07T09:16:15+02:00 core: parser - converted old log macros - indentation adjustments --- Modified: src/core/parser/hf.c Modified: src/core/parser/parse_allow.c Modified: src/core/parser/parse_content.c Modified: src/core/parser/parse_date.c Modified: src/core/parser/parse_event.c Modified: src/core/parser/parse_expires.c Modified: src/core/parser/parse_identity.c Modified: src/core/parser/parse_identityinfo.c Modified: src/core/parser/parse_methods.c Modified: src/core/parser/parse_refer_to.c Modified: src/core/parser/parse_retry_after.c Modified: src/core/parser/parse_rr.c Modified: src/core/parser/parse_sipifmatch.c Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539… Patch: https://github.com/kamailio/kamailio/commit/f6b8bd17f167c0527fb240a9de71539…

1 0

← Newer
1
...
23
24
25
26
27
28
29
30
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017