sr-dev July 2021

sr-dev@lists.kamailio.org

13 participants
227 discussions

git:5.4:198753a4: xhttp: extended example for event_route[xhttp:request]

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 198753a49da7ff81965d4eeac1d96e53dbe901a6 URL: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:47:28+02:00 xhttp: extended example for event_route[xhttp:request] (cherry picked from commit 195de260f102f1a016ad7bd1021571c1dd8a983f) (cherry picked from commit 42df0f0b58a2b5780a9bf613a5a29d4af27b4f67) --- Modified: src/modules/xhttp/doc/xhttp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… Patch: https://github.com/kamailio/kamailio/commit/198753a49da7ff81965d4eeac1d96e5… --- diff --git a/src/modules/xhttp/doc/xhttp_admin.xml b/src/modules/xhttp/doc/xhttp_admin.xml index c2a18f9d44..507283b90f 100644 --- a/src/modules/xhttp/doc/xhttp_admin.xml +++ b/src/modules/xhttp/doc/xhttp_admin.xml @@ -222,6 +222,11 @@ event_route[xhttp:request] { </para> <programlisting format="linespecific"> ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

3 years, 4 months

git:5.4:2dc8fa86: secsipid: explicit STIR/SHAKEN reference

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 2dc8fa863c48465051bde2383acbad753583a2b2 URL: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:46:27+02:00 secsipid: explicit STIR/SHAKEN reference - help matching on search terms (cherry picked from commit a59ea8920c17aca29ffa734ca0babb107a415fde) (cherry picked from commit 3e0f634c1dd11702a97cc2fe2c3f70f1f933a4f3) --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… Patch: https://github.com/kamailio/kamailio/commit/2dc8fa863c48465051bde2383acbad7… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 1b057696f6..e22d8f9aff 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -19,7 +19,7 @@ The module implements secure SIP identity specifications - STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + IETF extensions for SIP (RFC8224, RFC8588), known together as STIR/SHAKEN. </para> <para> It exports the functions to check and generate SIP Identity header.

3 years, 4 months

git:5.4:4f02ec38: siptrace: fixed IPv6 without brackets

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 4f02ec387cf9f46cc83ec6fea0df0a17ab7f08a5 URL: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:46:07+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 (cherry picked from commit 417eb2a7052a9354712663cca9e3bc075a3f69c0) (cherry picked from commit 903e41468a00edeff52cbf1e3c0053c82860c92c) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… Patch: https://github.com/kamailio/kamailio/commit/4f02ec387cf9f46cc83ec6fea0df0a1… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fbeb3fb764..afd8bfef24 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2061,7 +2061,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", siptrace_proto_name(nd->rcv->proto), - ip_addr2a(&nd->rcv->src_ip), (int)nd->rcv->src_port); + ip_addr2strz(&nd->rcv->src_ip), (int)nd->rcv->src_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); sto.fromip.s = SIPTRACE_ANYADDR; @@ -2071,7 +2071,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) } sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2a(&nd->rcv->dst_ip), + siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len);

3 years, 4 months

git:5.4:e1fb94f5: pv: added missing WS and WSS to $K(key) variable

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: e1fb94f5c258038527f8f8df90135d6a4c2a4391 URL: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:45:28+02:00 pv: added missing WS and WSS to $K(key) variable (cherry picked from commit a8c9d0ae4fbafba89ef12737419037d141eed1d3) (cherry picked from commit 7b89c5e6abe5f4ae3ee55d9c938c865806f29dec) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… Patch: https://github.com/kamailio/kamailio/commit/e1fb94f5c258038527f8f8df90135d6… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index c07096c240..9bbce87c26 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3303,6 +3303,10 @@ int pv_parse_K_name(pv_spec_p sp, str *in) switch(in->len) { + case 2: + if(strncmp(in->s, "WS", 2)==0) + sp->pvp.pvn.u.isname.name.n = 6; + else goto error; case 3: if(strncmp(in->s, "UDP", 3)==0) sp->pvp.pvn.u.isname.name.n = 2; @@ -3310,6 +3314,8 @@ int pv_parse_K_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 3; else if(strncmp(in->s, "TLS", 3)==0) sp->pvp.pvn.u.isname.name.n = 4; + else if(strncmp(in->s, "WSS", 3)==0) + sp->pvp.pvn.u.isname.name.n = 7; else goto error; break; case 4: @@ -3381,6 +3387,10 @@ int pv_get_K(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_uintval(msg, param, res, PROTO_TLS); case 5: return pv_get_uintval(msg, param, res, PROTO_SCTP); + case 6: + return pv_get_uintval(msg, param, res, PROTO_WS); + case 7: + return pv_get_uintval(msg, param, res, PROTO_WSS); default: return pv_get_uintval(msg, param, res, AF_INET); }

3 years, 4 months

git:5.4:5b849659: app_perl change to ignore "die" signals from eval blocks

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 5b849659b23c1fad9161d51c1e7aac5a96d8850c URL: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:45:02+02:00 app_perl change to ignore "die" signals from eval blocks (cherry picked from commit 50557b8433e137a9095b4d48df8ac9b8c3fd8807) (cherry picked from commit 7192139d77f844cd927c326ce16cadfc63378b35) --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… Patch: https://github.com/kamailio/kamailio/commit/5b849659b23c1fad9161d51c1e7aac5… --- diff --git a/src/modules/app_perl/lib/perl/Kamailio.pm b/src/modules/app_perl/lib/perl/Kamailio.pm index eda5ede8b7..aa587424e1 100644 --- a/src/modules/app_perl/lib/perl/Kamailio.pm +++ b/src/modules/app_perl/lib/perl/Kamailio.pm @@ -40,6 +40,7 @@ bootstrap Kamailio; BEGIN { $SIG{'__DIE__'} = sub { + die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; $SIG{'__WARN__'} = sub {

3 years, 4 months

git:5.4:5e390618: pv: test for HDR_ERROR_T after header name parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 5e39061818a0d52ac3a692c6357a497a09207e87 URL: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:44:42+02:00 pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) (cherry picked from commit 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… Patch: https://github.com/kamailio/kamailio/commit/5e39061818a0d52ac3a692c6357a497… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6d793185dc..c07096c240 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3248,8 +3248,8 @@ int pv_parse_hdr_name(pv_spec_p sp, str *in) s.s = p; s.len = in->len+1; - if (parse_hname2_short(s.s, s.s + s.len, &hdr)==0) - { + parse_hname2_short(s.s, s.s + s.len, &hdr); + if(hdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", s.len, s.s); goto error; }

3 years, 4 months

git:5.4:465fbace: dialog: safety checks for bind addr fields

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 465fbace1586874b60b98ab04caddd1c76b2810c URL: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:44:19+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) (cherry picked from commit b6428ca86c821ddf74fd4ea8a17aecdce39934f4) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… Patch: https://github.com/kamailio/kamailio/commit/465fbace1586874b60b98ab04caddd1… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 1bfcb2cad7..b6a49da2a4 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -802,6 +802,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int i; struct dlg_var *var; srjson_doc_t jdoc; + str sempty = str_init(""); db_val_t values[DIALOG_TABLE_COL_NO]; @@ -870,14 +871,25 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) SET_STR_VALUE(values+6, cell->tag[DLG_CALLEE_LEG]); SET_PROPER_NULL_FLAG(cell->tag[DLG_CALLEE_LEG], values, 6); - LM_DBG("caller sock_info is %.*s, callee sock_info is %.*s\n", - cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLER_LEG]->sock_str.s, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, - cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); - SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); - SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + if(cell->bind_addr[DLG_CALLER_LEG]) { + LM_DBG("caller sock_info is %.*s\n", + cell->bind_addr[DLG_CALLER_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLER_LEG]->sock_str.s); + SET_STR_VALUE(values+7, cell->bind_addr[DLG_CALLER_LEG]->sock_str); + } else { + LM_DBG("no caller sock_info\n"); + SET_STR_VALUE(values+7, sempty); + } + if(cell->bind_addr[DLG_CALLEE_LEG]) { + LM_DBG("callee sock_info is %.*s\n", + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.len, + cell->bind_addr[DLG_CALLEE_LEG]->sock_str.s); + SET_STR_VALUE(values+8, cell->bind_addr[DLG_CALLEE_LEG]->sock_str); + } else { + LM_DBG("no callee sock_info\n"); + SET_STR_VALUE(values+8, sempty); + } SET_STR_VALUE(values+12, cell->cseq[DLG_CALLER_LEG]); SET_STR_VALUE(values+13, cell->cseq[DLG_CALLEE_LEG]);

3 years, 4 months

git:5.5:75571e17: core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 75571e1739470877365e7c25548ef282e81283a1 URL: https://github.com/kamailio/kamailio/commit/75571e1739470877365e7c25548ef28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:40:38+02:00 core: pvapi - reinitialize _pv_print_buffer_index when adjusting the slots - GH #2798 (cherry picked from commit 61cbb5e861aeb9b7f69ebb8d284e3ded0ede9cd8) --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/75571e1739470877365e7c25548ef28… Patch: https://github.com/kamailio/kamailio/commit/75571e1739470877365e7c25548ef28… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 5fc2952ed9..a87c91756c 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2147,6 +2147,7 @@ int pv_init_buffer(void) _pv_print_buffer_slots, _pv_print_buffer_size); _pv_print_buffer_slots_active = _pv_print_buffer_slots; _pv_print_buffer_size_active = _pv_print_buffer_size; + _pv_print_buffer_index = 0; return 0; } @@ -2168,6 +2169,7 @@ void pv_destroy_buffer(void) pkg_free(_pv_print_buffer); _pv_print_buffer_slots_active = 0; _pv_print_buffer_size_active = 0; + _pv_print_buffer_index = 0; _pv_print_buffer = NULL; } @@ -2177,8 +2179,9 @@ void pv_destroy_buffer(void) int pv_reinit_buffer(void) { if(_pv_print_buffer_size==_pv_print_buffer_size_active - && _pv_print_buffer_slots==_pv_print_buffer_slots_active) + && _pv_print_buffer_slots==_pv_print_buffer_slots_active) { return 0; + } pv_destroy_buffer(); return pv_init_buffer(); }

3 years, 4 months

git:5.5:044a2e66: sworker: docs - fixed small typo

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 044a2e665ce5612980b203c705f75ee786be5316 URL: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-07-29T10:40:06+02:00 sworker: docs - fixed small typo (cherry picked from commit fc62ceeb6d625acda6952486031efa1fe2945768) --- Modified: src/modules/sworker/doc/sworker_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… Patch: https://github.com/kamailio/kamailio/commit/044a2e665ce5612980b203c705f75ee… --- diff --git a/src/modules/sworker/doc/sworker_admin.xml b/src/modules/sworker/doc/sworker_admin.xml index 9656ff1071..2110998f2f 100644 --- a/src/modules/sworker/doc/sworker_admin.xml +++ b/src/modules/sworker/doc/sworker_admin.xml @@ -109,7 +109,7 @@ request_route { 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 (false) in case there - was a proble delegating the processing. + was a problem delegating the processing. </para> <para> This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

3 years, 4 months

git:master:b4e94080: modules: readme files regenerated - textopsx ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: b4e94080987a4f8e2b04ac5c8ef7ce89ad4246ee URL: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-07-29T09:16:28+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… Patch: https://github.com/kamailio/kamailio/commit/b4e94080987a4f8e2b04ac5c8ef7ce8… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 3824577860..ad9277ce37 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -39,6 +39,7 @@ Daniel-Constantin Mierla 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 3. Selects @@ -68,7 +69,8 @@ Daniel-Constantin Mierla 1.18. hf_iterator_next usage 1.19. hf_iterator_rm usage 1.20. hf_iterator_append usage - 1.21. @hf_value select usage + 1.21. hf_iterator_insert usage + 1.22. @hf_value select usage Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 3. Selects @@ -136,6 +139,7 @@ Chapter 1. Admin Guide 2.18. textopsx.f.hf_iterator_next(iname) 2.19. hf_iterator_rm(iname) 2.20. hf_iterator_append(iname, htext) + 2.21. hf_iterator_insert(iname, htext) 2.1. msg_apply_changes() @@ -517,6 +521,26 @@ hf_iterator_end("i1"); hf_iterator_end("i1"); ... +2.21. hf_iterator_insert(iname, htext) + + Add headers before the one at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.21. hf_iterator_insert usage +... + hf_iterator_start("i1"); + while(hf_iterator_next("i1")) { + if($hfitname(i1)=="My-Header") { + hf_iterator_insert("i1", "My-New-Header: abc\r\n"); + break; + } + } + hf_iterator_end("i1"); +... + 3. Selects 3.1. @hf_value @@ -552,7 +576,7 @@ hf_iterator_end("i1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.21. @hf_value select usage + Example 1.22. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

3 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2021