sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:5.2:b45c9f25: core: kemi - exported functions for equivalent tests of src_port and dst_port

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: b45c9f2525e926a07d9c7fe2e212675327197990 URL: https://github.com/kamailio/kamailio/commit/b45c9f2525e926a07d9c7fe2e212675… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-10T09:21:24+01:00 core: kemi - exported functions for equivalent tests of src_port and dst_port (cherry picked from commit 235a10bc7316f3b91ae6ab51960702a07f69f27a) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b45c9f2525e926a07d9c7fe2e212675… Patch: https://github.com/kamailio/kamailio/commit/b45c9f2525e926a07d9c7fe2e212675… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 68a6a80f49..3c6bba057f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1063,6 +1063,25 @@ static int sr_kemi_core_is_af_ipv6(sip_msg_t *msg) return (msg->rcv.bind_address->address.af==AF_INET6)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_src_port(sip_msg_t *msg, int vport) +{ + return (vport == (int)msg->rcv.src_port)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_dst_port(sip_msg_t *msg, int vport) +{ + if(msg==NULL || msg->rcv.bind_address==NULL) { + return SR_KEMI_FALSE; + } + return (vport == (int)msg->rcv.bind_address->port_no)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + /** * */ @@ -1621,6 +1640,16 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_src_port"), + SR_KEMIP_BOOL, sr_kemi_core_is_src_port, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_dst_port"), + SR_KEMIP_BOOL, sr_kemi_core_is_dst_port, + { SR_KEMIP_INT, 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 } } };

5 years, 8 months

git:5.2:6129c28f: core: kemi - corresponding functions to check af==ipv4/ipv6

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: 6129c28f8c5957ca409a8e51737e4d9fbd860652 URL: https://github.com/kamailio/kamailio/commit/6129c28f8c5957ca409a8e51737e4d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-10T09:21:01+01:00 core: kemi - corresponding functions to check af==ipv4/ipv6 (cherry picked from commit 61795123af0a2d2cb261c36ac78a4833f03a3321) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/6129c28f8c5957ca409a8e51737e4d9… Patch: https://github.com/kamailio/kamailio/commit/6129c28f8c5957ca409a8e51737e4d9… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 82b3ac4ec0..68a6a80f49 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1041,6 +1041,28 @@ static int sr_kemi_core_is_proto_sctp(sip_msg_t *msg) return (msg->rcv.proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_af_ipv4(sip_msg_t *msg) +{ + if(msg==NULL || msg->rcv.bind_address==NULL) { + return SR_KEMI_FALSE; + } + return (msg->rcv.bind_address->address.af==AF_INET)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_af_ipv6(sip_msg_t *msg) +{ + if(msg==NULL || msg->rcv.bind_address==NULL) { + return SR_KEMI_FALSE; + } + return (msg->rcv.bind_address->address.af==AF_INET6)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + /** * */ @@ -1589,6 +1611,16 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_IPv4"), + SR_KEMIP_BOOL, sr_kemi_core_is_af_ipv4, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_IPv6"), + SR_KEMIP_BOOL, sr_kemi_core_is_af_ipv6, + { 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 } } };

5 years, 8 months

git:5.2:fc093212: core: exported functions to check incoming protocol

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: fc09321222889dac8138d31d2b19247c02041687 URL: https://github.com/kamailio/kamailio/commit/fc09321222889dac8138d31d2b19247… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-10T09:20:49+01:00 core: exported functions to check incoming protocol - corresponding to proto==UDP/TCP/TLS/... (cherry picked from commit d33d60e08b5081a605149b3bff2a0397c0952e9b) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/fc09321222889dac8138d31d2b19247… Patch: https://github.com/kamailio/kamailio/commit/fc09321222889dac8138d31d2b19247… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 282be877c9..82b3ac4ec0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -993,6 +993,54 @@ static int sr_kemi_core_is_method_prack(sip_msg_t *msg) return sr_kemi_core_is_method_type(msg, METHOD_PRACK); } +/** + * + */ +static int sr_kemi_core_is_proto_udp(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_UDP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_tcp(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_TCP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_tls(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_TLS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_ws(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_wss(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_WSS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_sctp(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + /** * */ @@ -1511,6 +1559,36 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_TCP"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_tcp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_TLS"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_tls, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_WS"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_ws, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_WSS"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_wss, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_SCTP"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_sctp, + { 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 } } };

