sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

git:master:5fe9c7d5: ims_ipsec_pcscf: IPv6 support

by Aleksandar Yosifov

Module: kamailio Branch: master Commit: 5fe9c7d5a82a12f0033785e3ee7fa2d35bc0f3df URL: https://github.com/kamailio/kamailio/commit/5fe9c7d5a82a12f0033785e3ee7fa2d… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2019-06-04T09:37:38+03:00 ims_ipsec_pcscf: IPv6 support - Set authentication algorithm for SA depending of parsed security-client info from REGISTER request msg. For now, the supported algorithms are md5 and sha1, the default algorithm is sha1. - fill_contact() changes: No significant changes, but added a debug message and code is more readable. - Added support for IPv6. A new parameter IPSEC_LISTEN_ADDR6 is added in pcscf.cfg file that describe IPv6 listen address. A new module parameter ipsec_listen_addr6 is added in kamailio.cfg to pass IPv6 listen address into the ipsec module. - mode_init() changes: Add ipv4 and/or ipv6 listen interfaces depending of configured parameters in pcscf/kamailio config files. - create_ipsec_tunnel() changes: Update temp security parameters for contact. Add 4 SAs and polisies (UE client->Proxy server, Proxy client-> UE server, Proxy server->UE client and UE server->Proxy client). Server->client SAs are used for TCP connections. - destroy_ipsec_tunnel() changes: Remove all SAs and policies. - ipsec_forward() changes: Refactored to use both UDP and TCP protocols. Selects the protocol type, sourse and destination ports based on message type. - Removed unused method convert_ip_address(). Replaced by core methods str2ipbuf() and str2ip6buf(). - changes in README README regenerated via ims_ipsec_pscscf_admin.xml. Added a new parameter for listen IPv6 address. --- Modified: src/modules/ims_ipsec_pcscf/README Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml Modified: src/modules/ims_ipsec_pcscf/ims_ipsec_pcscf_mod.c Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/ipsec.h --- Diff: https://github.com/kamailio/kamailio/commit/5fe9c7d5a82a12f0033785e3ee7fa2d… Patch: https://github.com/kamailio/kamailio/commit/5fe9c7d5a82a12f0033785e3ee7fa2d…

5 years, 5 months

git:master:2ab4cad8: pv: exposed kemi functions for getting xavp empty and print variants

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 2ab4cad891dd8aeff44f759a9f185207dc174949 URL: https://github.com/kamailio/kamailio/commit/2ab4cad891dd8aeff44f759a9f18520… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-05T08:30:49+02:00 pv: exposed kemi functions for getting xavp empty and print variants --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/2ab4cad891dd8aeff44f759a9f18520… Patch: https://github.com/kamailio/kamailio/commit/2ab4cad891dd8aeff44f759a9f18520… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index c59e44fbb4..e6cd248d8c 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1155,6 +1155,22 @@ static sr_kemi_xval_t* ki_xavp_get(sip_msg_t *msg, str *rname) return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_NONE); } +/** + * + */ +static sr_kemi_xval_t* ki_xavp_gete(sip_msg_t *msg, str *rname) +{ + return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_xavp_getw(sip_msg_t *msg, str *rname) +{ + return ki_xavp_get_mode(msg, rname, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -1193,6 +1209,24 @@ static sr_kemi_xval_t* ki_xavp_get_child(sip_msg_t *msg, str *rname, str *cname) return ki_xavp_get_child_mode(msg, rname, cname, SR_KEMI_XVAL_NULL_NONE); } + +/** + * + */ +static sr_kemi_xval_t* ki_xavp_gete_child(sip_msg_t *msg, str *rname, str *cname) +{ + return ki_xavp_get_child_mode(msg, rname, cname, SR_KEMI_XVAL_NULL_EMPTY); +} + + +/** + * + */ +static sr_kemi_xval_t* ki_xavp_getw_child(sip_msg_t *msg, str *rname, str *cname) +{ + return ki_xavp_get_child_mode(msg, rname, cname, SR_KEMI_XVAL_NULL_PRINT); +} + /** * */ @@ -1465,11 +1499,31 @@ static sr_kemi_t sr_kemi_pvx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_gete"), + SR_KEMIP_XVAL, ki_xavp_gete, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_getw"), + SR_KEMIP_XVAL, ki_xavp_getw, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("xavp_get_child"), SR_KEMIP_XVAL, ki_xavp_get_child, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pvx"), str_init("xavp_gete_child"), + SR_KEMIP_XVAL, ki_xavp_gete_child, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("pvx"), str_init("xavp_getw_child"), + SR_KEMIP_XVAL, ki_xavp_getw_child, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pvx"), str_init("evalx"), SR_KEMIP_INT, ki_pv_evalx, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

5 years, 5 months

[kamailio/kamailio] [5.2.3][app_python3][KEMI] KSR.registrar.save fails with "domain not found" (#1972)

by Michael Seifert

### Description When using the Python3 extension for KEMI, `registrar.save` complains about an unknown location: `registrar [api.c:44]: regapi_save(): usrloc domain [location] not found`. Saving the user location works without problems in the core scripting language. ### Troubleshooting #### Reproduction Here is a fairly minimal Python3 script: ```python import KSR as KSR def mod_init(): KSR.info("===== from Python mod init\n") return kamailio() class kamailio: def __init__(self): KSR.info('===== kamailio.__init__\n') def child_init(self, rank): KSR.info('===== kamailio.child_init(%d)\n' % rank) return 0 def ksr_request_route(self, msg): KSR.hdr.remove('Route') if KSR.is_method('INVITE'): KSR.rr.record_route() if not KSR.is_myself_ruri(): KSR.info(f'Relaying to foreign domain: to={msg.RURI} method={msg.Method}\n') return self.relay(msg) if KSR.is_method("REGISTER"): return self.registration(msg) KSR.registrar.lookup("location") KSR.sl.send_reply(100, "Trying") return self.relay(msg) def ksr_reply_route(self, msg): KSR.info(f'Received response: from={msg.src_address} status={msg.Status}\n') return 1 def ksr_onsend_route(self, msg): if msg.Type == 'SIP_REQUEST': KSR.info(f'Sending request: to={msg.dst_address} method={msg.Method}\n') return 1 def registration(self, msg): if not KSR.registrar.save("location", 0x01): KSR.sl.sl_reply_error() return 1 def relay(self, msg): if not KSR.tm.t_relay(): KSR.sl.sl_reply_error() return 1 ``` If this script is used for request routing, the user locations cannot be saved and the above mentioned error is logged. #### Log Messages `4(4360) ERROR: {1 15678 REGISTER 16c11b02-2458-4263-9350-c2f26fafee53} registrar [api.c:44]: regapi_save(): usrloc domain [location] not found` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.3 (x86_64/linux) c36229 flags: STATS: Off, USE_TCP, USE_TLS, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: c36229 compiled on 13:25:11 Jun 2 2019 with gcc 8.3.0 ``` * **Operating System**: ``` Linux linux 5.1.5-gentoo #1 SMP PREEMPT Mon May 27 14:42:14 CEST 2019 x86_64 AMD A6-3670 APU with Radeon(tm) HD Graphics AuthenticAMD GNU/Linux ``` -- 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/1972

5 years, 5 months

[kamailio/kamailio] Memory leaks in websocket module (#1892)

by Andrey Deykunov

### Description We had Kamailio 5.1.4 with websocket module. Unfortunately, our clients don't support websocket keepalive mechanism at all, so I used TCP keepalive instead with the following parameters: ``` tcp_keepalive=yes tcp_keepcnt=6 tcp_keepidle=60 tcp_keepintvl=10 ``` and set up KEEPALIVE_MECHANISM_NONE: `modparam("websocket", "keepalive_mechanism", 0)` During load testing and debugging, when 8k clients sent registrations, it was found out that shared memory was not freed after closing connections (_ws_connection_list_t *wsconn_used_list_ variable in ws_conn.c ). ### Possible Solutions I've decided to add new keepalive mechanism that periodically checks TCP connection related to websocket: ``` enum { KEEPALIVE_MECHANISM_NONE = 0, KEEPALIVE_MECHANISM_PING = 1, KEEPALIVE_MECHANISM_PONG = 2, KEEPALIVE_MECHANISM_TCP_CONN_CHECK = 3 }; ``` and added the line to config: ``` # Enable custom tcp-connection-health based keepalive mechanism (3) # KEEPALIVE_MECHANISM_NONE = 0, # KEEPALIVE_MECHANISM_PING = 1, # KEEPALIVE_MECHANISM_PONG = 2 # KEEPALIVE_MECHANISM_TCP_CONN_CHECK = 3 modparam("websocket", "keepalive_mechanism", 3) ``` Also, I've implemented the mechanism in ws_keepalive function: ``` void ws_keepalive(unsigned int ticks, void *param) { int check_time = (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_t **list = NULL, **list_head = NULL; ws_connection_t *wsc = NULL; /* get an array of pointer to all ws connection */ list_head = wsconn_get_list(); if(!list_head) return; list = list_head; wsc = *list_head; while(wsc && wsc->last_used < check_time) { if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_TCP_CONN_CHECK) { struct tcp_connection *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(!con) { LM_INFO("tcp connection has been lost\n"); wsc->state = WS_S_CLOSING; } } if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_INFO("forcibly closing connection\n"); wsconn_close_now(wsc); } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING : OPCODE_PONG; ping_pong(wsc, opcode); } wsc = *(++list); } wsconn_put_list(list_head); } ``` and changed memory allocation method in wsconn_get_list and wsconn_put_list methods from pkg to shm, because, as it turned out during load testing, using pkg_malloc (the C malloc) in this functions may cousing fails under serious loads. These modifications solved the problem. But about a week ago we've started switching to ver. 5.2.1 and found a lot of changes in the websocket module. So, I've added my changes in this commit https://github.com/korizza/kamailio/commit/b3e03d03574ff4ff076005bb8a01d746… . Please take a look. ### Additional Information Adding ws_conn_put_id in this commit https://github.com/kamailio/kamailio/commit/a975bca1702ea2f3db47f834f7e4da2… did not solve problem with ref counter increasing. -- 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/1892

5 years, 5 months

[kamailio/kamailio] [5.2.2] sometimes wss doesn't work with received TLS packet in specific condition (#1933)

by BroWater

### Description I bind a wss port on kamailio for connecting to WebRTC clients, when I received a TLS packet on wss port, it will reply a HTML window to browser who sent the packet , as defined in kamailio.cfg: > \# xhttp event route > event_route[xhttp:request] { > ... > > If(wss port receives a packet) > { > xhttp_reply("200", "OK", "text/html","<html><head><meta http-equiv=\"refresh\" content=\"0;url=$shv(URLToBeOpened)\"></head></html>"); > } > ... > } However , sometimes the HTML window appears stuck in a connecting state, it may be connected or timeout finally. Above problem happens on ARMv4 , but works smoothly on AArch64. I put some related information in Troubleshooting block, hope these may help to figure out why this happens. ### Troubleshooting #### Reproduction Access to https://(IP address of kamailio):(wss port), and stuck in loading page. <Environment settings> [ARMv4] config.mak: CC=/opt/toolchains/sdk51/gcc/bin/arm-marvell-linux-gnueabi-gcc make cfg include_modules="db_sqlite tls websocket" mode=debug ARCH=armv41 CPUTYPE=cortex-a8 LOCALBASE=/mnt/test/kamailio/ [AArch64] config.mak: CC=/opt/toolchains/aarch64-thunderx/bin/aarch64-thunderx-linux-gnu-gcc make cfg include_modules="db_sqlite tls websocket" mode=debug ARCH=aarch64 CPUTYPE=ARMv8 LOCALBASE=/mnt/test/kamailio/ #### Debugging Data **Note: Not the same time as Log Messsages and SIP Traffic** [ARMv4] \# netstat -apn | grep 10443 tcp 0 0 10.100.92.52:10443 0.0.0.0:* LISTEN 32418/kamailio tcp 518 0 10.100.92.52:10443 10.100.92.29:54693 CLOSE_WAIT 32417/kamailio Recv-Q on wss port seems stuck here... [AArch64] \# netstat -apn | grep 10443 tcp 0 0 10.100.92.222:10443 0.0.0.0:* LISTEN 9799/kamailio tcp 0 0 10.100.92.222:10443 10.100.92.29:54817 TIME_WAIT - tcp 0 0 10.100.92.222:10443 10.100.92.29:54818 TIME_WAIT - tcp 0 0 10.100.92.222:10443 10.100.92.29:54820 ESTABLISHED 9798/kamailio #### Log Messages WSS port used here is 10443, 10.100.92.29 is my PC which uses a WebRTC client to connect to kamailio, 10.100.92.222 is kamailio on AAch64, 10.100.92.52 is kamailio on ARMv4. [ARMv4] (which stuck in connecting to https://10.100.92.222:10443 ) (no related log was output...) whole log here: [WSS_TLS_FAIL_10.100.92.52.txt](https://github.com/kamailio/kamailio/files/3… [AArch64] ... DEBUG: tls [tls_locking.c:110]: locking_f(): lock get (9): 2 (ex_data.c:318) DEBUG: tls [tls_locking.c:116]: locking_f(): lock release (10): 2 (ex_data.c:338) DEBUG: tls [tls_locking.c:110]: locking_f(): lock get (5): 2 (ex_data.c:507) DEBUG: tls [tls_locking.c:116]: locking_f(): lock release (6): 2 (ex_data.c:517) DEBUG: tls [tls_domain.c:736]: sr_ssl_ctx_info_callback(): SSL handshake done DEBUG: tls [tls_domain.c:740]: sr_ssl_ctx_info_callback(): SSL disable renegotiation DEBUG: tls [tls_server.c:415]: tls_accept(): TLS accept successful EBUG: tls [tls_server.c:422]: tls_accept(): tls_accept: new connection from 10.100.92.29:53189 using TLSv1/SSLv3 AES256-SHA 256 DEBUG: tls [tls_server.c:425]: tls_accept(): tls_accept: local socket: 10.100.92.222:10443 DEBUG: tls [tls_server.c:436]: tls_accept(): tls_accept: client did not present a certificate DEBUG: <core> [core/tcp_read.c:1492]: tcp_read_req(): read= 0 bytes, parsed=0, state=0, error=1 DEBUG: <core> [core/tcp_read.c:1495]: tcp_read_req(): last char=0x00, parsed msg= ... whole log here: [WSS_TLS_OK_10.100.92.222.txt](https://github.com/kamailio/kamailio/files/31… #### SIP Traffic TLS packets captured image [ARMv4] https://imgur.com/jgnTaLy [AArch64] https://imgur.com/pfpWSXB ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` [ARMv4] /mnt/test/kamailio/sbin# ./kamailio -v version: MyLogo , 5.2.2 (armv41/linux) a82930-dirty flags: STATS: Off, EXTRA_DEBUG, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, USE_PTHREAD_MUTEX, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES 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: a82930 -dirty compiled on 15:20:56 Apr 22 2019 with /opt/toolchains/sdk51/gcc/bin/arm-marvell-linux-gnueabi-gcc 4.6.2 [AArch64] /mnt/test/kamailio/sbin# ./kamailio -v version: MyLogo , 5.2.0-dev3 (aarch64/linux) flags: STATS: Off, EXTRA_DEBUG, 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-NOSMP, 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 on 15:47:47 Feb 6 2018 with /opt/toolchains/aarch64-thunderx/bin/aarch64-thunderx-linux-gnu-gcc 5.3.0 * **Operating System**: [ARMv4] Linux Test 3.2.36-1.00 #1479 SMP Mon Apr 15 10:21:28 CST 2019 armv7l GNU/Linux [AArch64] Linux Test 4.4.13 #1 SMP PREEMPT Fri Mar 24 10:50:44 CST 2017 aarch64 GNU/Linux -- 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/1933

5 years, 5 months

[kamailio/kamailio] Siptrace patch review (#1955)

by Daniel-Constantin Mierla

### Description A patch was pushed to master branch to enable use of trace_type in the ki_sip_trace_dst_cid_flag(), following the latest additions to the module. It seemed that the trace type was used only for kamailio.cfg functions, because inside ki_sip_trace_dst_cid_flag() the trace_type was parsed and stored in local variable, but it was not used further. I open this issue for review, to be sure something was not overlooked, the commit is: * e8d765610c6926cc6cb4dfa490595214a3680f97 @ionutionita92 - can you have a look and eventually do some tests to be sure it still works as expected for kamailio.cfg functions? There is one more aspect to clarify. The trace info structure is alocated in shared memory, but some of its fields (duplicate uri and correlation id) were set to addresses of function parameters/local variables. The code was relocated and now is at the following lines: * https://github.com/kamailio/kamailio/blob/master/src/modules/siptrace/siptr… Is it safe to do it like this? Are the fields used in this case only in current process and the callbacks use the variant stored in AVP? Speaking of serializing to a string stored in AVP, it might be better to just have a structure compacted with all content in shared memory and stored in an XAVP -- the xavp can store a pointer and also have in its structure the callback to free the pointer.  ### 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` ``` Git Master Branch ``` * **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/1955

5 years, 5 months

git:master:a1264685: pv: kemi functions to get xavp value from root and child lists

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a1264685bca4b5f96e63d8120de55528ff47d282 URL: https://github.com/kamailio/kamailio/commit/a1264685bca4b5f96e63d8120de5552… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-04T13:16:23+02:00 pv: kemi functions to get xavp value from root and child lists --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/a1264685bca4b5f96e63d8120de5552… Patch: https://github.com/kamailio/kamailio/commit/a1264685bca4b5f96e63d8120de5552…

5 years, 5 months

git:master:1e6d7df2: kemix: kemi function to get print and empty variants for r-uri user and host

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e6d7df24f86a92a7425a510c6125d67869a9168 URL: https://github.com/kamailio/kamailio/commit/1e6d7df24f86a92a7425a510c6125d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-04T12:37:06+02:00 kemix: kemi function to get print and empty variants for r-uri user and host --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1e6d7df24f86a92a7425a510c6125d6… Patch: https://github.com/kamailio/kamailio/commit/1e6d7df24f86a92a7425a510c6125d6… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 5c61703b31..ff675442d4 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -235,9 +235,17 @@ static sr_kemi_xval_t* ki_kx_get_ruser(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_ruserx(sip_msg_t *msg, int xmode) +static sr_kemi_xval_t* ki_kx_get_ruserw(sip_msg_t *msg) { - return ki_kx_get_ruri_attr(msg, 1, xmode); + return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rusere(sip_msg_t *msg) +{ + return ki_kx_get_ruri_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); } /** @@ -251,9 +259,17 @@ static sr_kemi_xval_t* ki_kx_get_rhost(sip_msg_t *msg) /** * */ -static sr_kemi_xval_t* ki_kx_get_rhostx(sip_msg_t *msg, int xmode) +static sr_kemi_xval_t* ki_kx_get_rhostw(sip_msg_t *msg) { - return ki_kx_get_ruri_attr(msg, 2, xmode); + return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_rhoste(sip_msg_t *msg) +{ + return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); } /** @@ -286,9 +302,14 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_ruserx"), - SR_KEMIP_XVAL, ki_kx_get_ruserx, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { str_init("kx"), str_init("get_ruserw"), + SR_KEMIP_XVAL, ki_kx_get_ruserw, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rusere"), + SR_KEMIP_XVAL, ki_kx_get_rusere, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("kx"), str_init("get_rhost"), @@ -296,12 +317,16 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rhostx"), - SR_KEMIP_XVAL, ki_kx_get_rhostx, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { str_init("kx"), str_init("get_rhostw"), + SR_KEMIP_XVAL, ki_kx_get_rhostw, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rhoste"), + SR_KEMIP_XVAL, ki_kx_get_rhoste, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

5 years, 5 months

Info: app_lua_sr module - old Lua sr library

by Daniel-Constantin Mierla

Hello, several days ago I split the app_lua module, relocating the code related to old Lua sr library to app_lua_sr module, keeping in this way app_lua smaller and focused to the KEMI code. Over the time, app_lua_sr should be deprecated and removed, as we are sure the functions in Lua sr have an equivalent in Lua KSR. Therefore, if you are using in Lua scripts functions from 'sr' library, consider migrating to KSR as soon as possible. The intermediary solution for a quick upgrade to master version (to be release as v5.3.x) is to load app_lua_sr and update some modparams, like: loadmodule "app_lua.so" loadmodule "app_lua_sr.so" modparam("app_lua_sr", "register", "sl") If you find a function from Lua sr not available in Lua KSR, then report it via mailing lists or bug tracker. An article about this topic was published at: * https://www.kamailio.org/w/2019/05/new-module-app_lua_sr/ Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

5 years, 5 months

git:master:f23e256a: htable: kemi functions to get the value of an hash table item

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f23e256acbc10cd24238f71a70b6f1a7bf64826d URL: https://github.com/kamailio/kamailio/commit/f23e256acbc10cd24238f71a70b6f1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-04T08:54:13+02:00 htable: kemi functions to get the value of an hash table item --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f23e256acbc10cd24238f71a70b6f1a… Patch: https://github.com/kamailio/kamailio/commit/f23e256acbc10cd24238f71a70b6f1a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 1320330f35..667653639c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -917,6 +917,83 @@ int ht_param(modparam_t type, void *val) } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_htable_xval = {0}; + +/* pkg copy */ +static ht_cell_t *_htc_kemi_local=NULL; + +/** + * + */ +static sr_kemi_xval_t* ki_ht_get_mode(sip_msg_t *msg, str *htname, str *itname, + int rmode) +{ + ht_t *ht = NULL; + ht_cell_t *htc=NULL; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + sr_kemi_xval_null(&_sr_kemi_htable_xval, rmode); + return &_sr_kemi_htable_xval; + } + + htc = ht_cell_pkg_copy(ht, itname, _htc_kemi_local); + if(_htc_kemi_local!=htc) { + ht_cell_pkg_free(_htc_kemi_local); + _htc_kemi_local=htc; + } + if(htc==NULL) { + if(ht->flags==PV_VAL_INT) { + _sr_kemi_htable_xval.vtype = SR_KEMIP_INT; + _sr_kemi_htable_xval.v.n = ht->initval.n; + return &_sr_kemi_htable_xval; + } + sr_kemi_xval_null(&_sr_kemi_htable_xval, rmode); + return &_sr_kemi_htable_xval; + } + + if(htc->flags&AVP_VAL_STR) { + _sr_kemi_htable_xval.vtype = SR_KEMIP_STR; + _sr_kemi_htable_xval.v.s = htc->value.s; + return &_sr_kemi_htable_xval; + } + + /* integer */ + _sr_kemi_htable_xval.vtype = SR_KEMIP_INT; + _sr_kemi_htable_xval.v.n = htc->value.n; + return &_sr_kemi_htable_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_ht_get(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_get_mode(msg, htname, itname, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_ht_gete(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_get_mode(msg, htname, itname, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_ht_getw(sip_msg_t *msg, str *htname, str *itname) +{ + return ki_ht_get_mode(msg, htname, itname, SR_KEMI_XVAL_NULL_PRINT); +} + + /** * */ @@ -1694,6 +1771,21 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_get"), + SR_KEMIP_XVAL, ki_ht_get, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_gete"), + SR_KEMIP_XVAL, ki_ht_gete, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_getw"), + SR_KEMIP_XVAL, ki_ht_getw, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("htable"), str_init("sht_sets"), SR_KEMIP_INT, ki_ht_sets, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR,

5 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019