sr-dev March 2021

sr-dev@lists.kamailio.org

28 participants
490 discussions

git:5.4:2b290d38: ndb_redis: fix cluster support
by Victor Seva 02 Mar '21

02 Mar '21

Module: kamailio Branch: 5.4 Commit: 2b290d383d186efc1afe385f669c42bf64ba67ec URL: https://github.com/kamailio/kamailio/commit/2b290d383d186efc1afe385f669c42b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-03-02T15:28:07+01:00 ndb_redis: fix cluster support fixes #2461 related #2300 (cherry picked from commit 5557b9b715a9ca754c454b5edaebf2a43b832015) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/2b290d383d186efc1afe385f669c42b… Patch: https://github.com/kamailio/kamailio/commit/2b290d383d186efc1afe385f669c42b… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index bd97012c8e..15a86f7b10 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1032,13 +1032,6 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) } } - LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); - if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { - LM_ERR("Redis error:%.*s\n", - (int)rpl->rplRedis->len, rpl->rplRedis->str); - goto error_exec; - } - if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -1073,14 +1066,15 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + } - LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); - if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { - LM_ERR("Redis error:%.*s\n", - (int)rpl->rplRedis->len, rpl->rplRedis->str); - goto error_exec; - } + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; } + STR_ZTOV(cmd->s[cmd->len], c); rsrv->disable.consecutive_errors = 0; va_end(ap);

1 0

git:master:f82a2563: ndb_redis: add result check when reconnecting
by Victor Seva 02 Mar '21

02 Mar '21

Module: kamailio Branch: master Commit: f82a2563000361b6b1b12b4bb72b9a8ee4c62292 URL: https://github.com/kamailio/kamailio/commit/f82a2563000361b6b1b12b4bb72b9a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-03-02T15:20:44+01:00 ndb_redis: add result check when reconnecting Reported and provided solution by @kritarthh follow-up #2461 --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/f82a2563000361b6b1b12b4bb72b9a8… Patch: https://github.com/kamailio/kamailio/commit/f82a2563000361b6b1b12b4bb72b9a8… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 42880310f2..befb69ab79 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1059,6 +1059,11 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) if(redisc_reconnect_server(rsrv)==0) { rpl->rplRedis = redisvCommand(rsrv->ctxRedis, cmd->s, ap4); + if(rpl->rplRedis == NULL) + { + redis_count_err_and_disable(rsrv); + goto error_exec; + } } else { LM_ERR("unable to reconnect to redis server: %.*s\n", srv->len, srv->s);

1 0

[kamailio/kamailio] Topos+uacreg: failure to match transaction (#2654)
by Sergiu Pojoga 02 Mar '21

02 Mar '21

### Description When using a combination of TopoS+UACreg+Dialog, Kamailio fails to match received replies to a transaction in a dialog. ### Troubleshooting modparam("topos", "storage", "redis") modparam("topos", "sanity_checks", 0) modparam("topos", "contact_mode", 0) modparam("dialog", "track_cseq_updates", 1) #### Reproduction Load Topos + UAC + Dialog modules. Enable dialog cseq tracking. Add some uacrec record. Register with remote peer. Make a call towards the remote peer. INVITE - Cseq: 1, Branch number: 0. Kamailio will receive a 401 challenge. - Cseq: 2, Branch number: 1, it will include the Digest auth and try again. . The mangled topos Contact username will be slightly different (supposed to be?) - Next, the UAS will reply with 100 Trying. In response to that, Kamailio keeps retransmitting the same INVITE with Cseq 2 over and over again, presumably because it fails to match that reply to an existing transaction. #### Debugging Data ``` DEBUG: {2 2 INVITE a19dfac7c4a65} tm [t_lookup.c:1009]: t_reply_matching(): failure to match a transaction ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` 2021/02/26 12:10:16.213947 10.10.10.2:5060 -> 10.10.10.1:5060 INVITE sip:8882223333@mypbx.mydomain.net SIP/2.0 Via: SIP/2.0/UDP mysbc.mydomain.com:5060;branch=z9hG4bK4f81.97f17905fe7afced720300fea57ef462.0;i=6a FROM: Demo Five<sip:2385@mypbx.mydomain.net>;tag=29e99c29147f425f914b73512fc13cf3 TO: <sip:8882223333@mypbx.mydomain.net> CSEQ: 1 INVITE CALL-ID: 33c9034c136e57de9c1278daef7d02fb MAX-FORWARDS: 69 CONTENT-LENGTH: 575 MIN-SE: 300 SUPPORTED: timer USER-AGENT: UA CONTENT-TYPE: application/sdp ALLOW: INVITE,ACK,OPTIONS,CANCEL,BYE,NOTIFY SESSION-EXPIRES: 3600 Contact: <sip:btpsh-603922bd-3db9-1@mysbc.mydomain.com:5060> 2021/02/26 12:10:16.215650 10.10.10.1:5060 -> 10.10.10.2:5060 SIP/2.0 401 Unauthorized Via: SIP/2.0/UDP mysbc.mydomain.com:5060;branch=z9hG4bK4f81.97f17905fe7afced720300fea57ef462.0;i=6a;received=10.10.10.2;rport=5060 From: Demo Five<sip:2385@mypbx.mydomain.net>;tag=29e99c29147f425f914b73512fc13cf3 To: <sip:8882223333@mypbx.mydomain.net>;tag=as7c952f5b Call-ID: 33c9034c136e57de9c1278daef7d02fb CSeq: 1 INVITE Server: B2B Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer, path WWW-Authenticate: Digest algorithm=MD5, realm="asterisk", nonce="4f8fcced" Content-Length: 0 2021/02/26 12:10:16.238191 10.10.10.2:5060 -> 10.10.10.1:5060 ACK sip:8882223333@mypbx.mydomain.net SIP/2.0 FROM: Demo Five<sip:2385@mypbx.mydomain.net>;tag=29e99c29147f425f914b73512fc13cf3 To: <sip:8882223333@mypbx.mydomain.net>;tag=as7c952f5b CSEQ: 1 ACK CALL-ID: 33c9034c136e57de9c1278daef7d02fb MAX-FORWARDS: 69 Via: SIP/2.0/UDP mysbc.mydomain.com:5060;branch=z9hG4bK4f81.97f17905fe7afced720300fea57ef462.0;i=6a CONTENT-LENGTH: 0 2021/02/26 12:10:16.280455 10.10.10.2:5060 -> 10.10.10.1:5060 INVITE sip:8882223333@mypbx.mydomain.net SIP/2.0 Via: SIP/2.0/UDP mysbc.mydomain.com:5060;branch=z9hG4bK4f81.97f17905fe7afced720300fea57ef462.1.cs1;i=6a FROM: Demo Five<sip:2385@mypbx.mydomain.net>;tag=29e99c29147f425f914b73512fc13cf3 TO: <sip:8882223333@mypbx.mydomain.net> CSEQ: 2 INVITE CALL-ID: 33c9034c136e57de9c1278daef7d02fb MAX-FORWARDS: 69 CONTENT-LENGTH: 575 MIN-SE: 300 SUPPORTED: timer USER-AGENT: UA CONTENT-TYPE: application/sdp ALLOW: INVITE,ACK,OPTIONS,CANCEL,BYE,NOTIFY SESSION-EXPIRES: 3600 Authorization: Digest username="2385", realm="asterisk", nonce="4f8fcced", uri="sip:8882223333@mypbx.mydomain.net", response="ec1986d94b9a508c4e9761c3c1cb80eb", algorithm=MD5 Contact: <sip:btpsh-603922bd-3db0-4@mysbc.mydomain.com:5060> 2021/02/26 12:10:16.284672 10.10.10.1:5060 -> 10.10.10.2:5060 SIP/2.0 100 Trying Via: SIP/2.0/UDP mysbc.mydomain.com:5060;branch=z9hG4bK4f81.97f17905fe7afced720300fea57ef462.1.cs1;i=6a;received=10.10.10.2;rport=5060 From: Demo Five<sip:2385@mypbx.mydomain.net>;tag=29e99c29147f425f914b73512fc13cf3 To: <sip:8882223333@mypbx.mydomain.net> Call-ID: 33c9034c136e57de9c1278daef7d02fb CSeq: 2 INVITE Server: B2B Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO, PUBLISH, MESSAGE Supported: replaces, timer, path Session-Expires: 900;refresher=uas Contact: <sip:8882223333@10.10.10.1:5060> Content-Length: 0 2021/02/26 12:10:16.745320 10.10.10.2:5060 -> 10.10.10.1:5060 INVITE sip:8882223333@mypbx.mydomain.net SIP/2.0 Via: SIP/2.0/UDP mysbc.mydomain.com:5060;branch=z9hG4bK4f81.97f17905fe7afced720300fea57ef462.1.cs1;i=6a FROM: Demo Five<sip:2385@mypbx.mydomain.net>;tag=29e99c29147f425f914b73512fc13cf3 TO: <sip:8882223333@mypbx.mydomain.net> CSEQ: 2 INVITE CALL-ID: 33c9034c136e57de9c1278daef7d02fb MAX-FORWARDS: 69 CONTENT-LENGTH: 575 MIN-SE: 300 SUPPORTED: timer USER-AGENT: UA CONTENT-TYPE: application/sdp ALLOW: INVITE,ACK,OPTIONS,CANCEL,BYE,NOTIFY SESSION-EXPIRES: 3600 Authorization: Digest username="2385", realm="asterisk", nonce="4f8fcced", uri="sip:8882223333@mypbx.mydomain.net", response="ec1986d94b9a508c4e9761c3c1cb80eb", algorithm=MD5 Contact: <sip:btpsh-603922bd-3db0-4@mysbc.mydomain.com:5060> ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0-dev4 (x86_64/linux) 5ad3bd 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 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: 5ad3bd compiled on 15:35:01 Feb 11 2021 with gcc 4.9.2 ``` * **Operating System**:  ``` Debian GNU/Linux 8 (jessie) ``` -- 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/2654

2 9

[kamailio/kamailio] core on broken config (#2599)
by sergey-safarov 02 Mar '21

02 Mar '21

### Description I have created a broken config with construction ``` if (is_request()) { } ``` When I try to check config I get the core ``` 0(66437) CRITICAL: <core> [core/cfg.y:3665]: yyerror_at(): parse error in config file proxy-media.cfg, line 18, column 5: syntax error 0(66437) CRITICAL: <core> [core/cfg.y:3665]: yyerror_at(): parse error in config file proxy-media.cfg, line 18, column 5: bad command 0(66437) CRITICAL: <core> [core/cfg.y:3662]: yyerror_at(): parse error in config file proxy-media.cfg, line 20, column 5-6: ERROR: bad config file (3 errors) (parsing code: 1) 0(66437) ERROR: <core> [core/ppcfg.c:243]: pp_ifdef_level_error(): different number of preprocessor directives: 1 more #!if[n]def as #!endif 0(66437) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized Program received signal SIGSEGV, Segmentation fault. 0x00007fffee8589ca in BN_clear_free () from /lib64/libcrypto.so.1.1 Missing separate debuginfos, use: yum debuginfo-install brotli-1.0.6-2.el8.x86_64 cyrus-sasl-lib-2.1.27-5.el8.x86_64 hiredis-0.13.3-13.el8.x86_64 jansson-2.11-3.el8.x86_64 keyutils-libs-1.5.10-6.el8.x86_64 krb5-libs-1.18.2-5.el8.x86_64 libcom_err-1.45.6-1.el8.x86_64 libcurl-7.61.1-14.el8.x86_64 libidn2-2.2.0-1.el8.x86_64 libnghttp2-1.33.0-3.el8_2.1.x86_64 libpsl-0.20.2-6.el8.x86_64 libselinux-2.9-4.el8_3.x86_64 libssh-0.9.4-2.el8.x86_64 libunistring-0.9.9-3.el8.x86_64 libxcrypt-4.1.1-4.el8.x86_64 libxml2-2.9.7-8.el8.x86_64 openldap-2.4.46-15.el8.x86_64 openssl-libs-1.1.1g-11.el8.x86_64 pcre2-10.32-2.el8.x86_64 xz-libs-5.2.4-3.el8.x86_64 zlib-1.2.11-16.el8_2.x86_64 (gdb) bt full #0 0x00007fffee8589ca in BN_clear_free () from /lib64/libcrypto.so.1.1 No symbol table info available. #1 0x00007fffecec5825 in ssh_dh_finalize.part () from /lib64/libssh.so.4 No symbol table info available. #2 0x00007fffeceb6e4d in libssh_destructor () from /lib64/libssh.so.4 No symbol table info available. #3 0x00007ffff7de4386 in _dl_fini () from /lib64/ld-linux-x86-64.so.2 No symbol table info available. #4 0x00007ffff708df8c in __run_exit_handlers () from /lib64/libc.so.6 No symbol table info available. #5 0x00007ffff708e0c0 in exit () from /lib64/libc.so.6 No symbol table info available. #6 0x00007ffff70777ba in __libc_start_main () from /lib64/libc.so.6 No symbol table info available. #7 0x000000000041c39e in _start () No symbol table info available. (gdb) ``` On host installed ``` [root@bcf-a0 config]# rpm -qf /lib64/libcrypto.so.1.1 openssl-libs-1.1.1g-11.el8.x86_64 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@bcf-a0 config]# kamailio -v version: kamailio 5.5.0-dev3 (x86_64/linux) aff06f 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: aff06f compiled on 04:01:30 Jan 7 2021 with gcc 8.3.1 ``` * **Operating System**: ``` [root@host ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" ``` -- 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/2599

3 18

git:master:90093efc: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 02 Mar '21

02 Mar '21

Module: kamailio Branch: master Commit: 90093efc5975bd9afbabaef60fbf618a9167fc87 URL: https://github.com/kamailio/kamailio/commit/90093efc5975bd9afbabaef60fbf618… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-02T09:16:13+01:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/90093efc5975bd9afbabaef60fbf618… Patch: https://github.com/kamailio/kamailio/commit/90093efc5975bd9afbabaef60fbf618… --- diff --git a/src/modules/pipelimit/README b/src/modules/pipelimit/README index ebe43e1103..716d0a07e7 100644 --- a/src/modules/pipelimit/README +++ b/src/modules/pipelimit/README @@ -46,7 +46,8 @@ Daniel-Constantin Mierla 5. Functions 5.1. pl_check(name [, algorithm, limit]) - 5.2. pl_drop([ [min ], max ]) + 5.2. pl_active(name) + 5.3. pl_drop([ [min ], max ]) 6. RPC Commands @@ -76,7 +77,8 @@ Daniel-Constantin Mierla 1.14. Set clean_unused parameter 1.15. Set clean_unused parameter at runtime 1.16. pl_check usage - 1.17. pl_drop usage + 1.17. pl_active usage + 1.18. pl_drop usage Chapter 1. Admin Guide @@ -107,7 +109,8 @@ Chapter 1. Admin Guide 5. Functions 5.1. pl_check(name [, algorithm, limit]) - 5.2. pl_drop([ [min ], max ]) + 5.2. pl_active(name) + 5.3. pl_drop([ [min ], max ]) 6. RPC Commands @@ -379,7 +382,8 @@ kamcmd cfg.set_now_int pipelimit clean_unused 10 5. Functions 5.1. pl_check(name [, algorithm, limit]) - 5.2. pl_drop([ [min ], max ]) + 5.2. pl_active(name) + 5.3. pl_drop([ [min ], max ]) 5.1. pl_check(name [, algorithm, limit]) @@ -460,7 +464,22 @@ with unexpected retcode=$var(check_result)\n"); } ... -5.2. pl_drop([ [min ], max ]) +5.2. pl_active(name) + + Check the pipe 'name' was already created. Return 1 (true) if the pipe + is found, -1 (false) if the pipe is not found. + + This function can be used from ANY_ROUTE. + + Example 1.17. pl_active usage +... + if (!pl_active("one")) { + # pipe does not exist + exit; + } +... + +5.3. pl_drop([ [min ], max ]) For the current request, a "503 - Server Unavailable" reply is sent back. The reply may or may not have a "Retry-After" header. If no @@ -477,7 +496,7 @@ with unexpected retcode=$var(check_result)\n"); This function can be used from REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE. - Example 1.17. pl_drop usage + Example 1.18. pl_drop usage ... if (!pl_check("one")) { # send back a "503 - Server Unavailable"

1 0

git:master:7c2afb18: pipelimit: docs for pl_active() function
by Daniel-Constantin Mierla 02 Mar '21

02 Mar '21

Module: kamailio Branch: master Commit: 7c2afb184276ec9f5f1d896e34aad6a8a8d55039 URL: https://github.com/kamailio/kamailio/commit/7c2afb184276ec9f5f1d896e34aad6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-02T09:14:58+01:00 pipelimit: docs for pl_active() function --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7c2afb184276ec9f5f1d896e34aad6a… Patch: https://github.com/kamailio/kamailio/commit/7c2afb184276ec9f5f1d896e34aad6a… --- diff --git a/src/modules/pipelimit/doc/pipelimit_admin.xml b/src/modules/pipelimit/doc/pipelimit_admin.xml index ce470f80eb..688b19957f 100644 --- a/src/modules/pipelimit/doc/pipelimit_admin.xml +++ b/src/modules/pipelimit/doc/pipelimit_admin.xml @@ -511,6 +511,30 @@ with unexpected retcode=$var(check_result)\n"); </programlisting> </example> </section> + <section id="pipelimit.f.pl_active"> + <title> + <function moreinfo="none">pl_active(name)</function> + </title> + <para> + Check the pipe 'name' was already created. Return 1 (true) if the pipe + is found, -1 (false) if the pipe is not found. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pl_active</function> usage</title> + <programlisting format="linespecific"> +... + if (!pl_active("one")) { + # pipe does not exist + exit; + } +... +</programlisting> + </example> + </section> + <section id="pipelimit.f.pl_drop"> <title> <function moreinfo="none">pl_drop([ [min ], max ])</function>

1 0

git:master:35508d1d: pipelimit: added pl_active() - return true if pipe is active
by Daniel-Constantin Mierla 02 Mar '21

02 Mar '21

Module: kamailio Branch: master Commit: 35508d1dde810d422a6cf12631015a34a72bc039 URL: https://github.com/kamailio/kamailio/commit/35508d1dde810d422a6cf12631015a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-02T09:10:34+01:00 pipelimit: added pl_active() - return true if pipe is active --- Modified: src/modules/pipelimit/pipelimit.c Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/35508d1dde810d422a6cf12631015a3… Patch: https://github.com/kamailio/kamailio/commit/35508d1dde810d422a6cf12631015a3… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index faacd086df..d7b4f129c8 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -122,6 +122,7 @@ static ticks_t pl_timer_handle(ticks_t, struct timer_ln*, void*); static void pl_timer_exec(unsigned int ticks, void *param); static int w_pl_check(struct sip_msg*, char *, char *); static int w_pl_check3(struct sip_msg*, char *, char *, char *); +static int w_pl_active(sip_msg_t *, char *, char *); static int w_pl_drop_default(struct sip_msg*, char *, char *); static int w_pl_drop_forced(struct sip_msg*, char *, char *); static int w_pl_drop(struct sip_msg*, char *, char *); @@ -133,6 +134,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"pl_check", (cmd_function)w_pl_check3, 3, fixup_pl_check3, 0, ANY_ROUTE}, + {"pl_active", (cmd_function)w_pl_active, 1, fixup_spve_null, + 0, ANY_ROUTE}, {"pl_drop", (cmd_function)w_pl_drop_default, 0, 0, 0, REQUEST_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE|ONSEND_ROUTE}, {"pl_drop", (cmd_function)w_pl_drop_forced, 1, fixup_uint_null, @@ -729,6 +732,36 @@ static int fixup_pl_check3(void** param, int param_no) return 0; } +static int pl_active(sip_msg_t *msg, str *pipeid) +{ + pl_pipe_t *pipe = NULL; + + pipe = pl_pipe_get(pipeid, 0); + if(pipe==NULL) { + LM_ERR("pipe does not exist [%.*s]\n", pipeid->len, pipeid->s); + return -1; + } + + return 1; +} + +/** + * checking if pipe is active + */ +static int w_pl_active(sip_msg_t* msg, char *p1, char *p2) +{ + str pipeid = {0, 0}; + + if(fixup_get_svalue(msg, (gparam_p)p1, &pipeid)!=0 + || pipeid.s == 0) + { + LM_ERR("invalid pipeid parameter"); + return -1; + } + + return pl_active(msg, &pipeid); +} + static void pl_timer_refresh(void) { if(pl_load_fetch!=0) { @@ -873,6 +906,11 @@ static sr_kemi_t sr_kemi_pipelimit_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("pipelimit"), str_init("pl_active"), + SR_KEMIP_INT, pl_active, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("pipelimit"), str_init("pl_drop"), SR_KEMIP_INT, ki_pl_drop, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index 1f666b89f3..38434068b4 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -221,7 +221,7 @@ pl_pipe_t* pl_pipe_get(str *pipeid, int mode) unsigned int cellid; unsigned int idx; pl_pipe_t *it; - + if(_pl_pipes_ht==NULL) return NULL; @@ -236,7 +236,7 @@ pl_pipe_t* pl_pipe_get(str *pipeid, int mode) } while(it!=NULL && it->cellid == cellid) { - if(pipeid->len==it->name.len + if(pipeid->len==it->name.len && strncmp(pipeid->s, it->name.s, pipeid->len)==0) { if(mode==0) lock_release(&_pl_pipes_ht->slots[idx].lock);

1 0

git:master:4c6715b5: xmlrpc: fixed error assigning to str variable added by previous commit
by Daniel-Constantin Mierla 02 Mar '21

02 Mar '21

Module: kamailio Branch: master Commit: 4c6715b5e4a0938ece2937a787c6d2ed6e81a3d8 URL: https://github.com/kamailio/kamailio/commit/4c6715b5e4a0938ece2937a787c6d2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-02T08:20:12+01:00 xmlrpc: fixed error assigning to str variable added by previous commit --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4c6715b5e4a0938ece2937a787c6d2e… Patch: https://github.com/kamailio/kamailio/commit/4c6715b5e4a0938ece2937a787c6d2e… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 5e2a7466b0..266283b963 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -264,7 +264,8 @@ static str member_prefix = STR_STATIC_INIT("<member>"); static str member_suffix = STR_STATIC_INIT("</member>"); static str name_prefix = STR_STATIC_INIT("<name>"); static str name_suffix = STR_STATIC_INIT("</name>"); -static str nil_value = STR_STATIC_INIT("<nil/>"); +static str empty_value = STR_STATIC_INIT(""); +static str nil_value = STR_STATIC_INIT("<nil/>"); /** Garbage collection data structure. * @@ -1073,8 +1074,8 @@ static int print_value(struct xmlrpc_reply* res, suffix = string_suffix; body.len = strlen(body.s); } else { - prefix = ""; - suffix = ""; + prefix = empty_value; + suffix = empty_value; body = nil_value; } break; @@ -1086,8 +1087,8 @@ static int print_value(struct xmlrpc_reply* res, suffix = string_suffix; body = *sp; } else { - prefix = ""; - suffix = ""; + prefix = empty_value; + suffix = empty_value; body = nil_value; } break;

1 0

Errored: kamailio/kamailio#9913 (master - fa0d2f0)
by Travis CI 01 Mar '21

01 Mar '21

Build Update for kamailio/kamailio ------------------------------------- Build: #9913 Status: Errored Duration: 5 mins and 40 secs Commit: fa0d2f0 (master) Author: Daniel-Constantin Mierla Message: ctl: handle null char* and str* values everywhere - not all cases were covered View the changeset: https://github.com/kamailio/kamailio/compare/620194165e0c...fa0d2f05ad51 View the full build log and details: https://travis-ci.org/github/kamailio/kamailio/builds/760988145?utm_medium=… -- You can unsubscribe from build emails from the kamailio/kamailio repository going to https://travis-ci.org/account/preferences/unsubscribe?repository=3596148&ut…. Or unsubscribe from *all* email updating your settings at https://travis-ci.org/account/preferences/unsubscribe?utm_medium=notificati…. Or configure specific recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications.

1 0

git:master:fa0d2f05: ctl: handle null char* and str* values everywhere
by Daniel-Constantin Mierla 01 Mar '21

01 Mar '21

Module: kamailio Branch: master Commit: fa0d2f05ad5124f6166a0384265a827187c6c83f URL: https://github.com/kamailio/kamailio/commit/fa0d2f05ad5124f6166a0384265a827… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-01T19:14:34+01:00 ctl: handle null char* and str* values everywhere - not all cases were covered --- Modified: src/modules/ctl/binrpc_run.c Modified: src/modules/ctl/fifo_server.c --- Diff: https://github.com/kamailio/kamailio/commit/fa0d2f05ad5124f6166a0384265a827… Patch: https://github.com/kamailio/kamailio/commit/fa0d2f05ad5124f6166a0384265a827…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2021