5 years, 8 months

git:master:a2915a9f: app_python: execution log message based on core latency_limit_action

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a2915a9fc3d974e85829ccb6ea22d655124d4463 URL: https://github.com/kamailio/kamailio/commit/a2915a9fc3d974e85829ccb6ea22d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-10T10:56:03+01:00 app_python: execution log message based on core latency_limit_action --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a2915a9fc3d974e85829ccb6ea22d65… Patch: https://github.com/kamailio/kamailio/commit/a2915a9fc3d974e85829ccb6ea22d65… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 87e2ccce07..7a3717ecce 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -23,12 +23,14 @@ #include <stdlib.h> #include <Python.h> +#include <frameobject.h> #include "../../core/dprint.h" #include "../../core/route.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../core/pvar.h" +#include "../../core/timer.h" #include "../../core/mem/pkg.h" #include "../../core/mem/shm.h" #include "../../core/rpc.h" @@ -160,15 +162,16 @@ PyObject *sr_apy_kemi_return_str(sr_kemi_t *ket, char *sval, int slen) { return PyString_FromStringAndSize(sval, slen); } + /** * */ -PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) +PyObject *sr_apy_kemi_exec_func_ex(sr_kemi_t *ket, PyObject *self, + PyObject *args, int idx) { str fname; int i; int ret; - sr_kemi_t *ket = NULL; sr_kemi_val_t vps[SR_KEMI_PARAMS_MAX]; sr_apy_env_t *env_P; sip_msg_t *lmsg = NULL; @@ -185,10 +188,6 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) lmsg = env_P->msg; } - ket = sr_apy_kemi_export_get(idx); - if(ket==NULL) { - return sr_kemi_apy_return_false(); - } if(ket->mname.len>0) { LM_DBG("execution of method: %.*s\n", ket->fname.len, ket->fname.s); } else { @@ -700,6 +699,50 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) } } +/** + * + */ +PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) +{ + sr_kemi_t *ket = NULL; + PyObject *ret = NULL; + unsigned int ms = 0; + PyThreadState *pstate = NULL; + PyFrameObject *pframe = NULL; + + ket = sr_apy_kemi_export_get(idx); + if(ket==NULL) { + return sr_kemi_apy_return_false(); + } + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + ms = TICKS_TO_MS(get_ticks_raw()); + } + + ret = sr_apy_kemi_exec_func_ex(ket, self, args, idx); + + if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0)) { + ms = TICKS_TO_MS(get_ticks_raw()) - ms; + if(ms >= cfg_get(core, core_cfg, latency_limit_action) + && is_printable(cfg_get(core, core_cfg, latency_log))) { + pstate = PyThreadState_GET(); + if (pstate != NULL && pstate->frame != NULL) { + pframe = pstate->frame; + } + + LOG(cfg_get(core, core_cfg, latency_log), + "alert - action KSR.%s%s%s(...)" + " took too long [%u ms] (file:%s func:%s line:%d)\n", + (ket->mname.len>0)?ket->mname.s:"", + (ket->mname.len>0)?".":"", ket->fname.s, ms, + (pframe)?PyString_AsString(pframe->f_code->co_filename):"", + (pframe)?PyString_AsString(pframe->f_code->co_name):"", + (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); + } + } + + return ret; +} + /** * */

5 years, 8 months

git:5.1:8200a5b6: core: free resources in xavp_clone_level_nodata

by Henning Westerholt

Module: kamailio Branch: 5.1 Commit: 8200a5b68a5a2852bbd813fdec1bd82ef8a6ea01 URL: https://github.com/kamailio/kamailio/commit/8200a5b68a5a2852bbd813fdec1bd82… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-09T12:56:12+01:00 core: free resources in xavp_clone_level_nodata (cherry picked from commit 0c93efec739551f3e74e119d4b789d0bb6e766d6) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/8200a5b68a5a2852bbd813fdec1bd82… Patch: https://github.com/kamailio/kamailio/commit/8200a5b68a5a2852bbd813fdec1bd82… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index df6ab03a6f..916b738ed9 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -660,14 +660,11 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) if(navp==NULL) { LM_ERR("cannot create cloned embedded xavp\n"); - if(xnew->val.v.xavp == NULL) - { - shm_free(xnew); - return NULL; - } else { - xavp_destroy_list(&navp); - return NULL; + if(xnew->val.v.xavp != NULL) { + xavp_destroy_list(&xnew->val.v.xavp); } + shm_free(xnew); + return NULL; } LM_DBG("cloned inner xavp [%.*s]\n", oavp->name.len, oavp->name.s); if(xnew->val.v.xavp == NULL)

