- sr-dev - kamailio.org

git:5.4:8bd9404f: ipops: proper handling of return code for ip to buf conversion
by Daniel-Constantin Mierla 29 Mar '21

29 Mar '21

Module: kamailio Branch: 5.4 Commit: 8bd9404ff172671338a91a16aa04cbf8e22db501 URL: https://github.com/kamailio/kamailio/commit/8bd9404ff172671338a91a16aa04cbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-29T09:58:43+02:00 ipops: proper handling of return code for ip to buf conversion - reported in GH #2695 (cherry picked from commit 1d7d78c31eeab717c7013a00650d3cb07895bac8) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/8bd9404ff172671338a91a16aa04cbf… Patch: https://github.com/kamailio/kamailio/commit/8bd9404ff172671338a91a16aa04cbf… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index cb7422b988..273f232fa7 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1105,15 +1105,15 @@ static inline ip_addr_t *strtoipX(str *ips) { /* IPv6 */ if(str2ip6buf(ips, &ipb) < 0) { - return &ipb; + return NULL; } } else { /* IPv4 */ if (str2ipbuf(ips, &ipb)<0) { - return &ipb; + return NULL; } } - return NULL; + return &ipb; } static int ki_dns_sys_match_ip(sip_msg_t *msg, str *vhn, str *vip)

1 0

git:master:1d7d78c3: ipops: proper handling of return code for ip to buf conversion
by Daniel-Constantin Mierla 29 Mar '21

29 Mar '21

Module: kamailio Branch: master Commit: 1d7d78c31eeab717c7013a00650d3cb07895bac8 URL: https://github.com/kamailio/kamailio/commit/1d7d78c31eeab717c7013a00650d3cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-29T09:56:36+02:00 ipops: proper handling of return code for ip to buf conversion - reported in GH #2695 --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d7d78c31eeab717c7013a00650d3cb… Patch: https://github.com/kamailio/kamailio/commit/1d7d78c31eeab717c7013a00650d3cb… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index cb7422b988..273f232fa7 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1105,15 +1105,15 @@ static inline ip_addr_t *strtoipX(str *ips) { /* IPv6 */ if(str2ip6buf(ips, &ipb) < 0) { - return &ipb; + return NULL; } } else { /* IPv4 */ if (str2ipbuf(ips, &ipb)<0) { - return &ipb; + return NULL; } } - return NULL; + return &ipb; } static int ki_dns_sys_match_ip(sip_msg_t *msg, str *vhn, str *vip)

1 0

mohqueue warning git master
by Henning Westerholt 28 Mar '21

28 Mar '21

