sr-dev October 2019

sr-dev@lists.kamailio.org

22 participants
437 discussions

git:5.3:65136e5d: topos: fix event_mode parameter type (GH #2115)
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: 5.3 Commit: 65136e5df6926c7757b52da79eae9ecef26235e1 URL: https://github.com/kamailio/kamailio/commit/65136e5df6926c7757b52da79eae9ec… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T12:34:58+01:00 topos: fix event_mode parameter type (GH #2115) (cherry picked from commit d9c603d3fcc93a3a160a03e7e3c5500d744957db) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65136e5df6926c7757b52da79eae9ec… Patch: https://github.com/kamailio/kamailio/commit/65136e5df6926c7757b52da79eae9ec… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 942c545d58..fa70d06bb9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -121,15 +121,15 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"storage", PARAM_STR, &_tps_storage}, - {"db_url", PARAM_STR, &_tps_db_url}, + {"storage", PARAM_STR, &_tps_storage}, + {"db_url", PARAM_STR, &_tps_db_url}, {"mask_callid", PARAM_INT, &_tps_param_mask_callid}, {"sanity_checks", PARAM_INT, &_tps_sanity_checks}, {"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}, - {"event_mode", PARAM_STR, &_tps_eventrt_mode}, + {"event_mode", PARAM_INT, &_tps_eventrt_mode}, {"contact_host", PARAM_STR, &_tps_contact_host}, {0,0,0} };

1 0

[kamailio/kamailio] topos: fix event_mode parameter type (#2115)
by Bastian Triller 31 Oct '19

31 Oct '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  * fix wrong event route name in docs * `event_mode` is int parameter You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2115 -- Commit Summary -- * topos: fix event_mode parameter type -- File Changes -- M src/modules/topos/doc/topos_admin.xml (2) M src/modules/topos/topos_mod.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2115.patch https://github.com/kamailio/kamailio/pull/2115.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2115

2 2

git:master:e42fcc93: topos: fix documentation for msg-sending event_route (GH #2115)
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: e42fcc9395ee82d3d9d3df0da3728dd652a1d5c2 URL: https://github.com/kamailio/kamailio/commit/e42fcc9395ee82d3d9d3df0da3728dd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T12:30:46+01:00 topos: fix documentation for msg-sending event_route (GH #2115) --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e42fcc9395ee82d3d9d3df0da3728dd… Patch: https://github.com/kamailio/kamailio/commit/e42fcc9395ee82d3d9d3df0da3728dd… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 681c5bb9a1..8b3e2a0515 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -341,7 +341,7 @@ event_route[topos:msg-outgoing] { <title>event_route[topos:msg-sending]</title> <para> It is executed before doing topology stripping processing for a SIP - message to be sent out, being executed after event_route[topos:sending]. + message to be sent out, being executed after event_route[topos:msg-outgoing]. </para> <para> Inside the event route the variables $sndto(ip), $sndto(port) and

1 0

git:master:d9c603d3: topos: fix event_mode parameter type (GH #2115)
by Henning Westerholt 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: d9c603d3fcc93a3a160a03e7e3c5500d744957db URL: https://github.com/kamailio/kamailio/commit/d9c603d3fcc93a3a160a03e7e3c5500… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-10-31T12:29:05+01:00 topos: fix event_mode parameter type (GH #2115) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d9c603d3fcc93a3a160a03e7e3c5500… Patch: https://github.com/kamailio/kamailio/commit/d9c603d3fcc93a3a160a03e7e3c5500… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 942c545d58..fa70d06bb9 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -121,15 +121,15 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"storage", PARAM_STR, &_tps_storage}, - {"db_url", PARAM_STR, &_tps_db_url}, + {"storage", PARAM_STR, &_tps_storage}, + {"db_url", PARAM_STR, &_tps_db_url}, {"mask_callid", PARAM_INT, &_tps_param_mask_callid}, {"sanity_checks", PARAM_INT, &_tps_sanity_checks}, {"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}, - {"event_mode", PARAM_STR, &_tps_eventrt_mode}, + {"event_mode", PARAM_INT, &_tps_eventrt_mode}, {"contact_host", PARAM_STR, &_tps_contact_host}, {0,0,0} };

1 0

git:master:63334e31: evapi: use local allocated buffer to get data parameter for event relay
by Daniel-Constantin Mierla 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: 63334e312d60a5d6a6470b0067c29db672d08c7c URL: https://github.com/kamailio/kamailio/commit/63334e312d60a5d6a6470b0067c29db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-31T09:54:22+01:00 evapi: use local allocated buffer to get data parameter for event relay - use system malloc given that the data can be passed from jsonrpcs, which uses system malloc as well - try to grow the internall buffer as needed based on estimated size of output for the data parameter --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63334e312d60a5d6a6470b0067c29db… Patch: https://github.com/kamailio/kamailio/commit/63334e312d60a5d6a6470b0067c29db…

1 0

git:master:48279e08: core: tcp - set src/dst address before parsing haproxy headers
by Daniel-Constantin Mierla 31 Oct '19

31 Oct '19

Module: kamailio Branch: master Commit: 48279e08ee4a038bc4e6deceb916e5ac186b7802 URL: https://github.com/kamailio/kamailio/commit/48279e08ee4a038bc4e6deceb916e5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-31T09:03:17+01:00 core: tcp - set src/dst address before parsing haproxy headers - the connection ip and port are preserved in this way --- Modified: src/core/tcp_main.c --- Diff: https://github.com/kamailio/kamailio/commit/48279e08ee4a038bc4e6deceb916e5a… Patch: https://github.com/kamailio/kamailio/commit/48279e08ee4a038bc4e6deceb916e5a… --- diff --git a/src/core/tcp_main.c b/src/core/tcp_main.c index 403c0c6adf..9687cbd4b8 100644 --- a/src/core/tcp_main.c +++ b/src/core/tcp_main.c @@ -1215,31 +1215,29 @@ struct tcp_connection* tcpconn_new(int sock, union sockaddr_union* su, c->rcv.src_su=*su; + su2ip_addr(&c->rcv.src_ip, su); + c->rcv.src_port=su_getport(su); + if (likely(local_addr)){ + su2ip_addr(&c->rcv.dst_ip, local_addr); + c->rcv.dst_port=su_getport(local_addr); + }else if (ba){ + c->rcv.dst_ip=ba->address; + c->rcv.dst_port=ba->port_no; + } + c->rcv.bind_address=ba; + atomic_set(&c->refcnt, 0); local_timer_init(&c->timer, tcpconn_main_timeout, c, 0); + if (unlikely(ksr_tcp_accept_haproxy && state == S_CONN_ACCEPT)) { ret = tcpconn_read_haproxy(c); - if (ret == -1) { LM_ERR("invalid PROXY protocol header\n"); goto error; } else if (ret == 1) { LM_DBG("PROXY protocol did not override IP addresses\n"); - goto read_ip_info; - } - } else { -read_ip_info: - su2ip_addr(&c->rcv.src_ip, su); - c->rcv.src_port=su_getport(su); - if (likely(local_addr)){ - su2ip_addr(&c->rcv.dst_ip, local_addr); - c->rcv.dst_port=su_getport(local_addr); - }else if (ba){ - c->rcv.dst_ip=ba->address; - c->rcv.dst_port=ba->port_no; } } - c->rcv.bind_address=ba; print_ip("tcpconn_new: new tcp connection: ", &c->rcv.src_ip, "\n"); LM_DBG("on port %d, type %d\n", c->rcv.src_port, type); init_tcp_req(&c->req, (char*)c+sizeof(struct tcp_connection), rd_b_size);

1 0

git:master:69ccdc25: acc: better evaluation of error return for pv_printf_s()
by Daniel-Constantin Mierla 30 Oct '19

30 Oct '19

Module: kamailio Branch: master Commit: 69ccdc25fbfaf01785127ecb051429e51df6cad5 URL: https://github.com/kamailio/kamailio/commit/69ccdc25fbfaf01785127ecb051429e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-30T18:28:18+01:00 acc: better evaluation of error return for pv_printf_s() --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/69ccdc25fbfaf01785127ecb051429e… Patch: https://github.com/kamailio/kamailio/commit/69ccdc25fbfaf01785127ecb051429e… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index cc66bc67df..4ccf75e653 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -178,7 +178,7 @@ int acc_parse_code(char *p, struct acc_param *param) int acc_get_param_value(struct sip_msg *rq, struct acc_param *param) { if(param->elem!=NULL) { - if(pv_printf_s(rq, param->elem, &param->reason)==-1) { + if(pv_printf_s(rq, param->elem, &param->reason)<0) { LM_ERR("Can't get value for %.*s\n", param->reason.len, param->reason.s); return -1; }

1 0

git:master:6ee9e9c9: core: pv - function to get the size of the value for strings with vars
by Daniel-Constantin Mierla 30 Oct '19

30 Oct '19

Module: kamailio Branch: master Commit: 6ee9e9c9dc2d818a5ce6c6cf7828a68a1c8cb291 URL: https://github.com/kamailio/kamailio/commit/6ee9e9c9dc2d818a5ce6c6cf7828a68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-30T18:28:18+01:00 core: pv - function to get the size of the value for strings with vars - added silent mode for printing strings with vars --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/6ee9e9c9dc2d818a5ce6c6cf7828a68… Patch: https://github.com/kamailio/kamailio/commit/6ee9e9c9dc2d818a5ce6c6cf7828a68… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 1830ba0a2d..0148578315 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -1426,18 +1426,22 @@ int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, /** * */ -int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) +int pv_printf_mode(sip_msg_t* msg, pv_elem_t *list, int mode, char *buf, int *len) { int n; pv_value_t tok; pv_elem_p it; char *cur; - if(msg==NULL || list==NULL || buf==NULL || len==NULL) + if(msg==NULL || list==NULL || buf==NULL || len==NULL) { + LM_DBG("invalid parameters\n"); return -1; + } - if(*len <= 0) + if(*len <= 0) { + LM_DBG("invalid value for output buffer size\n"); return -1; + } *buf = '\0'; cur = buf; @@ -1454,8 +1458,10 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) n += it->text.len; cur += it->text.len; } else { - LM_ERR("no more space for text value - printed:%d token:%d buffer:%d\n", + if(likely(mode)) { + LM_ERR("no more space for text value - printed:%d token:%d buffer:%d\n", n, it->text.len, *len); + } goto overflow; } } @@ -1474,8 +1480,10 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) cur += tok.rs.len; } } else { - LM_ERR("no more space for spec value - printed:%d token:%d buffer:%d\n", + if(likely(mode)) { + LM_ERR("no more space for spec value - printed:%d token:%d buffer:%d\n", n, tok.rs.len, *len); + } goto overflow; } } @@ -1484,8 +1492,10 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) goto done; overflow: - LM_ERR("buffer overflow -- increase the buffer size...\n"); - return -1; + if(likely(mode)) { + LM_ERR("buffer overflow -- increase the buffer size...\n"); + } + return -2; done: #ifdef EXTRA_DEBUG @@ -1496,6 +1506,47 @@ int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len) return 0; } +/** + * + */ +int pv_printf(sip_msg_t* msg, pv_elem_t *list, char *buf, int *len) +{ + return pv_printf_mode(msg, list, 1, buf, len); +} + +/** + * + */ +int pv_printf_size(sip_msg_t* msg, pv_elem_t *list) +{ + int n; + pv_value_t tok; + pv_elem_t *it; + + if(msg==NULL || list==NULL) { + return -1; + } + + n = 0; + for (it=list; it; it=it->next) { + /* count the static text */ + if(it->text.s && it->text.len>0) { + n += it->text.len; + } + /* count the value of the specifier */ + if(it->spec!=NULL && it->spec->type!=PVT_NONE + && pv_get_spec_value(msg, it->spec, &tok)==0) + { + if(tok.flags&PV_VAL_NULL) { + tok.rs = pv_str_null; + } + n += tok.rs.len; + } + } + + return n; +} + /** * */ diff --git a/src/core/pvar.h b/src/core/pvar.h index f225cbc93a..2a249ea118 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -173,7 +173,9 @@ char* pv_parse_spec2(str *in, pv_spec_p sp, int silent); int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value); int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, pv_value_t *value); -int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len); +int pv_printf_mode(sip_msg_t* msg, pv_elem_t* list, int mode, char *buf, int *len); +int pv_printf(sip_msg_t* msg, pv_elem_t* list, char *buf, int *len); +int pv_printf_size(sip_msg_t* msg, pv_elem_t *list); int pv_elem_free_all(pv_elem_p log); void pv_value_destroy(pv_value_t *val); void pv_spec_destroy(pv_spec_t *spec);

1 0

git:master:73e36b6a: core: use pv_elem_t for vstr fixup value get
by Daniel-Constantin Mierla 30 Oct '19

30 Oct '19

Module: kamailio Branch: master Commit: 73e36b6a467491252e1f81be1b8da66d6c1a4b1b URL: https://github.com/kamailio/kamailio/commit/73e36b6a467491252e1f81be1b8da66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-30T18:28:18+01:00 core: use pv_elem_t for vstr fixup value get --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/73e36b6a467491252e1f81be1b8da66… Patch: https://github.com/kamailio/kamailio/commit/73e36b6a467491252e1f81be1b8da66… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index ca2cd6c104..49dbb44f1f 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -747,9 +747,9 @@ int fixup_free_vstr_all(void** param, int param_no) /** * */ -int fixup_get_vstr_buf(sip_msg_t *msg, gparam_t *p, char *buf, int blen) +int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) { - if(pv_printf(msg, (pv_elem_t*)p, buf, &blen)<0) { + if(pv_printf(msg, p, buf, &blen)<0) { LM_ERR("unable to get the value\n"); return -1; } diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index f09cf59e0c..29d937a261 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -158,5 +158,5 @@ free_fixup_function mod_fix_get_fixup_free(fixup_function f); int fixup_vstr_all(void** param, int param_no); int fixup_free_vstr_all(void** param, int param_no); -int fixup_get_vstr_buf(sip_msg_t *msg, gparam_t *p, char *buf, int blen); +int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); #endif

1 0

git:master:3e1438be: core: fixup helpers to get dynamic string parameter in own buffer
by Daniel-Constantin Mierla 30 Oct '19

30 Oct '19

Module: kamailio Branch: master Commit: 3e1438bebdf611b83574ab44c8ed3eb3c7067391 URL: https://github.com/kamailio/kamailio/commit/3e1438bebdf611b83574ab44c8ed3eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-10-30T18:28:18+01:00 core: fixup helpers to get dynamic string parameter in own buffer --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/3e1438bebdf611b83574ab44c8ed3eb… Patch: https://github.com/kamailio/kamailio/commit/3e1438bebdf611b83574ab44c8ed3eb… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 27cdac471c..ca2cd6c104 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -716,3 +716,42 @@ int fixup_free_none_spve(void** param, int param_no) return fixup_free_spve_null(param, 1); return 0; } + + +/** + * + */ +int fixup_vstr_all(void** param, int param_no) +{ + str s; + pv_elem_t *xm; + + s.s = (char*)(*param); + s.len = strlen(s.s); + if(pv_parse_format(&s, &xm)<0) { + LM_ERR("invalid parameter format [%s]\n", (char*)(*param)); + return E_UNSPEC; + } + *param = (void*)xm; + return 0; +} + +/** + * + */ +int fixup_free_vstr_all(void** param, int param_no) +{ + pv_elem_free_all((pv_elem_t*)(*param)); + return 0; +} +/** + * + */ +int fixup_get_vstr_buf(sip_msg_t *msg, gparam_t *p, char *buf, int blen) +{ + if(pv_printf(msg, (pv_elem_t*)p, buf, &blen)<0) { + LM_ERR("unable to get the value\n"); + return -1; + } + return -1; +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index f040fc1b3c..f09cf59e0c 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -156,4 +156,7 @@ int fixup_free_none_spve(void** param, int param_no); /** get the corresp. free fixup function.*/ free_fixup_function mod_fix_get_fixup_free(fixup_function f); +int fixup_vstr_all(void** param, int param_no); +int fixup_free_vstr_all(void** param, int param_no); +int fixup_get_vstr_buf(sip_msg_t *msg, gparam_t *p, char *buf, int blen); #endif

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2019