5 years, 8 months

git:5.2:0b511b49: pv: use parsed uri to compute tosocket

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 0b511b49a7c7327cef7bd5cec63b1c5fddb0750c URL: https://github.com/kamailio/kamailio/commit/0b511b49a7c7327cef7bd5cec63b1c5… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-09T12:56:30+01:00 pv: use parsed uri to compute tosocket (cherry picked from commit dc9531affae6336ea3771792a80385de56205ff0) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/0b511b49a7c7327cef7bd5cec63b1c5… Patch: https://github.com/kamailio/kamailio/commit/0b511b49a7c7327cef7bd5cec63b1c5… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f8074170ac..efbf8e8cf2 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1389,29 +1389,24 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, } break; case TR_URI_TOSOCKET: - if(msg==NULL) { + if(get_valid_proto_string(_tr_parsed_uri.proto, 1, 0, &sproto)<0) { + LM_WARN("unknown transport protocol\n"); + val->rs = _tr_empty; + break; + } + tr_set_crt_buffer(); + val->rs.len = snprintf(_tr_buffer, TR_BUFFER_SIZE, + "%.*s:%.*s:%d", sproto.len, sproto.s, + _tr_parsed_uri.host.len, _tr_parsed_uri.host.s, + (_tr_parsed_uri.port_no!=0) + ?(int)_tr_parsed_uri.port_no:5060); + if(val->rs.len<=0 || val->rs.len>=TR_BUFFER_SIZE) { + LM_WARN("error converting uri to socket address [%.*s]\n", + _tr_uri.len, _tr_uri.s); val->rs = _tr_empty; break; - } else { - if(get_valid_proto_string(msg->rcv.proto, 1, 0, &sproto)<0) { - LM_WARN("unknown transport protocol\n"); - val->rs = _tr_empty; - break; - } - tr_set_crt_buffer(); - val->rs.len = snprintf(_tr_buffer, TR_BUFFER_SIZE, - "%.*s:%.*s:%d", sproto.len, sproto.s, - _tr_parsed_uri.host.len, _tr_parsed_uri.host.s, - (_tr_parsed_uri.port_no!=0) - ?(int)_tr_parsed_uri.port_no:5060); - if(val->rs.len<=0 || val->rs.len>=TR_BUFFER_SIZE) { - LM_WARN("error converting uri to socket address [%.*s]\n", - _tr_uri.len, _tr_uri.s); - val->rs = _tr_empty; - break; - } - val->rs.s = _tr_buffer; } + val->rs.s = _tr_buffer; break; default: LM_ERR("unknown subtype %d\n", @@ -2684,7 +2679,7 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==6 && strncasecmp(name.s, "scheme", 6)==0) { t->subtype = TR_URI_SCHEME; goto done; - } else if(name.len==6 && strncasecmp(name.s, "tosocket", 8)==0) { + } else if(name.len==8 && strncasecmp(name.s, "tosocket", 8)==0) { t->subtype = TR_URI_TOSOCKET; goto done; }

5 years, 8 months

git:5.2:cfd4947e: core: free resources in xavp_clone_level_nodata

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: cfd4947edd6363b31c31706c7c352c5789642ddc URL: https://github.com/kamailio/kamailio/commit/cfd4947edd6363b31c31706c7c352c5… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-09T12:56:06+01:00 core: free resources in xavp_clone_level_nodata (cherry picked from commit 0c93efec739551f3e74e119d4b789d0bb6e766d6) --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/cfd4947edd6363b31c31706c7c352c5… Patch: https://github.com/kamailio/kamailio/commit/cfd4947edd6363b31c31706c7c352c5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index 66797f910b..c758a98099 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -712,14 +712,11 @@ sr_xavp_t *xavp_clone_level_nodata(sr_xavp_t *xold) if(navp==NULL) { LM_ERR("cannot create cloned embedded xavp\n"); - if(xnew->val.v.xavp == NULL) - { - shm_free(xnew); - return NULL; - } else { - xavp_destroy_list(&navp); - return NULL; + if(xnew->val.v.xavp != NULL) { + xavp_destroy_list(&xnew->val.v.xavp); } + shm_free(xnew); + return NULL; } LM_DBG("cloned inner xavp [%.*s]\n", oavp->name.len, oavp->name.s); if(xnew->val.v.xavp == NULL)

5 years, 8 months

git:5.2:e244d6d5: core: increase max_defines from 256 to 512

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: e244d6d5e8138b97f3c3aaa55970835576f9cc3e URL: https://github.com/kamailio/kamailio/commit/e244d6d5e8138b97f3c3aaa55970835… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2019-03-09T12:55:53+01:00 core: increase max_defines from 256 to 512 (cherry picked from commit b4696169e8b464da01774b1e40af677f941c803b) --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/e244d6d5e8138b97f3c3aaa55970835… Patch: https://github.com/kamailio/kamailio/commit/e244d6d5e8138b97f3c3aaa55970835… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index bcdad27322..6a0d23d76f 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1707,7 +1707,7 @@ static int sr_pop_yy_state() /* define/ifdef support */ -#define MAX_DEFINES 256 +#define MAX_DEFINES 512 static ksr_ppdefine_t pp_defines[MAX_DEFINES]; static int pp_num_defines = 0; static int pp_define_type = 0; @@ -1717,7 +1717,7 @@ static int pp_define_index = -1; * ifdef(defined), ifndef(undefined), or the opposite of these * two, but in an else branch */ -#define MAX_IFDEFS 256 +#define MAX_IFDEFS 512 static int pp_ifdef_stack[MAX_IFDEFS]; static int pp_sptr = 0; /* stack pointer */

5 years, 8 months

git:master:1ca82c1a: tmx: use t_release_transaction for t_drop

by Henning Westerholt

Module: kamailio Branch: master Commit: 1ca82c1ab3412ae1572f12d81a92bb76abbdb4ad URL: https://github.com/kamailio/kamailio/commit/1ca82c1ab3412ae1572f12d81a92bb7… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 tmx: use t_release_transaction for t_drop --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1ca82c1ab3412ae1572f12d81a92bb7… Patch: https://github.com/kamailio/kamailio/commit/1ca82c1ab3412ae1572f12d81a92bb7… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 1dc22f4f27..a6155f25b1 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -715,9 +715,7 @@ static int ki_t_drop_rcode(sip_msg_t* msg, int rcode) } t->uas.status = (unsigned int)rcode; - if(t_is_request_route(msg) == 1) { - _tmx_tmb.t_release(msg); - } + _tmx_tmb.t_release_transaction(t); return 0; }

5 years, 8 months

git:master:22f31b21: core: increase max_defines from 256 to 512

by Henning Westerholt

Module: kamailio Branch: master Commit: 22f31b21470221dd042137f35695b808900dfe16 URL: https://github.com/kamailio/kamailio/commit/22f31b21470221dd042137f35695b80… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2019-03-09T12:52:43+01:00 core: increase max_defines from 256 to 512 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/22f31b21470221dd042137f35695b80… Patch: https://github.com/kamailio/kamailio/commit/22f31b21470221dd042137f35695b80… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 04e40424dd..706c1b05ce 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -1718,7 +1718,7 @@ static int sr_pop_yy_state() /* define/ifdef support */ -#define MAX_DEFINES 256 +#define MAX_DEFINES 512 static ksr_ppdefine_t pp_defines[MAX_DEFINES]; static int pp_num_defines = 0; static int pp_define_type = 0; @@ -1728,7 +1728,7 @@ static int pp_define_index = -1; * ifdef(defined), ifndef(undefined), or the opposite of these * two, but in an else branch */ -#define MAX_IFDEFS 256 +#define MAX_IFDEFS 512 static int pp_ifdef_stack[MAX_IFDEFS]; static int pp_sptr = 0; /* stack pointer */

5 years, 8 months

← Newer
1
...
25
26
27
28
29
30
31
32
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019