sr-dev September 2023

sr-dev@lists.kamailio.org

17 participants
294 discussions

git:master:c92a73f8: modules: readme files regenerated - corex ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: c92a73f84c1fc8701f5c1b938a40ba46f5a619c8 URL: https://github.com/kamailio/kamailio/commit/c92a73f84c1fc8701f5c1b938a40ba4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-09-07T07:46:59+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/c92a73f84c1fc8701f5c1b938a40ba4… Patch: https://github.com/kamailio/kamailio/commit/c92a73f84c1fc8701f5c1b938a40ba4…

8 months, 2 weeks

git:master:3ed56db3: pv: proper name id for oc field of via variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ed56db363ace8162abdfda6e5bc0cbd51a73c70 URL: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T07:39:38+02:00 pv: proper name id for oc field of via variables --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… Patch: https://github.com/kamailio/kamailio/commit/3ed56db363ace8162abdfda6e5bc0cb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index a491d10d643..dc611de7f1a 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4490,7 +4490,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) break; case 2: if(strncmp(in->s, "oc", 2) == 0) - sp->pvp.pvn.u.isname.name.n = 0; + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break;

8 months, 2 weeks

git:master:faa0bdcc: corex: docs for via_reply_add_xavp_params(flags) function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: faa0bdcc5d87d40cac8a279c524fbe724c1f7f1d URL: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-07T07:38:51+02:00 corex: docs for via_reply_add_xavp_params(flags) function --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… Patch: https://github.com/kamailio/kamailio/commit/faa0bdcc5d87d40cac8a279c524fbe7… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0346c2bc3fd..b0babf26886 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -854,6 +854,41 @@ request_route { </programlisting> </example> </section> + <section id="corex.f.via_reply_add_xavp_params"> + <title><function moreinfo="none">via_reply_add_xavp_params(flags)</function></title> + <para> + Control if fields of the xavp with the name specified by + xavp_via_reply_params global parameter are added or not to the top Via + of replies. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flags</emphasis>: 1 - add xavp parameters; 0 - do not + add xavp parameters. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>via_reply_add_xavp_params</function> usage</title> + <programlisting format="linespecific"> +... +xavp_via_reply_params="xviarpl" +... +request_route { + ... + $xavp(xviarpl=>srvid) = "1"; + $xavp(xviarpl[0]=>myval) = "xyz"; + via_reply_add_xavp_params("1"); + ... +} +... +</programlisting> + </example> <section id="corex.f.is_faked_msg"> <title> <function moreinfo="none">is_faked_msg()</function>

8 months, 2 weeks

git:master:1880737b: cores: new function via_reply_add_xavp_params()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1880737b9251a14eb7395f5968b955475848780d URL: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:09:35+02:00 cores: new function via_reply_add_xavp_params() - enable adding parameters to top via of replies from xavp fields --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… Patch: https://github.com/kamailio/kamailio/commit/1880737b9251a14eb7395f5968b9554… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 24eba482489..d65f49dd8cf 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -70,6 +70,7 @@ static int w_set_source_address(sip_msg_t *msg, char *paddr, char *p2); static int w_via_add_srvid(sip_msg_t *msg, char *pflags, char *p2); static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *p2); +static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *p2); static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int w_is_socket_name(sip_msg_t *msg, char *psockname, char *p2); @@ -156,6 +157,8 @@ static cmd_export_t cmds[] = {{"forward_reply", (cmd_function)w_forward_reply, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, + {"via_reply_add_xavp_params", (cmd_function)w_via_reply_add_xavp_params, 1, + fixup_igp_null, fixup_free_igp_null, ANY_ROUTE}, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE}, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, @@ -1114,6 +1117,33 @@ static int w_via_use_xavp_fields(sip_msg_t *msg, char *pflags, char *s2) return ki_via_use_xavp_fields(msg, fval); } +/** + * + */ +static int ki_via_reply_add_xavp_params(sip_msg_t *msg, int fval) +{ + if(msg == NULL) + return -1; + if(fval) { + msg->msg_flags |= FL_ADD_XAVP_VIA_REPLY_PARAMS; + } else { + msg->msg_flags &= ~(FL_ADD_XAVP_VIA_REPLY_PARAMS); + } + return 1; +} + +/** + * + */ +static int w_via_reply_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) +{ + int fval = 0; + if(fixup_get_ivalue(msg, (gparam_t *)pflags, &fval) != 0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_via_reply_add_xavp_params(msg, fval); +} /** * @@ -1317,6 +1347,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("via_reply_add_xavp_params"), + SR_KEMIP_INT, ki_via_reply_add_xavp_params, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("corex"), str_init("has_ruri_user"), SR_KEMIP_INT, ki_has_ruri_user, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

8 months, 2 weeks

git:master:439eae7a: core: ability to add paramters to top via of generated sip replies

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 439eae7aa2154a25a0d9143345e526e22162b24f URL: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:08:20+02:00 core: ability to add paramters to top via of generated sip replies - parameters and values are taken from xavp specified by xavp_via_reply_params --- Modified: src/core/globals.h Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… Patch: https://github.com/kamailio/kamailio/commit/439eae7aa2154a25a0d9143345e526e… --- diff --git a/src/core/globals.h b/src/core/globals.h index da693a06bae..a11f8521a3b 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -218,6 +218,7 @@ extern int ksr_all_errors; extern int ksr_route_locks_size; extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; +extern str _ksr_xavp_via_reply_params; extern int ksr_sip_parser_mode; extern int ksr_cfg_print_mode; extern int ksr_return_mode; diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index fcc6f133439..c5c4172c045 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -114,6 +114,7 @@ extern int version_len; str _ksr_xavp_via_params = STR_NULL; str _ksr_xavp_via_fields = STR_NULL; +str _ksr_xavp_via_reply_params = STR_NULL; int ksr_local_rport = 0; /** per process fixup function for global_req_flags. @@ -2415,6 +2416,7 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, char *totags; int httpreq; char *pvia; + str xparams = STR_NULL; body = 0; buf = 0; @@ -2456,6 +2458,17 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, len -= msg->via1->rport->size + 1; /* include ';' */ } + /* test and add xavpvia params */ + if(msg && (msg->msg_flags & FL_ADD_XAVP_VIA_REPLY_PARAMS) + && _ksr_xavp_via_reply_params.len > 0) { + xparams.s = pv_get_buffer(); + xparams.len = xavp_serialize_fields( + &_ksr_xavp_via_reply_params, xparams.s, pv_get_buffer_size()); + if(xparams.len > 0) { + len += xparams.len; /* ending ';' included */ + } + } + /* first line */ len += msg->first_line.u.request.version.len + 1 /*space*/ + 3 /*code*/ + 1 /*space*/ + text->len @@ -2588,6 +2601,10 @@ char *build_res_buf_from_sip_req(unsigned int code, str *text, str *new_tag, append_str_trans(p, hdr->name.s, (hdr->body.s + hdr->body.len) - hdr->name.s, msg); } + if(xparams.len > 0) { + append_str(p, ";", 1); + append_str(p, xparams.s, xparams.len - 1); + } append_str(p, CRLF, CRLF_LEN); /* if is HTTP, replace Via with Sia * - HTTP Via format is different than SIP Via

8 months, 2 weeks

git:master:cf0e802b: core: new internal message flag FL_ADD_XAVP_VIA_REPLY_PARAMS

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: cf0e802bbf62ec4a19f26c786c07e7436ba07f0a URL: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:04:16+02:00 core: new internal message flag FL_ADD_XAVP_VIA_REPLY_PARAMS --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… Patch: https://github.com/kamailio/kamailio/commit/cf0e802bbf62ec4a19f26c786c07e74… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index b33317da0cb..187385f2491 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -118,6 +118,8 @@ typedef enum request_method #define FL_ROUTE_ADDR (1 << 25) /*!< request has Route address for next hop */ #define FL_USE_OTCPID \ (1 << 26) /*!< request to be routed using outbound tcp con id */ +#define FL_ADD_XAVP_VIA_REPLY_PARAMS \ + (1 << 27) /*!< add xavp fields to first (previous sip node) via params */ /* WARNING: Value (1 << 28) is reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

8 months, 2 weeks

git:master:d394724e: core: config parser extended with xavp_via_reply_params parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d394724ee79e168786abb9ac94ef1e965f169a7c URL: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T21:02:42+02:00 core: config parser extended with xavp_via_reply_params parameter - allows to specify xavp name that is going to hold parameters to be added to the top via of replies --- Modified: src/core/cfg.lex Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… Patch: https://github.com/kamailio/kamailio/commit/d394724ee79e168786abb9ac94ef1e9… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index e0500769bb5..6ec71fcf6d1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -304,6 +304,7 @@ LOGENGINETYPE log_engine_type LOGENGINEDATA log_engine_data XAVPVIAPARAMS xavp_via_params XAVPVIAFIELDS xavp_via_fields +XAVPVIAREPLYPARAMS xavp_via_reply_params LISTEN listen ADVERTISE advertise|ADVERTISE VIRTUAL virtual @@ -753,6 +754,7 @@ IMPORTFILE "import_file" <INITIAL>{LOGENGINEDATA} { yylval.strval=yytext; return LOGENGINEDATA; } <INITIAL>{XAVPVIAPARAMS} { yylval.strval=yytext; return XAVPVIAPARAMS; } <INITIAL>{XAVPVIAFIELDS} { yylval.strval=yytext; return XAVPVIAFIELDS; } +<INITIAL>{XAVPVIAREPLYPARAMS} { yylval.strval=yytext; return XAVPVIAREPLYPARAMS; } <INITIAL>{LISTEN} { count(); yylval.strval=yytext; return LISTEN; } <INITIAL>{ADVERTISE} { count(); yylval.strval=yytext; return ADVERTISE; } <INITIAL>{VIRTUAL} { count(); yylval.strval=yytext; return VIRTUAL; } diff --git a/src/core/cfg.y b/src/core/cfg.y index eef8e6acd28..19d0ee6949e 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -328,6 +328,7 @@ extern char *default_routename; %token LOGENGINEDATA %token XAVPVIAPARAMS %token XAVPVIAFIELDS +%token XAVPVIAREPLYPARAMS %token LISTEN %token ADVERTISE %token VIRTUAL @@ -890,6 +891,10 @@ assign_stm: _ksr_xavp_via_fields.len=strlen($3); } | XAVPVIAFIELDS EQUAL error { yyerror("string value expected"); } + | XAVPVIAREPLYPARAMS EQUAL STRING { _ksr_xavp_via_reply_params.s=$3; + _ksr_xavp_via_reply_params.len=strlen($3); + } + | XAVPVIAREPLYPARAMS EQUAL error { yyerror("string value expected"); } | DNS EQUAL NUMBER { received_dns|= ($3)?DO_DNS:0; } | DNS EQUAL error { yyerror("boolean value expected"); } | REV_DNS EQUAL NUMBER { received_dns|= ($3)?DO_REV_DNS:0; }

8 months, 2 weeks

[kamailio/kamailio] Function `sdp_mangle_ip("IP/MASK","IP")` Malfunction (Issue #3554)

by teamwcp

I have been trying to replace the SDP connection IP with some other IP using module `mangler` (`Kamailio v5.7.0`). But It seem like its malfunctioning ``` if ($rs == 200) { xlog("L_INFO", "200 $rm Detected"); sdp_mangle_ip("192.168.0.132/24","8.8.8.8"); } ``` and results I received are like this below ``` v=0 o=- 107808851201429815 2 IN IP4 192.168.0.132 s=- t=0 0 m=audio 24794 RTP/AVP 0 8 101 c=IN IP4 192.168.0.1328.8.8.8 a=mid:audio a=sendrecv a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 a=ssrc:822878909 cname:0ZfUBhl8cMeHaeVl a=nortpproxy:yes ``` I first ask the same question in mailing list `sr-users(a)lists.kamailio.org` but after waiting for some time (>24hrs) i cant see my question on on forum, that why I open a ticket here. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3554 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3554(a)github.com>

8 months, 2 weeks

[kamailio/kamailio] sdp_remove_transport() corrupts SDP payload in conjunction with NAT-traversal rewriting using rtpproxy (Issue #3555)

by Nathan Whitehorn

### Description I have some buggy devices that get upset by SRTP payloads in SDP that are marked inactive. As a hack, I was attempting to delete them when going to certain endpoints that are known to be problematic: ``` if (is_method("INVITE")) sdp_remove_transport("RTP/SAVP"); ``` ### Troubleshooting Per below, there is some garbage that looks like a port number inserted before `m=audio` that seems to have come from rtpproxy rewriting for NAT traversal. Removing the NAT traversal rewrite logic entirely fixes the problem, but also makes NAT traversal not happen. Changing the order of `sdp_remove_transport()` with respect to `rtpproxy_manage()` does not change anything. #### Reproduction This was seen with a Grandstream DP752 phone talking to SEMS, but applying the code snippet above and getting a packet trace will be enough. The original SDP had the RTP/SAVP transport first, followed by an RTP/AVP one. For the problem to occur, NAT SDP rewriting has to occur using rtpproxy. #### Debugging Data Here is the payload after sfp_remove_transport() removed the RTP/SAVP section: ``` v=0 o=15176190619 8000 8000 IN IP4 X.X.X.X s=SIP Call c=IN IP4 X.X.X.X t=0 0 46108m=audio 55082 RTP/AVP 125 9 0 8 2 18 97 101 a=sendrecv a=rtpmap:125 opus/48000/2 a=fmtp:125 maxplaybackrate=16000 a=ptime:20 a=rtpmap:9 G722/8000 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:2 G726-32/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=rtpmap:97 iLBC/8000 a=fmtp:97 mode=20 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16,32-36,54 a=nortpproxy:yes ``` There is a garbage 46108 (I think what would have been the port number for SAVP data) at the beginning of the m=audio line. It seems that the rewrite by rtpproxy is still inserting this port number even though the transport in question has been removed. #### Log Messages None relevant. #### SIP Traffic (See above) ### Possible Solutions None. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` $ kamailio -v version: kamailio 5.6.2 (x86_64/freebsd) 54a9c1 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, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, 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, select, kqueue. id: 54a9c1 compiled on 10:44:33 Jul 20 2023 with cc FreeBSD clang version 13.0.0 (git@github.com:llvm/llvm-project.git llvmorg-13.0.0-0-gd7b669b3a303) ``` * **Operating System**: FreeBSD 13.2 -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3555 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3555(a)github.com>

8 months, 2 weeks

git:master:629a5451: pv: via-related variables can retun oc parameters

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 629a5451d3924fff5c9b4e06c37bd498fc6b58db URL: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-09-06T15:05:06+02:00 pv: via-related variables can retun oc parameters - overload control - rfc7339 --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… Patch: https://github.com/kamailio/kamailio/commit/629a5451d3924fff5c9b4e06c37bd49… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b81f37bc9a5..a491d10d643 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4488,6 +4488,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; + case 2: + if(strncmp(in->s, "oc", 2) == 0) + sp->pvp.pvn.u.isname.name.n = 0; + else + goto error; + break; case 4: if(strncmp(in->s, "host", 4) == 0) sp->pvp.pvn.u.isname.name.n = 0; @@ -4501,6 +4507,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "rport", 5) == 0) sp->pvp.pvn.u.isname.name.n = 5; + else if(strncmp(in->s, "ocseq", 5) == 0) + sp->pvp.pvn.u.isname.name.n = 12; else goto error; break; @@ -4509,6 +4517,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 4; else if(strncmp(in->s, "params", 6) == 0) sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "ocalgo", 6) == 0) + sp->pvp.pvn.u.isname.name.n = 10; else goto error; break; @@ -4524,7 +4534,12 @@ int pv_parse_via_name(pv_spec_p sp, str *in) else goto error; break; - + case 10: + if(strncmp(in->s, "ocvalidity", 10) == 0) + sp->pvp.pvn.u.isname.name.n = 11; + else + goto error; + break; default: goto error; } @@ -4544,6 +4559,8 @@ int pv_parse_via_name(pv_spec_p sp, str *in) int pv_get_via_attr( sip_msg_t *msg, via_body_t *vb, pv_param_t *param, pv_value_t *res) { + via_oc_t ocv; + if(vb == NULL) { LM_DBG("null via header\n"); return pv_get_null(msg, param, res); @@ -4587,6 +4604,34 @@ int pv_get_via_attr( return pv_get_strval(msg, param, res, &vb->params); } break; + case 9: /* oc */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + if(ocv.oc == 1) { + return pv_get_sintval(msg, param, res, 1); + } else { + return pv_get_sintval(msg, param, res, 2); + } + break; + case 10: /* oc-algo */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + if(ocv.algo.s != NULL && ocv.algo.len > 0) { + return pv_get_strval(msg, param, res, &ocv.algo); + } + return pv_get_null(msg, param, res); + case 11: /* oc-validity */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_uintval(msg, param, res, ocv.validity); + case 12: /* oc-seq */ + if(parse_via_oc(msg, vb, &ocv) < 0) { + return pv_get_null(msg, param, res); + } + return pv_get_uintval(msg, param, res, (unsigned long)ocv.seq); default: return pv_get_null(msg, param, res);

8 months, 2 weeks

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2023