sr-dev June 2021

sr-dev@lists.kamailio.org

15 participants
313 discussions

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: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: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: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

git:master:11acfd85: pv: extended $nh(k) to work for replies using 2nd via
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 11acfd857d1b9c5e7e4c10efd8f1eb239c77e8a8 URL: https://github.com/kamailio/kamailio/commit/11acfd857d1b9c5e7e4c10efd8f1eb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T12:02:08+02:00 pv: extended $nh(k) to work for replies using 2nd via --- Modified: src/modules/pv/pv_branch.c --- Diff: https://github.com/kamailio/kamailio/commit/11acfd857d1b9c5e7e4c10efd8f1eb2… Patch: https://github.com/kamailio/kamailio/commit/11acfd857d1b9c5e7e4c10efd8f1eb2… --- diff --git a/src/modules/pv/pv_branch.c b/src/modules/pv/pv_branch.c index d3e34c681a..594a88f1f5 100644 --- a/src/modules/pv/pv_branch.c +++ b/src/modules/pv/pv_branch.c @@ -669,6 +669,81 @@ int pv_parse_rcv_name(pv_spec_p sp, str *in) return -1; } +/** + * + */ +int pv_get_nh_reply(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + static char rpluribuf[MAX_URI_SIZE]; + str suri = STR_NULL; + str host = STR_NULL; + str sproto = STR_NULL; + unsigned int port = 0; + + if(parse_headers( msg, HDR_VIA2_F, 0)==-1) { + LM_DBG("no 2nd via parsed\n"); + return pv_get_null(msg, param, res); + } + if((msg->via2==0) || (msg->via2->error!=PARSE_OK)) { + return pv_get_null(msg, param, res); + } + if(msg->via2->rport && msg->via2->rport->value.s) { + LM_DBG("using 'rport'\n"); + if(str2int(&msg->via2->rport->value, &port)<0) { + LM_ERR("invalid rport value\n"); + return pv_get_null(msg, param, res); + } + } + if(msg->via2->received) { + LM_DBG("using 'received'\n"); + host = msg->via2->received->value; + } else { + LM_DBG("using via host\n"); + host = msg->via2->host; + } + if(port==0) { + port = (msg->via2->port)?msg->via2->port:SIP_PORT; + } + + switch(param->pvn.u.isname.name.n) { + case 0: /* uri */ + if(get_valid_proto_string(msg->via2->proto, 1, 0, &sproto)<0) { + sproto.s = "udp"; + sproto.len = 3; + } + suri.len = snprintf(rpluribuf, MAX_URI_SIZE, "sip:%.*s:%u;transport=%.*s", + host.len, host.s, port, sproto.len, sproto.s); + if(suri.len<=0 || suri.len>=MAX_URI_SIZE) { + LM_DBG("building the dst uri failed (%d)\n", suri.len); + return pv_get_null(msg, param, res); + } + suri.s = rpluribuf; + return pv_get_strval(msg, param, res, &suri); + case 1: /* user - not in Via */ + return pv_get_null(msg, param, res); + case 2: /* domain/host */ + return pv_get_strval(msg, param, res, &host); + case 3: /* port */ + return pv_get_uintval(msg, param, res, port); + case 4: /* proto */ + if(get_valid_proto_string(msg->via2->proto, 0, 0, &sproto)<0) { + /* default to udp */ + sproto.s = "udp"; + sproto.len = 3; + return pv_get_strintval(msg, param, res, &sproto, PROTO_UDP); + } + return pv_get_strintval(msg, param, res, &sproto, + (int)msg->via2->proto); + } + + LM_ERR("unknown specifier\n"); + return pv_get_null(msg, param, res); +} + +/** + * + */ int pv_get_nh(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -678,8 +753,10 @@ int pv_get_nh(struct sip_msg *msg, pv_param_t *param, if(msg==NULL || res==NULL) return -1; - if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have r/d-uri */ - return pv_get_null(msg, param, res); + if(msg->first_line.type == SIP_REPLY) { + /* REPLY doesnt have r/d-uri - use second Via */ + return pv_get_nh_reply(msg, param, res); + } if (msg->dst_uri.s != NULL && msg->dst_uri.len>0) {

1 0

[kamailio/kamailio] app_perl: Ignore __DIE__ signals that come from eval blocks (#2745)
by rodolfojcj 09 Jun '21

09 Jun '21

### Description If possible, I would like that the `kamailio/src/modules/app_perl/lib/perl/Kamailio.pm` file does not generate error messages to the system log files, which are not actual errors and are caused by `eval` blocks of third-party Perl modules that my code depends on. To illustrate the current setup, let's consider the following: - In file `/etc/kamailio/kamailio_52.cfg` ```perl modparam( "app_perl", "filename", "/opt/myprogram/perllib/MyKamailio.pm" ) ``` - In file `/opt/myprogram/perllib/MyKamailio.pm`: ```perl use Crypt::JWT qw( decode_jwt encode_jwt ); ``` - It happens that `Crypt::JWT` depends on `CryptX`, which in turn needs a `JSON::XS` implementation, which could be either `Cpanel::JSON::XS` or `JSON::XS`or `JSON::PP`, in that order of preference. That need is resolved at runtime, as we can see in the following code fragment taken from the file at https://github.com/DCIT/perl-CryptX/blob/master/lib/CryptX.pm: ```perl BEGIN { if (eval { require Cpanel::JSON::XS }) { Cpanel::JSON::XS->import(qw(encode_json decode_json)); $has_json = 1; } elsif (eval { require JSON::XS }) { JSON::XS->import(qw(encode_json decode_json)); $has_json = 2; } elsif (eval { require JSON::PP }) { JSON::PP->import(qw(encode_json decode_json)); $has_json = 3; } else { $has_json = 0; } } ``` - In my system, `Cpanel::JSON::XS` is not installed because it is not needed. I could install it, but unfortunately that module intermittently causes a segmentation fault, as described in the issue report at https://github.com/rurban/Cpanel-JSON-XS/issues/179. ### Expected behavior I would expect two things: - The operating system log files, like `/var/log/syslog`, adds only entries like the following ones after restarting Kamailio: May 25 14:30:06 myserver systemd[1]: kamailio.service: Succeeded. May 25 14:30:06 myserver systemd[1]: Stopped Kamailio server. May 25 14:30:06 myserver systemd[1]: Starting Kamailio server... May 25 14:30:06 myserver systemd[1]: Started Kamailio server. - The output of commands like `systemctl status kamailio.service` only shows informational messages of success. ### Actual observed behavior - The operating system log files, like `/var/log/syslog`, also adds error messages like the following one after restarting Kamailio: May 25 14:30:06 myserver /sbin/kamailio[1827476]: ERROR: app_perl [kamailioxs.xs:1041]: XS_Kamailio__Message_log(): perl error: Can't locate Cpanel/JSON/XS.pm in @INC (you may need to install the Cpanel::JSON::XS module) (@INC contains: /opt/myprogram/perllib /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.30.0 /usr/local/share/perl/5.30.0 /usr/lib/x86_64-linux-gnu/perl5/5.30 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.30 /usr/share/perl/5.30 /usr/local/lib/site_perl) at /usr/local/lib/x86_64-linux-gnu/perl/5.30.0/CryptX.pm line 14. - The output of commands like `systemctl status kamailio.service` adds that same error message at its end. ### What could be changed in Kamailio? The `kamailio/src/modules/app_perl/lib/perl/Kamailio.pm` file could ignore, or bypass, the `__DIE__` signals coming from `eval` blocks, like this changed code fragment shows: ```perl $SIG{'__DIE__'} = sub { die @_ if( $^S or not defined $^S ); Kamailio::Message::log(undef, L_ERR, "perl error: $_[0]\n"); }; ``` That changed is based on the following references: - The [Override die with END or CORE::GLOBAL::die](https://www.effectiveperlprogramming.com/2011/05/overrid… article, which says: > There’s a Perl special variable that can help. The documentation for die recommends that you start your `__DIE__` handler by checking `$^S` before you continue. Inside the handler, the special handler is turned off so `die` inside `$SIG{__DIE__}` is the real `die`. The value of `$^S` will be true if it came from within an `eval`, so this just re-throws the exception without handling it. - The [Perl documentation for the `$^S` variable](https://perldoc.perl.org/perlvar#%24%5ES), which says: > Current state of the interpreter. $^S State --------- ------------------------------------- undef Parsing module, eval, or main program true (1) Executing an eval false (0) Otherwise > The first state may happen in `$SIG{__DIE__}` and `$SIG{__WARN__}` handlers. - The [Perl documentation for the `die` function](https://perldoc.perl.org/functions/die), which says: > You can arrange for a callback to be run just before the `die` does its deed, by setting the `$SIG{__DIE__}` hook. The associated handler is called with the exception as an argument, and can change the exception, if it sees fit, by calling `die` again. See `"%SIG"` in perlvar for details on setting `%SIG` entries, and `eval` for some examples. Although this feature was to be run only right before your program was to exit, this is not currently so: the `$SIG{__DIE__}` hook is currently called even inside `eval`ed blocks/strings! If one wants the hook to do nothing in such situations, put ```perl die @_ if $^S; ``` > as the first line of the handler (see "`$^S`" in perlvar). Because this promotes strange action at a distance, this counterintuitive behavior may be fixed in a future release. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ```bash root@myserver:~# kamailio -V version: kamailio 5.4.3 (x86_64/linux) e19ae3 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: e19ae3 compiled on 17:51:35 Feb 14 2021 with gcc 9.3.0 ``` * **Operating System**: ```bash root@myserver:~# uname -a Linux myserver 5.4.0-54-generic #60-Ubuntu SMP Fri Nov 6 10:37:59 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` ```bash root@myserver:~# cat /etc/os-release NAME="Ubuntu" VERSION="20.04.1 LTS (Focal Fossa)" ID=ubuntu ID_LIKE=debian PRETTY_NAME="Ubuntu 20.04.1 LTS" VERSION_ID="20.04" HOME_URL="https://www.ubuntu.com/" SUPPORT_URL="https://help.ubuntu.com/" BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" VERSION_CODENAME=focal UBUNTU_CODENAME=focal ``` * **Perl version**: ```bash root@myserver:~# perl -V Summary of my perl5 (revision 5 version 30 subversion 0) configuration: Platform: osname=linux osvers=4.19.0 archname=x86_64-linux-gnu-thread-multi uname='linux localhost 4.19.0 #1 smp debian 4.19.0 x86_64 gnulinux ' config_args='-Dmksymlinks -Dusethreads -Duselargefiles -Dcc=x86_64-linux-gnu-gcc -Dcpp=x86_64-linux-gnu-cpp -Dld=x86_64-linux-gnu-gcc -Dccflags=-DDEBIAN -Wdate-time -D_FORTIFY_SOURCE=2 -g -O2 -fdebug-prefix-map=/build/perl-Wfb2Cd/perl-5.30.0=. -fstack-protector-strong -Wformat -Werror=format-security -Dldflags= -Wl,-Bsymbolic-functions -Wl,-z,relro -Dlddlflags=-shared -Wl,-Bsymbolic-functions -Wl,-z,relro -Dcccdlflags=-fPIC -Darchname=x86_64-linux-gnu -Dprefix=/usr -Dprivlib=/usr/share/perl/5.30 -Darchlib=/usr/lib/x86_64-linux-gnu/perl/5.30 -Dvendorprefix=/usr -Dvendorlib=/usr/share/perl5 -Dvendorarch=/usr/lib/x86_64-linux-gnu/perl5/5.30 -Dsiteprefix=/usr/local -Dsitelib=/usr/local/share/perl/5.30.0 -Dsitearch=/usr/local/lib/x86_64-linux-gnu/perl/5.30.0 -Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3 -Dsiteman1dir=/usr/local/man/man1 -Dsiteman3dir=/usr/local/man/man3 -Duse64bitint -Dman1ext=1 -Dman3ext=3perl -Dpager=/usr/bin/sensible-pager -Uafs -Ud_csh -Ud_ualarm -Uusesfio -Uusenm -Ui_libutil -Ui_xlocale -Uversiononly -DDEBUGGING=-g -Doptimize=-O2 -dEs -Duseshrplib -Dlibperl=libperl.so.5.30.0' hint=recommended useposix=true d_sigaction=define useithreads=define usemultiplicity=define use64bitint=define use64bitall=define uselongdouble=undef usemymalloc=n default_inc_excludes_dot=define bincompat5005=undef Compiler: cc='x86_64-linux-gnu-gcc' ccflags ='-D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64' optimize='-O2 -g' cppflags='-D_REENTRANT -D_GNU_SOURCE -DDEBIAN -fwrapv -fno-strict-aliasing -pipe -I/usr/local/include' ccversion='' gccversion='9.3.0' gccosandvers='' intsize=4 longsize=8 ptrsize=8 doublesize=8 byteorder=12345678 doublekind=3 d_longlong=define longlongsize=8 d_longdbl=define longdblsize=16 longdblkind=3 ivtype='long' ivsize=8 nvtype='double' nvsize=8 Off_t='off_t' lseeksize=8 alignbytes=8 prototype=define Linker and Libraries: ld='x86_64-linux-gnu-gcc' ldflags =' -fstack-protector-strong -L/usr/local/lib' libpth=/usr/local/lib /usr/include/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib/../lib /usr/lib/x86_64-linux-gnu /usr/lib/../lib /lib libs=-lgdbm -lgdbm_compat -ldb -ldl -lm -lpthread -lc -lcrypt perllibs=-ldl -lm -lpthread -lc -lcrypt libc=libc-2.31.so so=so useshrplib=true libperl=libperl.so.5.30 gnulibc_version='2.31' Dynamic Linking: dlsrc=dl_dlopen.xs dlext=so d_dlsymun=undef ccdlflags='-Wl,-E' cccdlflags='-fPIC' lddlflags='-shared -L/usr/local/lib -fstack-protector-strong' Characteristics of this binary (from libperl): Compile-time options: HAS_TIMES MULTIPLICITY PERLIO_LAYERS PERL_COPY_ON_WRITE PERL_DONT_CREATE_GVSV PERL_IMPLICIT_CONTEXT PERL_MALLOC_WRAP PERL_OP_PARENT PERL_PRESERVE_IVUV USE_64_BIT_ALL USE_64_BIT_INT USE_ITHREADS USE_LARGE_FILES USE_LOCALE USE_LOCALE_COLLATE USE_LOCALE_CTYPE USE_LOCALE_NUMERIC USE_LOCALE_TIME USE_PERLIO USE_PERL_ATOF USE_REENTRANT_API USE_THREAD_SAFE_LOCALE Locally applied patches: DEBPKG:debian/cpan_definstalldirs - Provide a sensible INSTALLDIRS default for modules installed from CPAN. DEBPKG:debian/db_file_ver - https://bugs.debian.org/340047 Remove overly restrictive DB_File version check. DEBPKG:debian/doc_info - Replace generic man(1) instructions with Debian-specific information. DEBPKG:debian/enc2xs_inc - https://bugs.debian.org/290336 Tweak enc2xs to follow symlinks and ignore missing @INC directories. DEBPKG:debian/errno_ver - https://bugs.debian.org/343351 Remove Errno version check due to upgrade problems with long-running processes. DEBPKG:debian/libperl_embed_doc - https://bugs.debian.org/186778 Note that libperl-dev package is required for embedded linking DEBPKG:fixes/respect_umask - Respect umask during installation DEBPKG:debian/writable_site_dirs - Set umask approproately for site install directories DEBPKG:debian/extutils_set_libperl_path - EU:MM: set location of libperl.a under /usr/lib DEBPKG:debian/no_packlist_perllocal - Don't install .packlist or perllocal.pod for perl or vendor DEBPKG:debian/fakeroot - Postpone LD_LIBRARY_PATH evaluation to the binary targets. DEBPKG:debian/instmodsh_doc - Debian policy doesn't install .packlist files for core or vendor. DEBPKG:debian/ld_run_path - Remove standard libs from LD_RUN_PATH as per Debian policy. DEBPKG:debian/libnet_config_path - Set location of libnet.cfg to /etc/perl/Net as /usr may not be writable. DEBPKG:debian/perlivp - https://bugs.debian.org/510895 Make perlivp skip include directories in /usr/local DEBPKG:debian/squelch-locale-warnings - https://bugs.debian.org/508764 Squelch locale warnings in Debian package maintainer scripts DEBPKG:debian/patchlevel - https://bugs.debian.org/567489 List packaged patches for 5.30.0-9ubuntu0.2 in patchlevel.h DEBPKG:fixes/document_makemaker_ccflags - https://bugs.debian.org/628522 [rt.cpan.org #68613] Document that CCFLAGS should include $Config{ccflags} DEBPKG:debian/find_html2text - https://bugs.debian.org/640479 Configure CPAN::Distribution with correct name of html2text DEBPKG:debian/perl5db-x-terminal-emulator.patch - https://bugs.debian.org/668490 Invoke x-terminal-emulator rather than xterm in perl5db.pl DEBPKG:debian/cpan-missing-site-dirs - https://bugs.debian.org/688842 Fix CPAN::FirstTime defaults with nonexisting site dirs if a parent is writable DEBPKG:fixes/memoize_storable_nstore - [rt.cpan.org #77790] https://bugs.debian.org/587650 Memoize::Storable: respect 'nstore' option not respected DEBPKG:debian/makemaker-pasthru - https://bugs.debian.org/758471 Pass LD settings through to subdirectories DEBPKG:debian/makemaker-manext - https://bugs.debian.org/247370 Make EU::MakeMaker honour MANnEXT settings in generated manpage headers DEBPKG:debian/kfreebsd-softupdates - https://bugs.debian.org/796798 Work around Debian Bug#796798 DEBPKG:fixes/autodie-scope - https://bugs.debian.org/798096 Fix a scoping issue with "no autodie" and the "system" sub DEBPKG:fixes/memoize-pod - [rt.cpan.org #89441] Fix POD errors in Memoize DEBPKG:debian/hurd-softupdates - https://bugs.debian.org/822735 Fix t/op/stat.t failures on hurd DEBPKG:fixes/math_complex_doc_great_circle - https://bugs.debian.org/697567 [rt.cpan.org #114104] Math::Trig: clarify definition of great_circle_midpoint DEBPKG:fixes/math_complex_doc_see_also - https://bugs.debian.org/697568 [rt.cpan.org #114105] Math::Trig: add missing SEE ALSO DEBPKG:fixes/math_complex_doc_angle_units - https://bugs.debian.org/731505 [rt.cpan.org #114106] Math::Trig: document angle units DEBPKG:fixes/cpan_web_link - https://bugs.debian.org/367291 CPAN: Add link to main CPAN web site DEBPKG:debian/hppa_op_optimize_workaround - https://bugs.debian.org/838613 Temporarily lower the optimization of op.c on hppa due to gcc-6 problems DEBPKG:debian/installman-utf8 - https://bugs.debian.org/840211 Generate man pages with UTF-8 characters DEBPKG:fixes/getopt-long-4 - https://bugs.debian.org/864544 [rt.cpan.org #122068] Fix issue #122068. DEBPKG:debian/hppa_opmini_optimize_workaround - https://bugs.debian.org/869122 Lower the optimization level of opmini.c on hppa DEBPKG:debian/sh4_op_optimize_workaround - https://bugs.debian.org/869373 Also lower the optimization level of op.c and opmini.c on sh4 DEBPKG:debian/perldoc-pager - https://bugs.debian.org/870340 [rt.cpan.org #120229] Fix perldoc terminal escapes when sensible-pager is less DEBPKG:debian/prune_libs - https://bugs.debian.org/128355 Prune the list of libraries wanted to what we actually need. DEBPKG:debian/mod_paths - Tweak @INC ordering for Debian DEBPKG:debian/configure-regen - https://bugs.debian.org/762638 Regenerate Configure et al. after probe unit changes DEBPKG:debian/deprecate-with-apt - https://bugs.debian.org/747628 Point users to Debian packages of deprecated core modules DEBPKG:debian/disable-stack-check - https://bugs.debian.org/902779 [perl #133327] Disable debugperl stack extension checks for binary compatibility with perl DEBPKG:fixes/eumm-usrmerge - https://bugs.debian.org/913637 Avoid mangling /bin non-perl shebangs on merged-/usr systems DEBPKG:debian/perlbug-editor - https://bugs.debian.org/922609 Use "editor" as the default perlbug editor, as per Debian policy DEBPKG:fixes/gid-parsing - [79e302e] https://bugs.debian.org/941985 [perl #134169] (perl #134169) mg.c reset endptr after use DEBPKG:fixes/CVE-2020-10543.patch - [PATCH v530 1/4] regcomp.c: Prevent integer overflow from nested regex quantifiers. DEBPKG:fixes/CVE-2020-10878-1.patch - [PATCH v530 2/4] study_chunk: extract rck_elide_nothing DEBPKG:fixes/CVE-2020-10878-2.patch - [PATCH v530 3/4] regcomp: use long jumps if there is any possibility of overflow DEBPKG:fixes/CVE-2020-12723.patch - [PATCH v530 4/4] study_chunk: avoid mutating regexp program within GOSUB Built under linux Compiled at Oct 19 2020 10:56:54 @INC: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.30.0 /usr/local/share/perl/5.30.0 /usr/lib/x86_64-linux-gnu/perl5/5.30 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.30 /usr/share/perl/5.30 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base ``` Please evaluate the situation and let me know your feedback and what I could help with. Thanks in advance for your time and attention. -- 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/2745

3 3

git:master:8275046a: siptrace: aadded siptrace pseudo var
by Daniel-Constantin Mierla 09 Jun '21

09 Jun '21

Module: kamailio Branch: master Commit: 8275046a250a80018f42f8dbadaa245094c6f5ff URL: https://github.com/kamailio/kamailio/commit/8275046a250a80018f42f8dbadaa245… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-06-09T09:21:16+02:00 siptrace: aadded siptrace pseudo var --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/8275046a250a80018f42f8dbadaa245… Patch: https://github.com/kamailio/kamailio/commit/8275046a250a80018f42f8dbadaa245… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 012644bfa0..b411886f54 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -195,6 +195,10 @@ static str trace_local_ip = {NULL, 0}; static db1_con_t *db_con = NULL; /*!< database connection */ static db_func_t db_funcs; /*!< Database functions */ +int pv_parse_siptrace_name(pv_spec_t *sp, str *in); +int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res); + /*! \brief * Exported functions */ @@ -276,6 +280,14 @@ stat_export_t siptrace_stats[] = { /* clang-format on */ #endif +static pv_export_t mod_pvs[] = { + + { {"siptrace", (sizeof("siptrace")-1)}, PVT_OTHER, pv_get_siptrace, 0, + pv_parse_siptrace_name, 0, 0, 0 }, + + { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } +}; + /*! \brief module exports */ /* clang-format off */ struct module_exports exports = { @@ -283,9 +295,9 @@ struct module_exports exports = { DEFAULT_DLFLAGS, /*!< dlopen flags */ cmds, /*!< exported functions */ params, /*!< exported parameters */ - 0, /*!< exported rpc functions */ - 0, /*!< exported pseudo-variables */ - 0, /*!< response function */ + 0, /*!< exported rpc functions */ + mod_pvs, /*!< exported pseudo-variables */ + 0, /*!< response function */ mod_init, /*!< module initialization function */ child_init, /*!< child initialization function */ destroy /*!< destroy function */ @@ -2039,6 +2051,8 @@ static void trace_free_info(void* trace_info) shm_free(trace_info); } +static siptrace_data_t* siptrace_event_data = NULL; + static int siptrace_exec_evcb_msg(siptrace_data_t *sto) { int backup_rt; @@ -2068,6 +2082,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) set_route_type(EVENT_ROUTE); init_run_actions_ctx(&ctx); + siptrace_event_data = sto; if(_siptrace_evrt_msg_idx>=0) { run_top_route(event_rt.rlist[_siptrace_evrt_msg_idx], &msg, &ctx); } else { @@ -2080,6 +2095,7 @@ static int siptrace_exec_evcb_msg(siptrace_data_t *sto) sr_kemi_act_ctx_set(bctx); } } + siptrace_event_data = NULL; free_sip_msg(&msg); set_route_type(backup_rt); @@ -2482,6 +2498,56 @@ static sr_kemi_t sr_kemi_siptrace_exports[] = { { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; + +/** + * + */ +int pv_get_siptrace(sip_msg_t *msg, pv_param_t *param, + pv_value_t *res) +{ + if (siptrace_event_data==NULL) { + return pv_get_null(msg, param, res); + } + + switch(param->pvn.u.isname.name.n) { + case 1: /* dst_uri*/ + return pv_get_strval(msg, param, res, &siptrace_event_data->toip); + default: + /* 0 - src_uri */ + return pv_get_strval(msg, param, res, &siptrace_event_data->fromip); + } +} + +/** + * + */ +int pv_parse_siptrace_name(pv_spec_t *sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 7: + if(strncmp(in->s, "src_uri", 7)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "dst_uri", 7)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV snd name %.*s\n", in->len, in->s); + return -1; +} + /* clang-format on */ /**

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2021