sr-dev May 2022

sr-dev@lists.kamailio.org

12 participants
284 discussions

git:5.6:88786b40: INSTALL, README: updated version and links

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 88786b402cbeb4a7d2261ed198c0927cec79e362 URL: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:19:00+02:00 INSTALL, README: updated version and links (cherry picked from commit 8718fb447b0d5d53a0eeb5b21ed6f8d1766cb21b) --- Modified: INSTALL Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… Patch: https://github.com/kamailio/kamailio/commit/88786b402cbeb4a7d2261ed198c0927… --- diff --git a/INSTALL b/INSTALL index 7982d1d380..4f7f87a408 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Kamailio SIP Server Installation Notes - http://www.kamailio.org + https://www.kamailio.org ================================================== @@ -16,7 +16,7 @@ You can find a similar tutorial and many more on project's web site: - https://www.kamailio.org/w/documentation/ - - https://www.kamailio.org/wiki/ + - https://www.kamailio.org/wikidocs/ Table of Contents diff --git a/README b/README index 957361df15..6d22d5d941 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.5 +Kamailio v5.6 ============= https://www.kamailio.org @@ -67,7 +67,7 @@ III. Getting started The documentation wiki is an important source of tutorials for installing and understanding how Kamailio works: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ The INSTALL document provides more details and guidelines that will help with the installation. @@ -93,7 +93,7 @@ both developer teams. During the development of the release 4.0, autumn-winter of 2012, the merger of the products was completed and a unified product was released. -See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. +See https://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= @@ -126,7 +126,7 @@ For code contributions, follow the suggestions provided at: The recommended way to contribute code is via pull requests to Kamailio project on Github: - * httpss://github.com/kamailio + * https://github.com/kamailio VII. More Information ===================== diff --git a/README.md b/README.md index c20510bdfd..f32245dda2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Project Website: - * http://www.kamailio.org + * https://www.kamailio.org [20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) @@ -57,7 +57,7 @@ The online documentation for modules in the latest stable branch: The wiki collects a consistent number of tutorials, the indexes for variables, functions and parameters: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ Please read the README file in the source code, one per module. @@ -65,14 +65,14 @@ Please read the README file in the source code, one per module. Step by step tutorials to install Kamailio from source code are available at: - * https://www.kamailio.org/wiki/start#installation + * https://www.kamailio.org/wikidocs/#installation Please read the INSTALL file from the source code for more information. Repositories for Linux packages: - * deb: https://www.kamailio.org/wiki/packages/debs - * rpm: https://www.kamailio.org/wiki/packages/rpms + * deb: https://www.kamailio.org/wikidocs/packages/debs + * rpm: https://www.kamailio.org/wikidocs/packages/rpms ## Issues And Bug Reports

1 year, 12 months

git:5.6:76acfb71: core: mod fixup helpers for params sequence str, str, int

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 76acfb717fac8fa8a960c0e830998d9db9909ccf URL: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:07:55+02:00 core: mod fixup helpers for params sequence str, str, int (cherry picked from commit 5e4576a54e7783b1ee8fde6af7919232a5e207c4) --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… Patch: https://github.com/kamailio/kamailio/commit/76acfb717fac8fa8a960c0e830998d9… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 325e3d117b..925048d940 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -801,6 +801,38 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen) return -1; } +/** + * + */ +int fixup_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_spve_null(param, 1); + case 3: + return fixup_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + +/** + * + */ +int fixup_free_ssi(void** param, int param_no) +{ + switch(param_no) { + case 1: + case 2: + return fixup_free_spve_null(param, 1); + case 3: + return fixup_free_igp_null(param, 1); + default: + return E_UNSPEC; + } +} + /** * */ diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index ca63a5a804..8c2c766c1e 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -163,6 +163,9 @@ int fixup_get_vstr_buf(sip_msg_t *msg, pv_elem_t *p, char *buf, int blen); int fixup_igp_regexp(void** param, int param_no); int fixup_free_igp_regexp(void** param, int param_no); +int fixup_ssi(void** param, int param_no); +int fixup_free_ssi(void** param, int param_no); + int fixup_sssi(void** param, int param_no); int fixup_free_sssi(void** param, int param_no);

1 year, 12 months

git:5.6:9b8f927f: tm: fix kemi t_relay_to_proto() variants for tls

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.6 Commit: 9b8f927f613f1666af19347b928a099a208a8d71 URL: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:07:03+02:00 tm: fix kemi t_relay_to_proto() variants for tls (cherry picked from commit 1f7e894f5b293f97dc99e1b7e5d06159f91a96f7) --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… Patch: https://github.com/kamailio/kamailio/commit/9b8f927f613f1666af19347b928a099… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 69defa1f26..b6fcc96681 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -2930,7 +2930,7 @@ static int ki_t_relay_to_proto(sip_msg_t *msg, str *sproto) proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s); @@ -2955,7 +2955,7 @@ static int ki_t_relay_to_proto_addr(sip_msg_t *msg, str *sproto, str *host, int proto = PROTO_UDP; } else if (strncasecmp(sproto->s, "TCP", 3) == 0) { proto = PROTO_TCP; - } else if (strncasecmp(sproto->s, "TLS", 3)) { + } else if (strncasecmp(sproto->s, "TLS", 3) == 0) { proto = PROTO_TLS; } else { LM_ERR("bad protocol specified <%s>\n", sproto->s);

1 year, 12 months

git:master:8718fb44: INSTALL, README: updated version and links

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8718fb447b0d5d53a0eeb5b21ed6f8d1766cb21b URL: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-23T08:18:04+02:00 INSTALL, README: updated version and links --- Modified: INSTALL Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… Patch: https://github.com/kamailio/kamailio/commit/8718fb447b0d5d53a0eeb5b21ed6f8d… --- diff --git a/INSTALL b/INSTALL index 7982d1d380..4f7f87a408 100644 --- a/INSTALL +++ b/INSTALL @@ -3,7 +3,7 @@ Kamailio SIP Server Installation Notes - http://www.kamailio.org + https://www.kamailio.org ================================================== @@ -16,7 +16,7 @@ You can find a similar tutorial and many more on project's web site: - https://www.kamailio.org/w/documentation/ - - https://www.kamailio.org/wiki/ + - https://www.kamailio.org/wikidocs/ Table of Contents diff --git a/README b/README index 957361df15..6d22d5d941 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ -Kamailio v5.5 +Kamailio v5.6 ============= https://www.kamailio.org @@ -67,7 +67,7 @@ III. Getting started The documentation wiki is an important source of tutorials for installing and understanding how Kamailio works: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ The INSTALL document provides more details and guidelines that will help with the installation. @@ -93,7 +93,7 @@ both developer teams. During the development of the release 4.0, autumn-winter of 2012, the merger of the products was completed and a unified product was released. -See http://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. +See https://www.kamailio.org/ for the story of SER, OpenSER and Kamailio. V. Obtaining Help ================= @@ -126,7 +126,7 @@ For code contributions, follow the suggestions provided at: The recommended way to contribute code is via pull requests to Kamailio project on Github: - * httpss://github.com/kamailio + * https://github.com/kamailio VII. More Information ===================== diff --git a/README.md b/README.md index c20510bdfd..f32245dda2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Project Website: - * http://www.kamailio.org + * https://www.kamailio.org [20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) @@ -57,7 +57,7 @@ The online documentation for modules in the latest stable branch: The wiki collects a consistent number of tutorials, the indexes for variables, functions and parameters: - * https://www.kamailio.org/wiki/ + * https://www.kamailio.org/wikidocs/ Please read the README file in the source code, one per module. @@ -65,14 +65,14 @@ Please read the README file in the source code, one per module. Step by step tutorials to install Kamailio from source code are available at: - * https://www.kamailio.org/wiki/start#installation + * https://www.kamailio.org/wikidocs/#installation Please read the INSTALL file from the source code for more information. Repositories for Linux packages: - * deb: https://www.kamailio.org/wiki/packages/debs - * rpm: https://www.kamailio.org/wiki/packages/rpms + * deb: https://www.kamailio.org/wikidocs/packages/debs + * rpm: https://www.kamailio.org/wikidocs/packages/rpms ## Issues And Bug Reports

1 year, 12 months

[kamailio/kamailio] [kamailio 5.6.0~rc1] Possible regression for {s.int} (Issue #3116)

by George Diamantopoulos

### Description I noticed at least one regression while testing out kamailio 5.6.0: the same configuration yields a different result after upgrading from 5.5.4. More specifically, this xlog line/statement: ``` xlog("L_CRIT", "vn is $vn(cli_164_src_noccgr), to int is $(vn(cli_164_src_noccgr){s.int})\n"); ``` Prints the following in syslog for `$vn(cli_164_src_noccgr) = "2152157200"`: * On 5.5.4: `vn is 2152157200, to int is 2152157200` * On 5.6.0~rc1: `vn is 2152157200, to int is` I've only tested this with a couple of values and it doesn't always happen, for example for `$vn(cli_164_src_noccgr) = "2103260000"` the issue doesn't manifest. Only thing I could think of is 2103260000 can be represented (unsigned) by 31 bits, whereas you need 32 bits for 2152157200? I skimmed over pv_trans.c and there weren't any obvious commits that could take the blame, at least not to me. Perhaps this is a compiler/glibc thing? ### Troubleshooting #### Reproduction Try the transformation above with various values for the pseudovariable being transformed, I guess.  ### Additional Information ``` version: kamailio 5.6.0-rc1 (x86_64/linux) 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_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, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**: ``` Linux sbcprov0-stage-lhe0-cn1 5.10.0-10-amd64 #1 SMP Debian 5.10.84-1 (2021-12-08) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3116 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3116(a)github.com>

1 year, 12 months

git:master:bed6bba7: dialog: fix ki_dlg_get_var() introduced previously

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bed6bba77a16ec1a840544d674d03d692869c68e URL: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-21T08:23:37+02:00 dialog: fix ki_dlg_get_var() introduced previously --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… Patch: https://github.com/kamailio/kamailio/commit/bed6bba77a16ec1a840544d674d03d6… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 5347c0fa1d..6668712dc3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1549,14 +1549,14 @@ static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); - val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, sc, sf, st, key); if(!val) { sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); return &_sr_kemi_dialog_xval; } _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; - _sr_kemi_dialog_xval.v.s = *pval; + _sr_kemi_dialog_xval.v.s = *val; return &_sr_kemi_dialog_xval;

1 year, 12 months

[kamailio/kamailio] core: const correctness (PR #3120)

by liviu-rolo

benign const qualifiers in inline functions   #### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3120 -- Commit Summary -- * core: const correctness -- File Changes -- M src/core/ip_addr.h (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3120.patch https://github.com/kamailio/kamailio/pull/3120.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3120 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3120(a)github.com>

1 year, 12 months

Re: [sr-dev] [kamailio/kamailio] Run failed: build - master (130ce1b)

by Henning Westerholt

Hello, this seems to be caused from 7c347e244cf761d0: dialog.c: In function ‘ki_dlg_get_var’: dialog.c:1552:51: error: ‘k’ undeclared (first use in this function) 1552 | val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); | ^ dialog.c:1552:51: note: each undeclared identifier is reported only once for each function it appears in dialog.c:1552:35: warning: passing argument 2 of ‘ki_dlg_get_var_helper’ from incompatible pointer type [-Wincompatible-pointer-types] 1552 | val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); | ^~~ [..] make[2]: *** [../../Makefile.rules:100: dialog.o] Error 1 Cheers, Henning From: Henning Westerholt <notifications(a)github.com> Sent: Friday, May 20, 2022 6:42 PM To: Kamailio Devel List <sr-dev(a)lists.sip-router.org> Cc: Ci activity <ci_activity(a)noreply.github.com> Subject: [kamailio/kamailio] Run failed: build - master (130ce1b) [GitHub] [kamailio/kamailio] build workflow run [https://github.githubassets.com/images/email/icons/actions.png] build: Some jobs were not successful View workflow run<https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (bullseye, gcc)] build / build (bullseye, gcc) Failed in 2 minutes and 29 seconds [annotations for build / build (bullseye, gcc)]11 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (bullseye, clang)] build / build (bullseye, clang) Cancelled [annotations for build / build (bullseye, clang)]2 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (sid, gcc)] build / build (sid, gcc) Failed in 2 minutes and 35 seconds [annotations for build / build (sid, gcc)]13 <https://github.com/kamailio/kamailio/actions/runs/2359532599> [build (sid, clang)] build / build (sid, clang) Cancelled [annotations for build / build (sid, clang)]2 <https://github.com/kamailio/kamailio/actions/runs/2359532599> — You are receiving this because this workflow ran on your branch. Manage your GitHub Actions notifications<https://github.com/settings/notifications> GitHub, Inc. ・88 Colin P Kelly Jr Street ・San Francisco, CA 94107

1 year, 12 months

git:master:130ce1bf: core: const correctness

by Henning Westerholt

Module: kamailio Branch: master Commit: 130ce1bf871cfb4a89bcf0cc74d898f84eeaa981 URL: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… Author: Liviu Andron <liviu.andron(a)bjtmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-05-20T18:38:54+02:00 core: const correctness benign const qualifiers in inline functions --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… Patch: https://github.com/kamailio/kamailio/commit/130ce1bf871cfb4a89bcf0cc74d898f… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 2f7770f81d..88c0e0205e 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -301,7 +301,7 @@ int is_mcast(struct ip_addr* ip); /* returns 1 if the given ip address is INADDR_ANY or IN6ADDR_ANY, * 0 otherwise */ -inline static int ip_addr_any(struct ip_addr* ip) +inline static int ip_addr_any(const struct ip_addr* ip) { int r; int l; @@ -316,7 +316,7 @@ inline static int ip_addr_any(struct ip_addr* ip) /* returns 1 if the given ip address is a loopback address * 0 otherwise */ -inline static int ip_addr_loopback(struct ip_addr* ip) +inline static int ip_addr_loopback(const struct ip_addr* ip) { if (ip->af==AF_INET) return ip->u.addr32[0]==htonl(INADDR_LOOPBACK); @@ -352,7 +352,7 @@ inline static void ip_addr_mk_any(int af, struct ip_addr* ip) /* returns 1 if ip & net.mask == net.ip ; 0 otherwise & -1 on error * [ diff. address families ]) */ -inline static int matchnet(struct ip_addr* ip, struct net* net) +inline static int matchnet(const struct ip_addr* ip, const struct net* net) { unsigned int r; @@ -371,7 +371,7 @@ inline static int matchnet(struct ip_addr* ip, struct net* net) /* inits an ip_addr pointer from a sockaddr structure*/ -static inline void sockaddr2ip_addr(struct ip_addr* ip, struct sockaddr* sa) +static inline void sockaddr2ip_addr(struct ip_addr* ip, const struct sockaddr* sa) { switch(sa->sa_family){ case AF_INET: @@ -447,7 +447,7 @@ static inline void su_setport(union sockaddr_union* su, unsigned short port) /* inits an ip_addr pointer from a sockaddr_union ip address */ -static inline void su2ip_addr(struct ip_addr* ip, union sockaddr_union* su) +static inline void su2ip_addr(struct ip_addr* ip, const union sockaddr_union* su) { switch(su->s.sa_family){ case AF_INET: @@ -595,7 +595,7 @@ struct hostent* ip_addr2he(str* name, struct ip_addr* ip); /* init a dest_info structure from a recv_info structure */ inline static void init_dst_from_rcv(struct dest_info* dst, - struct receive_info* rcv) + const struct receive_info* rcv) { dst->send_sock=rcv->bind_address; dst->to=rcv->src_su;

1 year, 12 months

git:master:7c347e24: dialog: reworked kemi export for dlg_get_var()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7c347e244cf761d04d5aff906e88571cd68217f3 URL: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-05-20T16:07:56+02:00 dialog: reworked kemi export for dlg_get_var() - return SR_KEMIP_XVAL type --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… Patch: https://github.com/kamailio/kamailio/commit/7c347e244cf761d04d5aff906e88571… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index b169dc2d26..5347c0fa1d 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1511,7 +1511,7 @@ static int fixup_dlg_bridge(void** param, int param_no) return 0; } -static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +static str *ki_dlg_get_var_helper(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) { dlg_cell_t *dlg = NULL; unsigned int dir = 0; @@ -1538,6 +1538,30 @@ static str *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) return val; } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; + +static sr_kemi_xval_t *ki_dlg_get_var(sip_msg_t *msg, str *sc, str *sf, str *st, str *key) +{ + str *val = NULL; + + memset(&_sr_kemi_dialog_xval, 0, sizeof(sr_kemi_xval_t)); + + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); + if(!val) { + sr_kemi_xval_null(&_sr_kemi_dialog_xval, SR_KEMI_XVAL_NULL_NONE); + return &_sr_kemi_dialog_xval; + } + + _sr_kemi_dialog_xval.vtype = SR_KEMIP_STR; + _sr_kemi_dialog_xval.v.s = *pval; + + return &_sr_kemi_dialog_xval; + +} + static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char *key, char *pv) { str sc = STR_NULL; @@ -1582,7 +1606,7 @@ static int w_dlg_get_var(struct sip_msg *msg, char *ci, char *ft, char *tt, char return -1; } dst_pv = (pv_spec_t *)pv; - val = ki_dlg_get_var(msg, &sc, &sf, &st, &k); + val = ki_dlg_get_var_helper(msg, &sc, &sf, &st, &k); if(val) { memset(&dst_val, 0, sizeof(pv_value_t)); dst_val.flags |= PV_VAL_STR; @@ -2155,11 +2179,6 @@ static int ki_dlg_var_sets(sip_msg_t *msg, str *name, str *val) return (ret==0)?1:ret; } -/** - * - */ -static sr_kemi_xval_t _sr_kemi_dialog_xval = {0}; - /** * */ @@ -2289,7 +2308,7 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("dialog"), str_init("dlg_get_var"), - SR_KEMIP_STR, ki_dlg_get_var, + SR_KEMIP_XVAL, ki_dlg_get_var, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 year, 12 months

← Newer
1
...
13
14
15
16
17
18
19
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2022