With gcc 9.3: CC (gcc) [M mohqueue.so] mohq_funcs.o mohq_funcs.c: In function 'send_rtp_answer': mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ | { mohq_funcs.c:2163:23: warning: missing braces around initializer [-Wmissing-braces] 2163 | fparam_t pzflag [1] = {"", FPARAM_STRING, {pflagbuf}, 0}; | ^ Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

git:master:c331e6dd: pv: use unsigned for safer non-ascii bit shifting for hexa
by Daniel-Constantin Mierla 28 Mar '21

28 Mar '21

Module: kamailio Branch: master Commit: c331e6dddb238abe5fc832ce3d3934fbe56ad2f7 URL: https://github.com/kamailio/kamailio/commit/c331e6dddb238abe5fc832ce3d3934f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-28T11:11:08+02:00 pv: use unsigned for safer non-ascii bit shifting for hexa - related to GH #2690 --- Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/c331e6dddb238abe5fc832ce3d3934f… Patch: https://github.com/kamailio/kamailio/commit/c331e6dddb238abe5fc832ce3d3934f… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5137048e10..103f9dd5ec 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -615,20 +615,22 @@ int pv_get_flag(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, (msg->flags & (1<<param->pvn.u.isname.name.n)) ? 1 : 0); } -static inline char* int_to_8hex(int val) +static inline char* int_to_8hex(int sval) { unsigned short digit; int i; static char outbuf[9]; + unsigned int uval; + uval = (unsigned int)sval; outbuf[8] = '\0'; for(i=0; i<8; i++) { - if(val!=0) + if(uval!=0) { - digit = val & 0x0f; + digit = uval & 0x0f; outbuf[7-i] = digit >= 10 ? digit + 'a' - 10 : digit + '0'; - val >>= 4; + uval >>= 4; } else outbuf[7-i] = '0'; diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index cbee7d6caa..e8d287bfe0 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -118,7 +118,7 @@ static int pdu_7bit_encode(str sin) { nleft = 1; j = 0; for(i = 0; i < sin.len; i++) { - hex = *(sin.s) >> (nleft - 1); + hex = (unsigned char)(*(sin.s)) >> (nleft - 1); fill = *(sin.s+1) << (8-nleft); hex = hex | fill; _tr_buffer[j++] = HexTbl[hex >> 4]; @@ -292,7 +292,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, j = 0; for(i=0; i<val->rs.len; i++) { - _tr_buffer[j++] = fourbits2char[val->rs.s[i] >> 4]; + _tr_buffer[j++] = fourbits2char[(unsigned char)val->rs.s[i] >> 4]; _tr_buffer[j++] = fourbits2char[val->rs.s[i] & 0xf]; } _tr_buffer[j] = '\0';

1 0

git:master:9efe1e0c: core: use unsigned for safer non-ascii bit shifting for hexa
by Daniel-Constantin Mierla 28 Mar '21

28 Mar '21

Module: kamailio Branch: master Commit: 9efe1e0c32ae43d67240d6a97306e3cff61c3c55 URL: https://github.com/kamailio/kamailio/commit/9efe1e0c32ae43d67240d6a97306e3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-28T11:11:08+02:00 core: use unsigned for safer non-ascii bit shifting for hexa --- Modified: src/core/basex.c Modified: src/core/strutils.c --- Diff: https://github.com/kamailio/kamailio/commit/9efe1e0c32ae43d67240d6a97306e3c… Patch: https://github.com/kamailio/kamailio/commit/9efe1e0c32ae43d67240d6a97306e3c… --- diff --git a/src/core/basex.c b/src/core/basex.c index 45abcac028..38fb08d91e 100644 --- a/src/core/basex.c +++ b/src/core/basex.c @@ -434,7 +434,7 @@ int base64url_enc(char *in, int ilen, char *out, int osize) int i; int r; char *p; - int block; + unsigned int block; int olen; olen = (((ilen+2)/3)<<2); @@ -465,7 +465,7 @@ int base64url_enc(char *in, int ilen, char *out, int osize) int base64url_dec(char *in, int ilen, char *out, int osize) { int n; - int block; + unsigned int block; int idx; int i; int j; @@ -493,7 +493,7 @@ int base64url_dec(char *in, int ilen, char *out, int osize) for(i=0, idx=0; i<end; idx+=3) { block = 0; for(j=0; j<4 && i<end ; j++) { - c = _ksr_b64url_decmap[(int)in[i++]]; + c = _ksr_b64url_decmap[(unsigned char)in[i++]]; if(c<0) { LM_ERR("invalid input string\"%.*s\"\n", ilen, in); return -1; diff --git a/src/core/strutils.c b/src/core/strutils.c index 75d5b1ec10..ff394e5470 100644 --- a/src/core/strutils.c +++ b/src/core/strutils.c @@ -270,7 +270,7 @@ int escape_user(str *sin, str *sout) break; default: *at++ = '%'; - x = (*p) >> 4; + x = (unsigned char)(*p) >> 4; if (x < 10) { *at++ = x + '0'; @@ -350,7 +350,7 @@ int escape_param(str *sin, str *sout) default: *at++ = '%'; - x = (*p) >> 4; + x = (unsigned char)(*p) >> 4; if (x < 10) { *at++ = x + '0'; @@ -792,7 +792,8 @@ int urlencode(str *sin, str *sout) if (isalnum(*p) || *p == '-' || *p == '_' || *p == '.' || *p == '~') *at++ = *p; else - *at++ = '%', *at++ = char_to_hex(*p >> 4), *at++ = char_to_hex(*p & 15); + *at++ = '%', *at++ = char_to_hex((unsigned char)(*p) >> 4), + *at++ = char_to_hex(*p & 15); p++; }

1 0

[kamailio/kamailio] DMQ memory leak with dmq_bcast_message function (#2600)
by jklingenmeyer 26 Mar '21

26 Mar '21

### Description We noticed a PKG memory leak when using DMQ module's function _dmq_bcast_message_ . ### Troubleshooting #### Reproduction Issue can be reproduced with configuration below. * 3 Kamailio nodes each one listening on dedicated port 5070 for DMQ on their private IP address. * A dns name _[KAMAILIO_DNS]_ resolving these 3 nodes: ``` # dig +short A [KAMAILIO_DNS] 10.234.97.169 10.234.97.170 10.234.92.126 ``` DMQ module configured as below (example for node 1) ``` loadmodule "dmq.so" ... modparam("dmq", "server_address", "sip:10.234.97.169:5070") modparam("dmq", "notification_address", "sip:[KAMAILIO_DNS]:5070") modparam("dmq", "ping_interval", 10) modparam("dmq", "multi_notify", 1) ``` Each time an INVITE comes in, we use function below to broadcast custom message to all of the nodes: ``` ... if(is_method("INVITE")) { dmq_bcast_message("invitenotification", "invite received", "text/plain"); } ... ``` This custom message is handled as below: ``` request_route { ... if(is_method("KDMQ")) { if($Rp == 5070) route(DMQHANDLE); else drop; } ... } ... route[DMQHANDLE] { if($tU == "invitenotification") { # Doing some additional stuff here, but not the cause of the leak send_reply("200", "OK"); } else { dmq_handle_message(); } } ``` Using **sipp** to send lots of messages, we can easily notice the free PKG memory decreasing over time (using `kamcmd pkg.stats`) #### Debugging Data Processes impacted by the leak are the ones processing SIP messages. In case of TCP, it is one of the tcp receivers. When doing a dump of such processes with command below: ``` kamcmd cfg.set_now_int core mem_dump_pkg [PID] ``` Results are full of records like these ones: ``` ALERT: qm_status: alloc'd from core: core/parser/parse_from.c: parse_from_header(63) ALERT: qm_status: alloc'd from core: core/parser/parse_addr_spec.c: parse_to_param(285) ``` We are sure that the leak is generated by this DMQ broadcast function: we isolated it and noticed no leaks when removing it from a basic script configuration. We tried different configurations: * disabling multi_notify => memory leak still present * using an IP address instead of the DNS name => memory leak still present Valgrind did not help us to find out more precisely where the issue in the code could be located. ### Possible Solutions Would a _free_ of _msg->from->parsed_ be missing somewhere in DMQ code? Behavior looks very similar to https://github.com/kamailio/kamailio/pull/59 ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.7 (x86_64/linux) c16b3f-dirty flags: , EXTRA_DEBUGUSE_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, TIMER_DEBUG, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ``` * **Operating System**: ``` Debian 9.13 under docker Linux 4.9.0-9-amd64 ``` -- 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/2600

2 4

[kamailio/kamailio] Kamailio 5.2 / ims_registrar_scscf's NOTIFY message on registration (#2692)
by ErhanOnur 26 Mar '21

26 Mar '21

Hi When I register to my IMS core (Kamailio version 5.2), ims_registrar_scscf modul sends notification with XML body showing all contacts with expires "0". I noticed that , in ims_registrar_scscf module, the notify_subscribers function is as shown below: ``` int notify_subscribers(impurecord_t* impurecord, str *explit_dereg_contact, int num_explit_dereg_contact) { event_reg(0, impurecord, IMS_REGISTRAR_CONTACT_UNREGISTERED, 0, 0, explit_dereg_contact, num_explit_dereg_contact); return 0; } ``` IMS_REGISTRAR_CONTACT_UNREGISTERED parameter is hardcoded. I noticed that in upper version of Kamailio this changed like that: ``` int notify_subscribers(impurecord_t* impurecord, ucontact_t* contact, str *explit_dereg_contact, int num_explit_dereg_contact, int event_type) { event_reg(0, impurecord, contact, event_type, 0, 0, 0, explit_dereg_contact, num_explit_dereg_contact); return 0; } ``` Also noticed that in upper version of Kamailio notify_subscribers is only called on de-registration. But in version 5.2 it is called on registration and re-registration also. (This leads strange cases) Could you please advise on this issue? Best regards Erhan ### 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` ``` [stack@ims-test2 ~]$ /usr/local/sbin/kamailio -v version: kamailio 5.2.0 (x86_64/linux) 40c16b ``` * **Operating System**:  ``` [stack@ims-test2 ~]$ uname -a Linux ims-test2.novalocal 3.10.0-1062.1.1.el7.x86_64 #1 SMP Fri Sep 13 22:55:44 UTC 2019 x86_64 x86_64 x86_64 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/2692

2 2

git:master:ec3f98b2: modules: readme files regenerated - stirshaken ... [skip ci]
by Kamailio Dev 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: ec3f98b2b9e2a44b57f0b60401d2f037d3068e83 URL: https://github.com/kamailio/kamailio/commit/ec3f98b2b9e2a44b57f0b60401d2f03… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-26T15:01:13+01:00 modules: readme files regenerated - stirshaken ... [skip ci] --- Modified: src/modules/stirshaken/README --- Diff: https://github.com/kamailio/kamailio/commit/ec3f98b2b9e2a44b57f0b60401d2f03… Patch: https://github.com/kamailio/kamailio/commit/ec3f98b2b9e2a44b57f0b60401d2f03… --- diff --git a/src/modules/stirshaken/README b/src/modules/stirshaken/README index f4ab54e6cb..3b280ff289 100644 --- a/src/modules/stirshaken/README +++ b/src/modules/stirshaken/README @@ -105,10 +105,11 @@ Chapter 1. Admin Guide 1. Overview - The module implements secure SIP identity specifications - STIR (Secure - Telephony Identity Revisited) and SHAKEN (Signature-based Handling of - Asserted information using toKENs) IETF extensions for SIP (RFC8224, - RFC8588). + This module implements STIR (Secure Telephony Identity Revisited) and + SHAKEN (Signature-based Handling of Asserted information using toKENs) + (RFC8224, RFC8588), with X509 certificate path check (ATIS + "Signature-based Handling of Asserted information using toKENs + (SHAKEN)", RFC5280 "6. Certification Path Validation"). stirshaken module exports the functions to check and to generate PASSporT, wrapped into SIP Identity header. For call authentication two @@ -179,7 +180,7 @@ modparam("stirshaken", "as_default_key", "/path/to/key") meaning for calls to stirshaken_check_identity_with_key(key) and stirshaken_check_identity_with_cert(cert). - Default value is 0, (turned off). + Default value is 1, (turned on). Example 1.2. Set vs_verify_x509_cert_path parameter ...

1 0

git:master:3053b87a: stirshaken: Update docs [skip ci]
by Piotr Gregor 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 3053b87a5c023a89be33a0fad924e31f41d4bcda URL: https://github.com/kamailio/kamailio/commit/3053b87a5c023a89be33a0fad924e31… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-26T13:59:48Z stirshaken: Update docs [skip ci] Update docs about X509 cerrtificate path verification turned on by default. Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Modified: src/modules/stirshaken/doc/stirshaken_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3053b87a5c023a89be33a0fad924e31… Patch: https://github.com/kamailio/kamailio/commit/3053b87a5c023a89be33a0fad924e31… --- diff --git a/src/modules/stirshaken/doc/stirshaken_admin.xml b/src/modules/stirshaken/doc/stirshaken_admin.xml index 9cf8fada82..7514523ff6 100644 --- a/src/modules/stirshaken/doc/stirshaken_admin.xml +++ b/src/modules/stirshaken/doc/stirshaken_admin.xml @@ -16,10 +16,7 @@ <section> <title>Overview</title> <para> - The module implements secure SIP identity specifications - STIR - (Secure Telephony Identity Revisited) and SHAKEN - (Signature-based Handling of Asserted information using toKENs) - IETF extensions for SIP (RFC8224, RFC8588). + This module implements STIR (Secure Telephony Identity Revisited) and SHAKEN (Signature-based Handling of Asserted information using toKENs) (RFC8224, RFC8588), with X509 certificate path check (ATIS "Signature-based Handling of Asserted information using toKENs (SHAKEN)", RFC5280 "6. Certification Path Validation"). </para> <para> stirshaken module exports the functions to check and to generate PASSporT, wrapped into SIP Identity header. @@ -93,7 +90,7 @@ modparam("stirshaken", "as_default_key", "/path/to/key") </para> <para> <emphasis> - Default value is 0, (turned off). + Default value is 1, (turned on). </emphasis> </para> <example>

1 0

git:master:0793fb05: lwsc: do not set timeout fileds lws_context_creation_info
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 0793fb05b61e517a3353c436e8fb928c4730e573 URL: https://github.com/kamailio/kamailio/commit/0793fb05b61e517a3353c436e8fb928… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T14:51:46+01:00 lwsc: do not set timeout fileds lws_context_creation_info - needs to sort out which versions have them --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0793fb05b61e517a3353c436e8fb928… Patch: https://github.com/kamailio/kamailio/commit/0793fb05b61e517a3353c436e8fb928… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index a30179c13b..17eb0ca30a 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -531,11 +531,6 @@ static lwsc_endpoint_t* lwsc_get_endpoint(str *wsurl, str *wsproto) ep->crtinfo.uid = -1; #if LWS_LIBRARY_VERSION_MAJOR >= 3 ep->crtinfo.ws_ping_pong_interval = 5; /*secs*/ -#endif -#if LWS_LIBRARY_VERSION_MAJOR >= 4 - /* apparently only in newer versions of libwebsockets */ - ep->crtinfo.timeout_secs = _lwsc_timeout_send; - ep->crtinfo.connect_timeout_secs = _lwsc_timeout_connect; #endif /* 1 internal and 1 (+ 1 http2 nwsi) */ ep->crtinfo.fd_limit_per_thread = 1 + 1 + 1;

1 0

git:master:054febc0: stirshaken: Turn on X509 cert path check as default
by Piotr Gregor 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 054febc016f3fa089c9dc84bcb7581c04213eeed URL: https://github.com/kamailio/kamailio/commit/054febc016f3fa089c9dc84bcb7581c… Author: Piotr Gregor <piotr(a)signalwire.com> Committer: Piotr Gregor <piotr(a)signalwire.com> Date: 2021-03-26T13:25:29Z stirshaken: Turn on X509 cert path check as default --- Modified: src/modules/stirshaken/stirshaken_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/054febc016f3fa089c9dc84bcb7581c… Patch: https://github.com/kamailio/kamailio/commit/054febc016f3fa089c9dc84bcb7581c… --- diff --git a/src/modules/stirshaken/stirshaken_mod.c b/src/modules/stirshaken/stirshaken_mod.c index a98cb3a4e3..88ec8812ab 100644 --- a/src/modules/stirshaken/stirshaken_mod.c +++ b/src/modules/stirshaken/stirshaken_mod.c @@ -40,7 +40,7 @@ MODULE_VERSION static str stirshaken_as_default_key = str_init(""); // Verification service -static int stirshaken_vs_verify_x509_cert_path = 0; +static int stirshaken_vs_verify_x509_cert_path = 1; static str stirshaken_vs_ca_dir = str_init(""); static str stirshaken_vs_crl_dir = str_init(""); static int stirshaken_vs_identity_expire_s = 60;

1 0

git:master:20ff5e12: modules: readme files regenerated - db_oracle ... [skip ci]
by Kamailio Dev 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 20ff5e129315acd7a45513279c13800950ea96f3 URL: https://github.com/kamailio/kamailio/commit/20ff5e129315acd7a45513279c13800… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-03-26T13:46:37+01:00 modules: readme files regenerated - db_oracle ... [skip ci] --- Modified: src/modules/db_oracle/README Modified: src/modules/mediaproxy/README Modified: src/modules/pdt/README Modified: src/modules/xmpp/README --- Diff: https://github.com/kamailio/kamailio/commit/20ff5e129315acd7a45513279c13800… Patch: https://github.com/kamailio/kamailio/commit/20ff5e129315acd7a45513279c13800… --- diff --git a/src/modules/db_oracle/README b/src/modules/db_oracle/README index e4f6f7a139..7a45a61405 100644 --- a/src/modules/db_oracle/README +++ b/src/modules/db_oracle/README @@ -38,7 +38,7 @@ Iouri Kharon 4. Functions 5. Installation - 6. Utility openser_orasel + 6. Utility kamailio_orasel List of Examples @@ -63,7 +63,7 @@ Chapter 1. User's Guide 4. Functions 5. Installation - 6. Utility openser_orasel + 6. Utility kamailio_orasel 1. Overview @@ -143,14 +143,14 @@ modparam("db_oracle", "reconnect", 0.5) * - from command line use: 'make all include_modules="db_oracle"; make install include_modules="db_oracle"'. -6. Utility openser_orasel +6. Utility kamailio_orasel For working with kamctl script, should be able to print the 'query' results to the terminal in a user-readable form. The standard command-line Oracle client (sqlplus) is not quite suitable for this, as it cannot align row width to real (received) data's (it always prints a cell width as described in the db scheme). This problem has been solved - by inclusion the utility openser_oracle, which formats printing + by inclusion the utility kamailio_oracle, which formats printing approximately in the same way as the 'mysql' client utility. In addition, this utility known about the "agreements and types" in DB that are used in Kamailio for the work with Oracle and formats printing diff --git a/src/modules/mediaproxy/README b/src/modules/mediaproxy/README index 5e5aa0ae48..210471b91b 100644 --- a/src/modules/mediaproxy/README +++ b/src/modules/mediaproxy/README @@ -173,7 +173,7 @@ Chapter 1. Admin Guide 5.1. disable (int) Boolean flag that specifies if mediaproxy should be disabled. This is - useful when you want to use the same openser configuration in two + useful when you want to use the same kamailio configuration in two different context, one using mediaproxy, the other not. In the case mediaproxy is disabled, calls to its functions will have no effect, allowing you to use the same configuration without changes. diff --git a/src/modules/pdt/README b/src/modules/pdt/README index dff0f75236..38a9cfed82 100644 --- a/src/modules/pdt/README +++ b/src/modules/pdt/README @@ -52,8 +52,6 @@ Elena-Ramona Modroiu 5.1. pdt.list 5.2. pdt.reload - 6. Installation and Running - List of Examples 1.1. prefix-domain translation @@ -103,8 +101,6 @@ Chapter 1. Admin Guide 5.1. pdt.list 5.2. pdt.reload - 6. Installation and Running - 1. Overview This module translates a numerical prefix into a domain and updates @@ -431,8 +427,3 @@ kamcmd pdt.list kamailio.org 123 ... kamcmd pdt.reload ... - -6. Installation and Running - - Example shell scripts for MI FIFO commands are placed in './doc/' - (pdt_fifo_add.sh, pdt_fifo_delete.sh, pdt_fifo_list.sh). diff --git a/src/modules/xmpp/README b/src/modules/xmpp/README index 28c605ba49..d8886e08a0 100644 --- a/src/modules/xmpp/README +++ b/src/modules/xmpp/README @@ -391,13 +391,12 @@ alias=sip-xmpp.kamailio.org # ------------------ module loading ---------------------------------- -mpath="/usr/local/lib/kamailio/modules/" loadmodule "sl.so" loadmodule "tm.so" loadmodule "rr.so" loadmodule "maxfwd.so" loadmodule "textops.so" -loadmodule "mi_fifo.so" +loadmodule "jsonrpcs.so" # XMPP @@ -413,10 +412,6 @@ modparam("xmpp", "backend", "server") # ----------------- setting module-specific parameters --------------- -# -- mi_fifo params -- - -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo_xmpp") - # -- usrloc params -- # -- rr params --

1 0

git:master:4bf6acf3: mediaproxy: docs - updated project name
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 4bf6acf34730969048376ded5b6bd90b6abfaa04 URL: https://github.com/kamailio/kamailio/commit/4bf6acf34730969048376ded5b6bd90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:40:00+01:00 mediaproxy: docs - updated project name --- Modified: src/modules/mediaproxy/doc/mediaproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4bf6acf34730969048376ded5b6bd90… Patch: https://github.com/kamailio/kamailio/commit/4bf6acf34730969048376ded5b6bd90… --- diff --git a/src/modules/mediaproxy/doc/mediaproxy_admin.xml b/src/modules/mediaproxy/doc/mediaproxy_admin.xml index 8eac1e90e8..d89207b33a 100644 --- a/src/modules/mediaproxy/doc/mediaproxy_admin.xml +++ b/src/modules/mediaproxy/doc/mediaproxy_admin.xml @@ -152,7 +152,7 @@ <title><varname>disable</varname> (int)</title> <para> Boolean flag that specifies if mediaproxy should be disabled. This - is useful when you want to use the same openser configuration in + is useful when you want to use the same kamailio configuration in two different context, one using mediaproxy, the other not. In the case mediaproxy is disabled, calls to its functions will have no effect, allowing you to use the same configuration without changes.

1 0

git:master:40a2c2c6: cnxcc: removed old project name from sample configuration
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 40a2c2c6cfaecff34f7d4c40dfafbc3af9cab830 URL: https://github.com/kamailio/kamailio/commit/40a2c2c6cfaecff34f7d4c40dfafbc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:37:30+01:00 cnxcc: removed old project name from sample configuration --- Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg --- Diff: https://github.com/kamailio/kamailio/commit/40a2c2c6cfaecff34f7d4c40dfafbc3… Patch: https://github.com/kamailio/kamailio/commit/40a2c2c6cfaecff34f7d4c40dfafbc3… --- diff --git a/src/modules/cnxcc/example/kamailio-cnxcc.cfg b/src/modules/cnxcc/example/kamailio-cnxcc.cfg index de8ed86263..0063b47b4c 100644 --- a/src/modules/cnxcc/example/kamailio-cnxcc.cfg +++ b/src/modules/cnxcc/example/kamailio-cnxcc.cfg @@ -5,7 +5,7 @@ ##!define CNXCC_CHANNEL # -# Kamailio (OpenSER) SIP Server v3.2 - default configuration script +# Kamailio SIP Server v3.2 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # @@ -16,10 +16,10 @@ # # Several features can be enabled using '#!define WITH_FEATURE' directives: # -# *** To run in debug mode: +# *** To run in debug mode: # - define WITH_DEBUG # -# *** To enable mysql: +# *** To enable mysql: # - define WITH_MYSQL # # *** To enable authentication execute:

1 0

git:master:9c4e3fc3: db_berkeley: km_doc - updated project name
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 9c4e3fc30c63095a71e42bb480fcf26699ee8ecc URL: https://github.com/kamailio/kamailio/commit/9c4e3fc30c63095a71e42bb480fcf26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:39:16+01:00 db_berkeley: km_doc - updated project name --- Modified: src/modules/db_berkeley/km_doc/db_berkeley_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c4e3fc30c63095a71e42bb480fcf26… Patch: https://github.com/kamailio/kamailio/commit/9c4e3fc30c63095a71e42bb480fcf26… --- diff --git a/src/modules/db_berkeley/km_doc/db_berkeley_admin.xml b/src/modules/db_berkeley/km_doc/db_berkeley_admin.xml index 7d7a9bad4e..bd74a1eee2 100644 --- a/src/modules/db_berkeley/km_doc/db_berkeley_admin.xml +++ b/src/modules/db_berkeley/km_doc/db_berkeley_admin.xml @@ -9,9 +9,9 @@ ]> <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -35,7 +35,7 @@ </itemizedlist> </para> </section> - + <section> <title>External Libraries or Applications</title> <para> @@ -199,7 +199,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600) Installation of Kamailio is performed by simply running make install as root user of the main directory. This will install the binaries in /usr/local/sbin/. - If this was successful, openser control engine files should now + If this was successful, kamailio control engine files should now be installed as /usr/local/sbin/kamdbctl. </para> @@ -212,7 +212,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600) <para> Edit &ctltool;rc - There are two parameters in this file that should be - configured before openserctrdb script can work properly: DBENGINE and DB_PATH. + configured before kamdbctl script can work properly: DBENGINE and DB_PATH. Edit file: '/usr/local/etc/kamailio/&ctltool;rc' </para> <programlisting format="linespecific"> @@ -228,7 +228,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600) The DB files are initially seeded with necessary meta-data. This is a good time to review the meta-data section details, before making modifications to your tables dbschema. - By default, the files are installed in '/usr/local/share/kamailio/db_berkeley/openser' + By default, the files are installed in '/usr/local/share/kamailio/db_berkeley/kamailio' By default these tables are created Read/Write and without any journalling as shown. These settings can be modified on a per table basis. Note: If you plan to use kambdb_recover, you must change the LOGFLAGS.

1 0

git:master:b0c51f57: permissions: updated project anem in same register deny file
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: b0c51f5768afe7869d7aadfc05bee40863975b43 URL: https://github.com/kamailio/kamailio/commit/b0c51f5768afe7869d7aadfc05bee40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:36:36+01:00 permissions: updated project anem in same register deny file --- Modified: src/modules/permissions/config/register.deny --- Diff: https://github.com/kamailio/kamailio/commit/b0c51f5768afe7869d7aadfc05bee40… Patch: https://github.com/kamailio/kamailio/commit/b0c51f5768afe7869d7aadfc05bee40… --- diff --git a/src/modules/permissions/config/register.deny b/src/modules/permissions/config/register.deny index 920ea482f6..be20d1563e 100644 --- a/src/modules/permissions/config/register.deny +++ b/src/modules/permissions/config/register.deny @@ -1,6 +1,4 @@ # -# $Id$ -# # Suppose that we have a PSTN gateway with IP address 1.2.3.4 # We should prevent REGISTER messages that contain that IP # address in Contact header field because that can cause serious @@ -22,5 +20,5 @@ ALL : "^sip:.*1\.2\.3\.4$" # domains that point to any IP. To prevent this the usage of hostnames # and domains in the Contact header field should be avoided. # A better solution to this problem is the usage of the dst_blocklist -# feature in the openser core. All "critical" IPs should be added to +# feature in the kamailio core. All "critical" IPs should be added to # this list.

1 0

git:master:f5d38980: pdt: replaced mi_fifo with jsonrpcs in example
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: f5d38980841d7ae6ea5eecaa9dba41f907171ae2 URL: https://github.com/kamailio/kamailio/commit/f5d38980841d7ae6ea5eecaa9dba41f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:34:21+01:00 pdt: replaced mi_fifo with jsonrpcs in example - documentation updates --- Modified: src/modules/pdt/doc/pdt.cfg Modified: src/modules/pdt/doc/pdt_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f5d38980841d7ae6ea5eecaa9dba41f… Patch: https://github.com/kamailio/kamailio/commit/f5d38980841d7ae6ea5eecaa9dba41f…

1 0

git:master:7bd66b68: pdt: removed obsoleted mi fifo shell script examples
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 7bd66b68f8640a220662b4ce6438ad524a0d4741 URL: https://github.com/kamailio/kamailio/commit/7bd66b68f8640a220662b4ce6438ad5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:35:15+01:00 pdt: removed obsoleted mi fifo shell script examples --- Removed: src/modules/pdt/doc/pdt_fifo_add.sh Removed: src/modules/pdt/doc/pdt_fifo_delete.sh Removed: src/modules/pdt/doc/pdt_fifo_list.sh --- Diff: https://github.com/kamailio/kamailio/commit/7bd66b68f8640a220662b4ce6438ad5… Patch: https://github.com/kamailio/kamailio/commit/7bd66b68f8640a220662b4ce6438ad5… --- diff --git a/src/modules/pdt/doc/pdt_fifo_add.sh b/src/modules/pdt/doc/pdt_fifo_add.sh deleted file mode 100644 index 525ef7e376..0000000000 --- a/src/modules/pdt/doc/pdt_fifo_add.sh +++ /dev/null @@ -1,8 +0,0 @@ -cat /tmp/openser_reply & -cat > /tmp/openser_fifo << EOF -:pdt_add:openser_reply -localhost -*57 -127.com - -EOF diff --git a/src/modules/pdt/doc/pdt_fifo_delete.sh b/src/modules/pdt/doc/pdt_fifo_delete.sh deleted file mode 100644 index 73d2b7b9aa..0000000000 --- a/src/modules/pdt/doc/pdt_fifo_delete.sh +++ /dev/null @@ -1,7 +0,0 @@ -cat /tmp/openser_reply & -cat > /tmp/openser_fifo << EOF -:pdt_delete:openser_reply -localhost -127.com - -EOF diff --git a/src/modules/pdt/doc/pdt_fifo_list.sh b/src/modules/pdt/doc/pdt_fifo_list.sh deleted file mode 100644 index 19b894a38e..0000000000 --- a/src/modules/pdt/doc/pdt_fifo_list.sh +++ /dev/null @@ -1,8 +0,0 @@ -cat /tmp/openser_reply & -cat > /tmp/openser_fifo << EOF -:pdt_list:openser_reply -local -. -. - -EOF

1 0

git:master:e6d8b844: xmpp: renamed example config to use project name
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: e6d8b844b9b3b712803dec6a03b74c902fd5aa6f URL: https://github.com/kamailio/kamailio/commit/e6d8b844b9b3b712803dec6a03b74c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:26:24+01:00 xmpp: renamed example config to use project name --- Added: src/modules/xmpp/doc/kamailio-xmpp.cfg Removed: src/modules/xmpp/doc/openser-xmpp.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e6d8b844b9b3b712803dec6a03b74c9… Patch: https://github.com/kamailio/kamailio/commit/e6d8b844b9b3b712803dec6a03b74c9… --- diff --git a/src/modules/xmpp/doc/openser-xmpp.cfg b/src/modules/xmpp/doc/kamailio-xmpp.cfg similarity index 100% rename from src/modules/xmpp/doc/openser-xmpp.cfg rename to src/modules/xmpp/doc/kamailio-xmpp.cfg

1 0

git:master:39e57d38: xmpp: replaced mi_fifo with jsonrpcs in example
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 39e57d38b02c08b42567708a6d65f36a83144caf URL: https://github.com/kamailio/kamailio/commit/39e57d38b02c08b42567708a6d65f36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:28:59+01:00 xmpp: replaced mi_fifo with jsonrpcs in example - minor docs updates --- Modified: src/modules/xmpp/doc/kamailio-xmpp.cfg Modified: src/modules/xmpp/doc/xmpp_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/39e57d38b02c08b42567708a6d65f36… Patch: https://github.com/kamailio/kamailio/commit/39e57d38b02c08b42567708a6d65f36… --- diff --git a/src/modules/xmpp/doc/kamailio-xmpp.cfg b/src/modules/xmpp/doc/kamailio-xmpp.cfg index 106aca2eae..a5bcf8ed54 100644 --- a/src/modules/xmpp/doc/kamailio-xmpp.cfg +++ b/src/modules/xmpp/doc/kamailio-xmpp.cfg @@ -13,7 +13,7 @@ debug=9 # debug level (cmd line: -dddddddddd) fork=no log_stderror=yes # (cmd line: -E) -/* Uncomment these lines to enter debugging mode +/* Uncomment these lines to enter debugging mode fork=no log_stderror=yes */ @@ -28,13 +28,12 @@ alias=sip-xmpp.kamailio.org # ------------------ module loading ---------------------------------- -mpath="/usr/local/lib/kamailio/modules/" loadmodule "sl.so" loadmodule "tm.so" loadmodule "rr.so" loadmodule "maxfwd.so" loadmodule "textops.so" -loadmodule "mi_fifo.so" +loadmodule "jsonrpcs.so" # XMPP @@ -50,10 +49,6 @@ modparam("xmpp", "backend", "server") # ----------------- setting module-specific parameters --------------- -# -- mi_fifo params -- - -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo_xmpp") - # -- usrloc params -- # -- rr params -- diff --git a/src/modules/xmpp/doc/xmpp_admin.xml b/src/modules/xmpp/doc/xmpp_admin.xml index 129acbc423..c454efe2a9 100644 --- a/src/modules/xmpp/doc/xmpp_admin.xml +++ b/src/modules/xmpp/doc/xmpp_admin.xml @@ -10,9 +10,9 @@  <chapter xmlns:xi="http://www.w3.org/2001/XInclude"> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -416,7 +416,7 @@ Converts SIP messages to XMPP(jabber) messages, in order to be relayed to a XMPP(jabber) client. </para> - + <example> <title><function>xmpp_send_message()</function> usage</title> <programlisting format="linespecific"> @@ -438,7 +438,7 @@ xmpp_send_message(); </para> <programlisting format="linespecific"> .... -<xi:include href="openser-xmpp.cfg" parse="text"/> +<xi:include href="kamailio-xmpp.cfg" parse="text"/> .... </programlisting>

1 0

git:master:d2a1df24: db_oracle: docs - tool name is kamailio_orasel
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: d2a1df24b8042de7802bbf466441cda95b7e64f2 URL: https://github.com/kamailio/kamailio/commit/d2a1df24b8042de7802bbf466441cda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:25:15+01:00 db_oracle: docs - tool name is kamailio_orasel --- Modified: src/modules/db_oracle/doc/db_oracle_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d2a1df24b8042de7802bbf466441cda… Patch: https://github.com/kamailio/kamailio/commit/d2a1df24b8042de7802bbf466441cda… --- diff --git a/src/modules/db_oracle/doc/db_oracle_admin.xml b/src/modules/db_oracle/doc/db_oracle_admin.xml index e5e9842fa1..05e6aaccf2 100644 --- a/src/modules/db_oracle/doc/db_oracle_admin.xml +++ b/src/modules/db_oracle/doc/db_oracle_admin.xml @@ -143,16 +143,16 @@ modparam("db_oracle", "reconnect", 0.5) </itemizedlist> </section> <section> - <title>Utility openser_orasel</title> + <title>Utility kamailio_orasel</title> <para> - For working with &ctltool; script, should be able to print the 'query' - results to the terminal in a user-readable form. The standard command-line - Oracle client (sqlplus) is not quite suitable for this, as it cannot align - row width to real (received) data's (it always prints a cell width as - described in the db scheme). This problem has been solved by inclusion the - utility openser_oracle, which formats printing approximately in the same - way as the 'mysql' client utility. In addition, this utility known about - the "agreements and types" in DB that are used in &kamailio; for the work + For working with &ctltool; script, should be able to print the 'query' + results to the terminal in a user-readable form. The standard command-line + Oracle client (sqlplus) is not quite suitable for this, as it cannot align + row width to real (received) data's (it always prints a cell width as + described in the db scheme). This problem has been solved by inclusion the + utility kamailio_oracle, which formats printing approximately in the same + way as the 'mysql' client utility. In addition, this utility known about + the "agreements and types" in DB that are used in &kamailio; for the work with Oracle and formats printing taking these into account. </para> </section>

1 0

git:master:5c48d437: acc_diameter: init variables for safer cleanup
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 5c48d437935e971482c9bbf41f067d120911e2c8 URL: https://github.com/kamailio/kamailio/commit/5c48d437935e971482c9bbf41f067d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T13:19:03+01:00 acc_diameter: init variables for safer cleanup --- Modified: src/modules/acc_diameter/diam_message.c --- Diff: https://github.com/kamailio/kamailio/commit/5c48d437935e971482c9bbf41f067d1… Patch: https://github.com/kamailio/kamailio/commit/5c48d437935e971482c9bbf41f067d1… --- diff --git a/src/modules/acc_diameter/diam_message.c b/src/modules/acc_diameter/diam_message.c index 7388f44c93..f4f65e7019 100644 --- a/src/modules/acc_diameter/diam_message.c +++ b/src/modules/acc_diameter/diam_message.c @@ -188,11 +188,11 @@ AAAReturnCode AAASetMessageResultCode( AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, int attach_buf) { - unsigned char *ptr; - AAAMessage *msg; + unsigned char *ptr = NULL; + AAAMessage *msg = NULL; unsigned char version; unsigned int msg_len; - AAA_AVP *avp; + AAA_AVP *avp = NULL; unsigned int avp_code; unsigned char avp_flags; unsigned int avp_len;

1 0

Dispatcher group settings
by Olle E. Johansson 26 Mar '21

26 Mar '21

Hello! In many cases, I missed the ability to set attributes to a dispatcher group. Right now I’m in need to disable/enable ping checks per group. We could also use that to have alphanumeric aliases so I could use ds_select_dst(”STUPIDPBXS”, ”6”) If anyone else has looked into this we can join forces, otherwise I’ll make a proposal and some code for it. If there are objections from a beauty, syntax, architecture or just alignment of the stars reason - any reason that is - please let me hear it now before I start running against a wall just to find out it’s not doable or simply the wrong thing to do :-) Cheers, /O

1 0

git:master:1856ed85: lwsc: LWS_CALLBACK_EVENT_WAIT_CANCELLED event is available from v3
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: 1856ed85008b837fdc29ee2b156c26ff3b5a54aa URL: https://github.com/kamailio/kamailio/commit/1856ed85008b837fdc29ee2b156c26f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T09:34:30+01:00 lwsc: LWS_CALLBACK_EVENT_WAIT_CANCELLED event is available from v3 --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1856ed85008b837fdc29ee2b156c26f… Patch: https://github.com/kamailio/kamailio/commit/1856ed85008b837fdc29ee2b156c26f… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 9572d859fe..a30179c13b 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -243,11 +243,13 @@ static int ksr_lwsc_callback(struct lws *wsi, enum lws_callback_reasons reason, LM_DBG("LWS_CALLBACK_PROTOCOL_DESTROY: %d\n", reason); } break; +#if LWS_LIBRARY_VERSION_MAJOR >= 3 case LWS_CALLBACK_EVENT_WAIT_CANCELLED: if(_lwsc_verbosity>0) { LM_DBG("LWS_CALLBACK_EVENT_WAIT_CANCELLED: %d\n", reason); } break; +#endif case LWS_CALLBACK_CLIENT_CONNECTION_ERROR: LM_ERR("CLIENT_CONNECTION_ERROR: %s\n", in ? (char *)in : "(null)");

1 0

git:master:cc36b923: lwsc: use lws_cancel_service() for triggering writable event
by Daniel-Constantin Mierla 26 Mar '21

26 Mar '21

Module: kamailio Branch: master Commit: cc36b9233050930494bedd5af58bcf0c3d49c950 URL: https://github.com/kamailio/kamailio/commit/cc36b9233050930494bedd5af58bcf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-03-26T09:15:15+01:00 lwsc: use lws_cancel_service() for triggering writable event --- Modified: src/modules/lwsc/lwsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc36b9233050930494bedd5af58bcf0… Patch: https://github.com/kamailio/kamailio/commit/cc36b9233050930494bedd5af58bcf0… --- diff --git a/src/modules/lwsc/lwsc_mod.c b/src/modules/lwsc/lwsc_mod.c index 03e27b85c9..28634beae3 100644 --- a/src/modules/lwsc/lwsc_mod.c +++ b/src/modules/lwsc/lwsc_mod.c @@ -640,6 +640,7 @@ static int lwsc_api_request(str* wsurl, str *wsproto, str* sdata, /* notify main loop another message should be sent */ lws_callback_on_writable(ep->wsi); + lws_cancel_service(ep->wsctx); do { pthread_mutex_lock(&ep->wslock); @@ -793,6 +794,7 @@ static int lwsc_api_notify(str* wsurl, str* wsproto, str* data) /* notify main loop another message should be sent */ lws_callback_on_writable(ep->wsi); + lws_cancel_service(ep->wsctx); LM_DBG("notification prepared for delivery\n");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev