- sr-dev - kamailio.org

[kamailio/kamailio] postrgresql: kamdbctl create issue (#2773)
by Ilya Demyanov 10 Jun '21

10 Jun '21

``` # kamdbctl create -e \E[37;33mINFO: creating database kamailio ... -e \E[37;33mINFO: Core Kamailio tables successfully created. Install presence related tables? (y/n): y -e \E[37;33mINFO: creating presence tables into kamailio ... -e \E[37;33mINFO: Presence tables successfully created. Install tables for imc cpl siptrace domainpolicy carrierroute drouting userblocklist htable purple uac pipelimit mtree sca mohqueue rtpproxy rtpengine secfilter? (y/n): y -e \E[37;33mINFO: creating extra tables into kamailio ... ERROR: relation "globalblacklist" does not exist ERROR: relation "globalblacklist" does not exist ERROR: relation "globalblacklist_id_seq" does not exist ERROR: relation "globalblacklist_id_seq" does not exist -e \E[37;31mERROR: Grant privileges to extra tables failed! ``` ``` # apt list --installed 'kamailio*' Listing... Done kamailio-postgres-modules/unknown,now 5.5.0+bpo10 amd64 [installed] kamailio/unknown,now 5.5.0+bpo10 amd64 [installed] # cat /etc/debian_version 10.9 ``` at version 5.4 from this repository is not reproduced -- 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/issues/2773

2 4

[kamailio/kamailio] rtpengine: ignore mos 0 when selecting min-mos (#2771)
by Julien Chavanton 10 Jun '21

10 Jun '21

#### 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:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description since mos 0 is unnitialized this can happen when RTP engine does not have a valid RTT (or missing one leg) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2771 -- Commit Summary -- * rtpengine: ignore mos 0 when selecting min-mos -- File Changes -- M src/modules/rtpengine/rtpengine.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2771.patch https://github.com/kamailio/kamailio/pull/2771.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/2771

3 4

git:master:a378f97a: rtpengine: ignore mos 0 when selecting min-mos (#2771)
by GitHub 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: a378f97adac89077de2fb162ec20295f6e4352fe URL: https://github.com/kamailio/kamailio/commit/a378f97adac89077de2fb162ec20295… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-06-10T08:03:13-04:00 rtpengine: ignore mos 0 when selecting min-mos (#2771) and computing average mos --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a378f97adac89077de2fb162ec20295… Patch: https://github.com/kamailio/kamailio/commit/a378f97adac89077de2fb162ec20295… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6f91c222b2..6266520578 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3588,13 +3588,15 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, bencode_item continue; if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "average MOS")) { - average_vals.avg_samples++; - average_vals.mos += vals_decoded.mos; - average_vals.packetloss += vals_decoded.packetloss; - average_vals.jitter += vals_decoded.jitter; - average_vals.roundtrip += vals_decoded.roundtrip; - average_vals.roundtrip_leg += vals_decoded.roundtrip_leg; - average_vals.samples += vals_decoded.samples; + if (vals_decoded.mos > 0) { + average_vals.avg_samples++; + average_vals.mos += vals_decoded.mos; + average_vals.packetloss += vals_decoded.packetloss; + average_vals.jitter += vals_decoded.jitter; + average_vals.roundtrip += vals_decoded.roundtrip; + average_vals.roundtrip_leg += vals_decoded.roundtrip_leg; + average_vals.samples += vals_decoded.samples; + } } if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "highest MOS")) { @@ -3602,7 +3604,7 @@ static void parse_call_stats_1(struct minmax_mos_label_stats *mmls, bencode_item max_vals = vals_decoded; } if (decode_mos_vals_dict(&vals_decoded, ssrc_dict, "lowest MOS")) { - if (vals_decoded.mos < min_vals.mos) + if (vals_decoded.mos > 0 && vals_decoded.mos < min_vals.mos) min_vals = vals_decoded; } }

1 0

[kamailio/kamailio] ERROR: <core> [core/resolve.c:941]: get_record(): unknown type 41 (#2758)
by Andrew Webster 10 Jun '21

10 Jun '21

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST , HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 7.3.0 I check the source, type 41 isn't supported on the current source tree. ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/issues/2758

3 3

git:5.5:66370c47: kamctl: update name to globalblocklist in EXTRA_TABLES
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 66370c473967d567452a6cf26b8b3496cb1386be URL: https://github.com/kamailio/kamailio/commit/66370c473967d567452a6cf26b8b349… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:29:42+02:00 kamctl: update name to globalblocklist in EXTRA_TABLES - GH #2773 (cherry picked from commit 90fa160b5d4a7155fc3d82f39932ac0e9d74fae7) --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/66370c473967d567452a6cf26b8b349… Patch: https://github.com/kamailio/kamailio/commit/66370c473967d567452a6cf26b8b349… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 03232be783..db703c6ed8 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -123,7 +123,7 @@ # dialplan" ## Kamailio extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple sca" +# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblocklist htable purple sca" ## type of aliases used: DB - database aliases; UL - usrloc aliases diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4cfd11c4f9..093334c024 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -40,7 +40,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs acc_cdrs topos_d topos_t'} EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblocklist - globalblacklist htable purplemap uacreg pl_pipes mtree mtrees + globalblocklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine dr_gateways dr_rules dr_gw_lists dr_groups secfilter'} PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap

1 0

git:5.5:7b89c5e6: pv: added missing WS and WSS to $K(key) variable
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 7b89c5e6abe5f4ae3ee55d9c938c865806f29dec URL: https://github.com/kamailio/kamailio/commit/7b89c5e6abe5f4ae3ee55d9c938c865… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:29:07+02:00 pv: added missing WS and WSS to $K(key) variable (cherry picked from commit a8c9d0ae4fbafba89ef12737419037d141eed1d3) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7b89c5e6abe5f4ae3ee55d9c938c865… Patch: https://github.com/kamailio/kamailio/commit/7b89c5e6abe5f4ae3ee55d9c938c865… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6ead708037..dd3d22e95a 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3329,6 +3329,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; @@ -3336,6 +3340,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: @@ -3407,6 +3413,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); }

1 0

git:5.5:903e4146: siptrace: fixed IPv6 without brackets
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 903e41468a00edeff52cbf1e3c0053c82860c92c URL: https://github.com/kamailio/kamailio/commit/903e41468a00edeff52cbf1e3c0053c… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:29:32+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 (cherry picked from commit 417eb2a7052a9354712663cca9e3bc075a3f69c0) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/903e41468a00edeff52cbf1e3c0053c… Patch: https://github.com/kamailio/kamailio/commit/903e41468a00edeff52cbf1e3c0053c… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 012644bfa0..102502105d 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2117,7 +2117,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; @@ -2127,7 +2127,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);

1 0

git:5.5:d1c83128: dmq: warning about protocol made info
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: d1c831288746bac7850343da10ae02099cb7c80d URL: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:42+02:00 dmq: warning about protocol made info (cherry picked from commit b775bbdff501de0ca1f1a0bc1ab39a3b790c166f) --- Modified: src/modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… Patch: https://github.com/kamailio/kamailio/commit/d1c831288746bac7850343da10ae020… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index 1db7cdd1f4..817fc3f3bb 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -161,7 +161,7 @@ static int make_socket_str_from_uri(struct sip_uri *uri, str *socket) } if(get_valid_proto_string(uri->proto, 0, 0, &sproto)<0) { - LM_WARN("unknown transport protocol - fall back to udp\n"); + LM_INFO("unknown transport protocol - fall back to udp\n"); sproto.s = "udp"; sproto.len = 3; }

1 0

git:5.5:7192139d: app_perl change to ignore "die" signals from eval blocks
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 7192139d77f844cd927c326ce16cadfc63378b35 URL: https://github.com/kamailio/kamailio/commit/7192139d77f844cd927c326ce16cadf… Author: rodolfojcj <458749+rodolfojcj(a)users.noreply.github.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:28:17+02:00 app_perl change to ignore "die" signals from eval blocks (cherry picked from commit 50557b8433e137a9095b4d48df8ac9b8c3fd8807) --- Modified: src/modules/app_perl/lib/perl/Kamailio.pm --- Diff: https://github.com/kamailio/kamailio/commit/7192139d77f844cd927c326ce16cadf… Patch: https://github.com/kamailio/kamailio/commit/7192139d77f844cd927c326ce16cadf… --- 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 {

1 0

git:5.5:38459725: smsops: support for 7bit special chars
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 3845972598098add3996b19c6cedfbfb4d4d2ee6 URL: https://github.com/kamailio/kamailio/commit/3845972598098add3996b19c6cedfbf… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:28:34+02:00 smsops: support for 7bit special chars - Added support for 7bit special chars for MO/MT SMSs. (cherry picked from commit f82c4775efca0580401f4b1a48dcb4d2cf26814f) --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/3845972598098add3996b19c6cedfbf… Patch: https://github.com/kamailio/kamailio/commit/3845972598098add3996b19c6cedfbf…

1 0

git:5.5:b6428ca8: dialog: safety checks for bind addr fields
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: b6428ca86c821ddf74fd4ea8a17aecdce39934f4 URL: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:02+02:00 dialog: safety checks for bind addr fields - they can be null on non-local sockets - GH #2757 (cherry picked from commit 490ae559d2b77b13b3f3831e7ff1aa58980e4086) --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… Patch: https://github.com/kamailio/kamailio/commit/b6428ca86c821ddf74fd4ea8a17aecd… --- 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]);

1 0

git:5.5:18e85c98: pv: test for HDR_ERROR_T after header name parsing
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: 18e85c98bb6eebf9afe83aaa0a832d1c4af46e62 URL: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:27:18+02:00 pv: test for HDR_ERROR_T after header name parsing (cherry picked from commit c264fbc66a4690b073c72ffa8fc095227ce0ae8b) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… Patch: https://github.com/kamailio/kamailio/commit/18e85c98bb6eebf9afe83aaa0a832d1… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 103f9dd5ec..6ead708037 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3274,8 +3274,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; }

1 0

git:5.5:b5041e2c: core: kemi - check hdr type HDR_ERROR_T after parsing
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: 5.5 Commit: b5041e2c4a44843318fcd69d092342e2b29532f4 URL: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:25:21+02:00 core: kemi - check hdr type HDR_ERROR_T after parsing (cherry picked from commit 785bbaa0f16f83353ad1d776816f439608a67858) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… Patch: https://github.com/kamailio/kamailio/commit/b5041e2c4a44843318fcd69d092342e… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0932339996..64d23296dc 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1988,7 +1988,8 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2056,7 +2057,8 @@ int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2106,7 +2108,8 @@ static int sr_kemi_hdr_is_present(sip_msg_t *msg, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2188,7 +2191,8 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) hbuf[hname->len] = ':'; hbuf[hname->len+1] = '\0'; - if (parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm)==0) { + parse_hname2_short(hbuf, hbuf+hname->len+1, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return -1; } @@ -2305,7 +2309,8 @@ static sr_kemi_xval_t* sr_kemi_hdr_get_mode(sip_msg_t *msg, str *hname, int idx, sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; } - if (parse_hname2_str(hname, &shdr)==0) { + parse_hname2_str(hname, &shdr); + if(shdr.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); sr_kemi_xval_null(&_sr_kemi_xval, rmode); return &_sr_kemi_xval; @@ -2426,7 +2431,8 @@ static int sr_kemi_hdr_match_content(sip_msg_t *msg, str *hname, str *op, return SR_KEMI_FALSE; } - if (parse_hname2_str(hname, &hfm)==0) { + parse_hname2_str(hname, &hfm); + if(hfm.type==HDR_ERROR_T) { LM_ERR("error parsing header name [%.*s]\n", hname->len, hname->s); return SR_KEMI_FALSE; }

1 0

git:master:90fa160b: kamctl: update name to globalblocklist in EXTRA_TABLES
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: 90fa160b5d4a7155fc3d82f39932ac0e9d74fae7 URL: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:15:29+02:00 kamctl: update name to globalblocklist in EXTRA_TABLES - GH #2773 --- Modified: utils/kamctl/kamctlrc Modified: utils/kamctl/kamdbctl.base --- Diff: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… Patch: https://github.com/kamailio/kamailio/commit/90fa160b5d4a7155fc3d82f39932ac0… --- diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 03232be783..db703c6ed8 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -123,7 +123,7 @@ # dialplan" ## Kamailio extra modules -# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblacklist htable purple sca" +# EXTRA_MODULES="imc cpl siptrace domainpolicy carrierroute userblocklist htable purple sca" ## type of aliases used: DB - database aliases; UL - usrloc aliases diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 4cfd11c4f9..093334c024 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -40,7 +40,7 @@ STANDARD_TABLES=${STANDARD_TABLES:-'version acc dbaliases domain domain_attrs acc_cdrs topos_d topos_t'} EXTRA_TABLES=${EXTRA_TABLES:-'imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblocklist - globalblacklist htable purplemap uacreg pl_pipes mtree mtrees + globalblocklist htable purplemap uacreg pl_pipes mtree mtrees sca_subscriptions mohqcalls mohqueues rtpproxy rtpengine dr_gateways dr_rules dr_gw_lists dr_groups secfilter'} PRESENCE_TABLES=${PRESENCE_TABLES:-'presentity active_watchers watchers xcap

1 0

[kamailio/kamailio] siptrace: fixed IPv6 without brackets (#2775)
by sergey-safarov 10 Jun '21

10 Jun '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 Fixed socket addr like `udp:::1:2345` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2775 -- Commit Summary -- * siptrace: fixed IPv6 without brackets -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2775.patch https://github.com/kamailio/kamailio/pull/2775.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/2775

3 4

git:master:417eb2a7: siptrace: fixed IPv6 without brackets
by Daniel-Constantin Mierla 10 Jun '21

10 Jun '21

Module: kamailio Branch: master Commit: 417eb2a7052a9354712663cca9e3bc075a3f69c0 URL: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-10T12:05:49+02:00 siptrace: fixed IPv6 without brackets more details GH #2775 --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… Patch: https://github.com/kamailio/kamailio/commit/417eb2a7052a9354712663cca9e3bc0… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 89a0618d02..13cc220457 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2133,7 +2133,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; @@ -2143,7 +2143,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);

1 0

Re: [sr-dev] [SR-Users] Releasing Kamailio v5.5.1
by RDB Programmer 10 Jun '21

10 Jun '21

Daniel, Will this release include the latest changes to mohqueue <https://github.com/kamailio/kamailio/tree/master/src/modules/mohqueue> that I pushed to the master on May 19? Bob > From: Daniel-Constantin Mierla <miconda(a)gmail.com> > Date: Wed, Jun 9, 2021 at 6:00 AM > Subject: [SR-Users] Releasing Kamailio v5.5.1 > To: Kamailio (SER) - Devel Mailing List <sr-dev(a)lists.kamailio.org>, > Kamailio (SER) - Users Mailing List <sr-users(a)lists.kamailio.org> > > > Hello, > > I am considering to release Kamailio v5.5.1 sometime next week, likely > on Tuesday or Wednesday (June 15 or 16, 2021). This is the usual heads up > notification to see if anyone is aware of issues not yet reported to bug > tracker and if yes, do it as soon as possible to give them a chance to > be fixed. > > Cheers, > Daniel > > -- > Daniel-Constantin Mierla -- www.asipto.com > www.twitter.com/miconda -- www.linkedin.com/in/miconda > > > > __________________________________________________________ > Kamailio - Users Mailing List - Non Commercial Discussions > * sr-users(a)lists.kamailio.org > Important: keep the mailing list in the recipients, do not reply only to > the sender! > Edit mailing list options or unsubscribe: > * https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users >

2 1

[kamailio/kamailio] tcpops fixup failure (#2772)
by Julien Chavanton 09 Jun '21

09 Jun '21

### Description Kamailio does not start when doing fixup for tcpops. ``` tcp_keepalive_enable("$avp(caller_conid)", "60", "5", "2"); ``` ``` 0(1) ERROR: <core> [core/route.c:1166]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:160 ``` ### Troubleshooting I will try reverting the following commits ``` commit 02240711239149e2f5c4890a70ab158d10fa8187 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 8 23:30:22 2021 +0200 tcpops: use fixup_igp_all() instead of fixup_igp_null() - needed for functions with many parameters commit 12fca1c369b6698cace66de171dcb166be8ae831 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 4 13:30:21 2021 +0200 tcpops: use fixup function from core, remove internal wrapper - set also fixup free function in cmd exports ``` -- 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/issues/2772

1 2

git:master:5d03c923: core: kemi - added KSR.is_WSX() - return true of proto is WS or WSS
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 5d03c9235f79ce4af35b6f79eddebae9f512f1d3 URL: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T14:48:19+02:00 core: kemi - added KSR.is_WSX() - return true of proto is WS or WSS --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… Patch: https://github.com/kamailio/kamailio/commit/5d03c9235f79ce4af35b6f79eddebae… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index bee8a98f07..065eba9c2c 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1155,6 +1155,18 @@ 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_wsx(sip_msg_t *msg) +{ + if (msg->rcv.proto == PROTO_WSS) return SR_KEMI_TRUE; + if (msg->rcv.proto == PROTO_WS) return SR_KEMI_TRUE; + + return SR_KEMI_FALSE; +} + + /** * */ @@ -1888,6 +1900,11 @@ 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_WSX"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_wsx, + { 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,

1 0

git:master:5e06b6bc: pv: support Record/-Route headers for $hflc(...)
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 5e06b6bcaf0047e5bb22105e03331268cee8486f URL: https://github.com/kamailio/kamailio/commit/5e06b6bcaf0047e5bb22105e0333126… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T13:33:06+02:00 pv: support Record/-Route headers for $hflc(...) --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/5e06b6bcaf0047e5bb22105e0333126… Patch: https://github.com/kamailio/kamailio/commit/5e06b6bcaf0047e5bb22105e0333126… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 6e70010816..7c5743151d 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -2428,6 +2428,7 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) { pv_value_t tv = {0}; via_body_t *vb = NULL; + rr_t *rrb = NULL; hdr_field_t *hf = NULL; int n = 0; @@ -2471,6 +2472,33 @@ int pv_get_hflc(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_sintval(msg, param, res, n); } + if((tv.flags == 0) && (tv.ri==HDR_RECORDROUTE_T || tv.ri==HDR_ROUTE_T)) { + if(tv.ri==HDR_RECORDROUTE_T) { + hf=msg->record_route; + } else { + hf=msg->route; + } + if(hf==NULL) { + LM_DBG("no %s header\n", (tv.ri==HDR_ROUTE_T)?"route":"record-route"); + return pv_get_sintval(msg, param, res, 0); + } + + /* count Record-Route/Route header bodies */ + for(; hf!=NULL; hf=hf->next) { + if(hf->type==tv.ri) { + if(parse_rr(hf) == -1) { + LM_ERR("failed parsing %s header\n", + (tv.ri==HDR_ROUTE_T)?"route":"record-route"); + return pv_get_sintval(msg, param, res, 0); + } + for(rrb=(rr_t*)hf->parsed; rrb!=NULL; rrb=rrb->next) { + n++; + } + } + } + return pv_get_sintval(msg, param, res, n); + } + for (hf=msg->headers; hf; hf=hf->next) { if(tv.flags == 0) { if (tv.ri==hf->type) {

1 0

[kamailio/kamailio] siptrace: aadded siptrace pseudo var (#2752)
by sergey-safarov 09 Jun '21

09 Jun '21

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I want to get the source (destination) IP address of the message during `event_route[siptrace:msg]` route. I added the ability to get socket info in this route block. Now added ``` $siptrace(src_uri) $siptrace(dst_uri) ``` This pseudovars return string like ``` udp:8.8.8.8:5060 ``` I think `src_uri` and `dst_uri` is not correct here because this socket info, not SIP uri. I expecting suggestion on how to get these params and from current implementation: ``` src_ip src_port src_proto dst_ip dst_port dst_proto ``` As reference, I take `sipdump` pseudovariable You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2752 -- Commit Summary -- * siptrace: aadded siptrace pseudo var -- File Changes -- M src/modules/siptrace/siptrace.c (72) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2752.patch https://github.com/kamailio/kamailio/pull/2752.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/2752

2 6

git:master:7bf207bf: siptrace: use src/dst_addr instead src/dst_uri for $siptrace(...) vars
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 7bf207bf6bd60bd1c50fb9321d31c4d48562b5b7 URL: https://github.com/kamailio/kamailio/commit/7bf207bf6bd60bd1c50fb9321d31c4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:31:31+02:00 siptrace: use src/dst_addr instead src/dst_uri for $siptrace(...) vars - the format is proto:ip:proto, not a sip uri --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/7bf207bf6bd60bd1c50fb9321d31c4d… Patch: https://github.com/kamailio/kamailio/commit/7bf207bf6bd60bd1c50fb9321d31c4d… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index b411886f54..89a0618d02 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2528,10 +2528,10 @@ int pv_parse_siptrace_name(pv_spec_t *sp, str *in) switch(in->len) { - case 7: - if(strncmp(in->s, "src_uri", 7)==0) + case 8: + if(strncmp(in->s, "src_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 0; - else if(strncmp(in->s, "dst_uri", 7)==0) + else if(strncmp(in->s, "dst_addr", 8)==0) sp->pvp.pvn.u.isname.name.n = 1; else goto error; break;

1 0

git:master:36817c3e: core: cfg.lex - accept IPv4/6 as alternative keywords for INET/6
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 36817c3ea53daae9706c1caa695af98f9ca987bd URL: https://github.com/kamailio/kamailio/commit/36817c3ea53daae9706c1caa695af98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:19:24+02:00 core: cfg.lex - accept IPv4/6 as alternative keywords for INET/6 --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/36817c3ea53daae9706c1caa695af98… Patch: https://github.com/kamailio/kamailio/commit/36817c3ea53daae9706c1caa695af98… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index ff8096d9f2..45d9114c05 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -512,8 +512,8 @@ TLS "tls"|"TLS" SCTP "sctp"|"SCTP" WS "ws"|"WS" WSS "wss"|"WSS" -INET "inet"|"INET" -INET6 "inet6"|"INET6" +INET "inet"|"INET"|"ipv4"|"IPv4"|"IPV4" +INET6 "inet6"|"INET6"|"ipv6"|"IPv6"|"IPV6" SSLv23 "sslv23"|"SSLv23"|"SSLV23" SSLv2 "sslv2"|"SSLv2"|"SSLV2" SSLv3 "sslv3"|"SSLv3"|"SSLV3"

1 0

git:master:e5f13086: pv: support INET/6 as alternative IPv4/6 for $K(key)
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: e5f130860d909e9a4348db170d4001332e90427e URL: https://github.com/kamailio/kamailio/commit/e5f130860d909e9a4348db170d40013… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:27:57+02:00 pv: support INET/6 as alternative IPv4/6 for $K(key) - these are the keywords in the config --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/e5f130860d909e9a4348db170d40013… Patch: https://github.com/kamailio/kamailio/commit/e5f130860d909e9a4348db170d40013… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 0af3e640cd..6e70010816 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3632,6 +3632,7 @@ int pv_parse_K_name(pv_spec_p sp, str *in) if(strncmp(in->s, "WS", 2)==0) sp->pvp.pvn.u.isname.name.n = 6; else goto error; + break; case 3: if(strncmp(in->s, "UDP", 3)==0) sp->pvp.pvn.u.isname.name.n = 2; @@ -3646,12 +3647,19 @@ int pv_parse_K_name(pv_spec_p sp, str *in) case 4: if(strncmp(in->s, "IPv4", 4)==0) sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "INET", 4)==0) + sp->pvp.pvn.u.isname.name.n = 0; else if(strncmp(in->s, "IPv6", 4)==0) sp->pvp.pvn.u.isname.name.n = 1; else if(strncmp(in->s, "SCTP", 4)==0) sp->pvp.pvn.u.isname.name.n = 5; else goto error; break; + case 5: + if(strncmp(in->s, "INET6", 5)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; default: goto error; }

1 0

git:master:a8c9d0ae: pv: added missing WS and WSS to $K(key) variable
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: a8c9d0ae4fbafba89ef12737419037d141eed1d3 URL: https://github.com/kamailio/kamailio/commit/a8c9d0ae4fbafba89ef12737419037d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:15:38+02:00 pv: added missing WS and WSS to $K(key) variable --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/a8c9d0ae4fbafba89ef12737419037d… Patch: https://github.com/kamailio/kamailio/commit/a8c9d0ae4fbafba89ef12737419037d… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index a4bfe21985..0af3e640cd 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3628,6 +3628,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; @@ -3635,6 +3639,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: @@ -3706,6 +3712,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); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev