- sr-dev - kamailio.org

[kamailio/kamailio] tm - remove not used route_mode var (#2406)
by Luis Martin Gil 20 Aug '21

20 Aug '21

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Removed not used variable "route_mode" in the tm module. This was discovered by @IvanRibakov when using a g++ compiler, which added more strict flags (Ivan's Github is [here](https://github.com/IvanRibakov)) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2406 -- Commit Summary -- * tm - remove not used route_mode var -- File Changes -- M src/modules/tm/tm_load.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2406.patch https://github.com/kamailio/kamailio/pull/2406.diff -- 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/pull/2406

2 2

git:5.5:b102e101: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: b102e101747aba371639616d8520fe979f705206 URL: https://github.com/kamailio/kamailio/commit/b102e101747aba371639616d8520fe9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-20T10:01:33+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/lwsc/README --- Diff: https://github.com/kamailio/kamailio/commit/b102e101747aba371639616d8520fe9… Patch: https://github.com/kamailio/kamailio/commit/b102e101747aba371639616d8520fe9… --- diff --git a/src/modules/lwsc/README b/src/modules/lwsc/README index d7ae1e48b9..4c310529ee 100644 --- a/src/modules/lwsc/README +++ b/src/modules/lwsc/README @@ -87,8 +87,7 @@ Chapter 1. Admin Guide external systems, similar to http client. It is not for routing SIP traffic. - It relies on libwebsockets (tested with v3.1.0) library - (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). 2. Dependencies @@ -104,7 +103,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libwebsockets - probably v3.1.0 or newer. + * libwebsockets - probably v2.0 or newer. 3. Parameters

1 0

git:5.5:cf93317b: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: cf93317b4252fbae7bbc640dcc150fc52e5a196e URL: https://github.com/kamailio/kamailio/commit/cf93317b4252fbae7bbc640dcc150fc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/cf93317b4252fbae7bbc640dcc150fc… Patch: https://github.com/kamailio/kamailio/commit/cf93317b4252fbae7bbc640dcc150fc… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index 241b077ab6..c5d571a179 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -115,7 +115,7 @@ request_route { that, 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 - (false) in case there was a proble delegating the processing. + (false) in case there was a problem delegating the processing. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

git:5.5:49435452: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 494354527e2cbe180dfad3a42e3f89fed28e866c URL: https://github.com/kamailio/kamailio/commit/494354527e2cbe180dfad3a42e3f89f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/494354527e2cbe180dfad3a42e3f89f… Patch: https://github.com/kamailio/kamailio/commit/494354527e2cbe180dfad3a42e3f89f… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 783b57ba57..49b786ac13 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -441,7 +441,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:5.5:13989086: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 139890860907e4f2fc55e05e2e9fe490fc76c4e1 URL: https://github.com/kamailio/kamailio/commit/139890860907e4f2fc55e05e2e9fe49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/http_client/README Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/139890860907e4f2fc55e05e2e9fe49… Patch: https://github.com/kamailio/kamailio/commit/139890860907e4f2fc55e05e2e9fe49… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 85f19c7102..25d6769065 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1065,7 +1065,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... 6.5. htable.dump htable diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 0028f9e623..a3de550a2b 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -503,7 +503,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: * 0 - Return the entire HTTP result body - * 1 - Return the first oine from HTTP result body + * 1 - Return the first line from HTTP result body Default value: 1 (return first line). diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 7ac759b205..cbe8fd98eb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -162,6 +162,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index a38599775f..781ac41392 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -220,6 +220,11 @@ event_route[xhttp:request] { The event route is executed when a new HTTP request is received. ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

git:5.5:446e716f: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 446e716ff4c7e853ac9239cff8784cd30b7b8e8a URL: https://github.com/kamailio/kamailio/commit/446e716ff4c7e853ac9239cff8784cd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/446e716ff4c7e853ac9239cff8784cd… Patch: https://github.com/kamailio/kamailio/commit/446e716ff4c7e853ac9239cff8784cd… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 6a1ae76b9f..87d3ecf9e4 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -761,7 +761,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -787,9 +787,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.20. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:5.5:345e57ec: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 345e57ec3852bb0e9b3a11f35c4d56098aba1fb6 URL: https://github.com/kamailio/kamailio/commit/345e57ec3852bb0e9b3a11f35c4d560… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/345e57ec3852bb0e9b3a11f35c4d560… Patch: https://github.com/kamailio/kamailio/commit/345e57ec3852bb0e9b3a11f35c4d560… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index 4ccdd4bd06..280d79caa8 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -512,7 +512,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

1 0

git:5.5:8f14c083: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 8f14c0838912c18b8e244a904f96146c610fca91 URL: https://github.com/kamailio/kamailio/commit/8f14c0838912c18b8e244a904f96146… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/8f14c0838912c18b8e244a904f96146… Patch: https://github.com/kamailio/kamailio/commit/8f14c0838912c18b8e244a904f96146… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c96b7830c6..b42915943b 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -299,7 +299,7 @@ request_route { 5. Installation - The module needs "secsipdi_proc.so" module thatdepends on + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the libsecsipid is @@ -313,6 +313,7 @@ request_route { Example 1.11. Libsecsipid Usage ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -328,3 +329,6 @@ make install # make modules modules=src/modules/secsipid_proc # make modules modules=src/modules/secsipid ... + + For more details about compilation and installation of libsecsipid, + see: https://github.com/asipto/secsipidx.

1 0

git:5.5:a629760e: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: a629760eaff8cac4679482f616c8288623c88ec4 URL: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… Patch: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… --- diff --git a/src/modules/jwt/README b/src/modules/jwt/README index 7a7400a4b1..459f10a822 100644 --- a/src/modules/jwt/README +++ b/src/modules/jwt/README @@ -122,14 +122,17 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters - format). + format). The string values can be enclosed in single or double + quotes. If a value is not eclosed in between quotes, it is added as + numeric value if it is successfully converted to a long value, + otherwise is added as string value. This function can be used from ANY_ROUTE. Example 1.2. jwt_generate usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... 4.2. jwt_verify(pubkey, alg, claims, jwtval) @@ -142,7 +145,8 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be checked they are in the JWT, in the format "name1=value1;name2=value2;..." (same as the SIP - parameters format). + parameters format, see also the description of claims parameter for + jwt_generate()). * jwtval - the value of the JWT to verify This function can be used from ANY_ROUTE. @@ -150,7 +154,7 @@ modparam("jwt", "key_mode", 1) Example 1.3. jwt_verify usage ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -171,6 +175,6 @@ modparam("jwt", "key_mode", 1) Example 1.4. $jwt(name) usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ...

1 0

git:5.5:9bb2c11d: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 9bb2c11de3966c40d84896cf7077131f0bc14f28 URL: https://github.com/kamailio/kamailio/commit/9bb2c11de3966c40d84896cf7077131… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/9bb2c11de3966c40d84896cf7077131… Patch: https://github.com/kamailio/kamailio/commit/9bb2c11de3966c40d84896cf7077131… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 14cf3b36a6..00fa5f2ceb 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -376,8 +376,15 @@ r(pidf)\n"); * pidf-lo - the PIDF-LO returned in the HELD locationRequest response * error - any error code returned in the HELD response - The return value is 200 on success, 400 if an internal error occured, - or 500 if an error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error + occured, or 500 if an error code is returned in the HELD response. + Success codes in detail are as follows: + * 200 - received 200 OK, but neither location-info nor locationURI + element found + * 201 - received 200 OK with locationURI (aka Location-by-Reference) + * 202 - received 200 OK with location-info element (aka + Location-by-Value) + * 203 - received 200 OK with location-info and locationURI element This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE.

1 0

git:5.5:de84b32e: core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: de84b32eb42e19f8626947da1c567eea2d0869fb URL: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T10:00:38+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets (cherry picked from commit 31377b160df563a222bec5a1bf92590635429240) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… Patch: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0f82033c9f..9fd5635655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -513,7 +513,8 @@ static inline int lump_check_opt( struct lump *l, } else return 0; case COND_IF_DIFF_PROTO: get_ip_port_proto; - if (proto!=snd_i->send_sock->proto) { + if ((proto!=snd_i->send_sock->proto) + || (msg->rcv.proto!=snd_i->proto)) { LUMP_SET_COND_TRUE(l); return 1; } else return 0;

1 0

git:5.5:52978a08: core: check message rcv and snd proto for diff realms lump conditions
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 52978a0873eb068be31ca0688e64c88e4872efac URL: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T10:00:27+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports (cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… Patch: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index a2f6505e83..0f82033c9f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -493,8 +493,9 @@ static inline int lump_check_opt( struct lump *l, case COND_IF_DIFF_REALMS: get_ip_port_proto; /* faster tests first */ - if ((port==snd_i->send_sock->port_no) && + if ((port==snd_i->send_sock->port_no) && (proto==snd_i->send_sock->proto) && + (msg->rcv.proto==snd_i->proto) && #ifdef USE_COMP (msg->rcv.comp==snd_i->comp) && #endif

1 0

git:5.5:6b1fb350: lwsc: docs - updated references to libwebsockets version
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 6b1fb350458ad19192327e0dcedafa4749b6eb7c URL: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:29+02:00 lwsc: docs - updated references to libwebsockets version - GH #2749 (cherry picked from commit 01afcc7fb2468c21a8e1cfb1a717fa96299794fa) --- Modified: src/modules/lwsc/doc/lwsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… Patch: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… --- diff --git a/src/modules/lwsc/doc/lwsc_admin.xml b/src/modules/lwsc/doc/lwsc_admin.xml index 2f00c8fbd6..3e82f4b52b 100644 --- a/src/modules/lwsc/doc/lwsc_admin.xml +++ b/src/modules/lwsc/doc/lwsc_admin.xml @@ -20,7 +20,7 @@ external systems, similar to http client. It is not for routing SIP traffic. </para> <para> - It relies on libwebsockets (tested with v3.1.0) library (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). </para> </section> @@ -47,7 +47,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libwebsockets</emphasis> - probably v3.1.0 or newer. + <emphasis>libwebsockets</emphasis> - probably v2.0 or newer. </para> </listitem> </itemizedlist>

1 0

git:5.5:b49f23af: drouting: added dr_ prefix to internal time recurrence functions
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: b49f23af03d5e2f0364610739e7ef6e07cfd54a5 URL: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:08+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 (cherry picked from commit 33ea38f35f9911a26a757dbfa22065eb80a9a24a) --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e… Patch: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e…

1 0

git:5.5:7e3e0a81: cplc: use cpl_ prefix for internal time recurrence functions
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c URL: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:18+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 (cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd) --- Modified: src/modules/cplc/cpl_switches.h Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cpl_time.h --- Diff: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d… Patch: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d…

1 0

git:5.5:d8ff1845: kazoo : fix routing of reply events
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79 URL: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… Author: Alan Evans <alan(a)kageds.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:47+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] (cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… Patch: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 8076315dfd..5685f5a845 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2498,24 +2498,24 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->cb_route); + int n = route_lookup(&onreply_rt, cmd->cb_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = onreply_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->err_route); + int n = route_lookup(&failure_rt, cmd->err_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = failure_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); }

1 0

git:5.5:680d98ca: core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 680d98caccc0216f43c2b5de83935dbc4853ab9d URL: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:35+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 (cherry picked from commit 22a72f3a7725d56f00e22bdc52d44bd53da7c091) --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… Patch: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 546c822423..132f653255 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -510,8 +510,20 @@ int hostent2su(union sockaddr_union* su, /* maximum size of a str returned by ip_addr2str */ -#define IP6_MAX_STR_SIZE 39 /*1234:5678:9012:3456:7890:1234:5678:9012*/ -#define IP4_MAX_STR_SIZE 15 /*123.456.789.012*/ +/* POSIX INET6_ADDRSTRLEN (RFC 4291 section 2.2) - IPv6 with IPv4 tunneling + * (39): 1234:5678:9012:3456:7890:1234:5678:9012 + * (45): ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255 */ +#ifdef INET6_ADDRSTRLEN +#define IP6_MAX_STR_SIZE (INET6_ADDRSTRLEN-1) +#else +#define IP6_MAX_STR_SIZE 45 +#endif +/*123.456.789.123*/ +#ifdef INET_ADDRSTRLEN +#define IP4_MAX_STR_SIZE (INET_ADDRSTRLEN-1) +#else +#define IP4_MAX_STR_SIZE 15 +#endif /* converts a raw ipv6 addr (16 bytes) to ascii */ int ip6tosbuf(unsigned char* ip6, char* buff, int len);

1 0

git:5.5:ad5f0f52: tm: restore xavps & flags after rebuilding message
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: ad5f0f522f43a69e0f7f930cac5aefc3f21607df URL: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:22+02:00 tm: restore xavps & flags after rebuilding message (cherry picked from commit 7ee642c58991e594f38247ab0751fadd07ce758c) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… Patch: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ad6a74c8cb..9cbc9d5f88 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -300,10 +300,6 @@ static inline int t_run_local_req( set_route_type( backup_route_type ); p_onsend=0; - /* restore original environment */ - tm_xdata_swap(new_cell, &backup_xd, 1); - setsflagsval(sflag_bk); - if (unlikely(ra_ctx.run_flags&DROP_R_F)) { LM_DBG("tm:local-request dropped msg. to %.*s\n", lreq.dst_uri.len, lreq.dst_uri.s); @@ -372,6 +368,10 @@ static inline int t_run_local_req( } clean: + /* restore original environment */ + tm_xdata_swap(new_cell, &backup_xd, 1); + setsflagsval(sflag_bk); + /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) {

1 0

git:5.5:105b1542: misc/tools/protoshoot: removed svn id and history
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 105b15422f611ba1dcc59be30f7f4d474b294d03 URL: https://github.com/kamailio/kamailio/commit/105b15422f611ba1dcc59be30f7f4d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:30:37+02:00 misc/tools/protoshoot: removed svn id and history (cherry picked from commit e3875c01adf576f179374a926e69e99c0094e5b4) --- Modified: misc/tools/protoshoot/protoshoot.c --- Diff: https://github.com/kamailio/kamailio/commit/105b15422f611ba1dcc59be30f7f4d4… Patch: https://github.com/kamailio/kamailio/commit/105b15422f611ba1dcc59be30f7f4d4… --- diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c index 352e1018a6..6eced5fc2b 100644 --- a/misc/tools/protoshoot/protoshoot.c +++ b/misc/tools/protoshoot/protoshoot.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * * Copyright (C) 2001-2003 FhG Fokus @@ -20,14 +19,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * 2005-09-09 basic tcp support added (andrei) - */ @@ -50,7 +45,6 @@ #include <signal.h> -static char *id="$Id$"; static char *version="protoshoot 0.4"; static char* help_msg="\ Usage: protoshoot -f file -d address -p port -c count [-v]\n\ @@ -87,7 +81,7 @@ int main (int argc, char** argv) char buf[BUF_SIZE]; struct hostent* he; struct sockaddr_in addr; - + int count; int verbose; char *fname; @@ -104,7 +98,7 @@ int main (int argc, char** argv) struct linger t_linger; int k; int err; - + /* init */ count=1; verbose=0; @@ -190,7 +184,6 @@ int main (int argc, char** argv) break; case 'V': printf("version: %s\n", version); - printf("%s\n",id); exit(0); break; case 'h': @@ -213,7 +206,7 @@ int main (int argc, char** argv) abort(); } } - + /* check if all the required params are present */ if (fname==0){ fprintf(stderr, "Missing -f file\n"); @@ -238,13 +231,13 @@ int main (int argc, char** argv) exit(-1); } if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1; - + /* ignore sigpipe */ if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){ fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno)); exit(-1); } - + /* open packet file */ fd=open(fname, O_RDONLY); if (fd<0){ @@ -274,7 +267,7 @@ int main (int argc, char** argv) addr.sin_len=sizeof(struct sockaddr_in); #endif memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + for (k=0; k<con_no; k++){ switch(proto){ case PROTO_UDP: @@ -285,7 +278,7 @@ int main (int argc, char** argv) break; #ifdef USE_SCTP case PROTO_SCTP: - sock = socket(he->h_addrtype, + sock = socket(he->h_addrtype, sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET, IPPROTO_SCTP); break; @@ -333,8 +326,7 @@ int main (int argc, char** argv) fprintf(stderr, "ERROR: connect: %s\n", strerror(errno)); goto error; } - - + /* flood loop */ t=throttle; for (r=0; r<count; r++){ @@ -366,7 +358,7 @@ int main (int argc, char** argv) } } } - + close(sock); if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); } }

1 0

git:5.5:01ab21c4: core: parse session sendrecv_mode in sdp
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 01ab21c4ba28259be72fd704afd389132260e258 URL: https://github.com/kamailio/kamailio/commit/01ab21c4ba28259be72fd704afd3891… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:32:55+02:00 core: parse session sendrecv_mode in sdp - some user agents send a=sendonly as session attribute which apply to all media streams (cherry picked from commit 8da4477fd6d9590b9946071b9ac2a778b1d55d01) --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h --- Diff: https://github.com/kamailio/kamailio/commit/01ab21c4ba28259be72fd704afd3891… Patch: https://github.com/kamailio/kamailio/commit/01ab21c4ba28259be72fd704afd3891… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d5e4f0695b..14779e4d12 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -453,6 +453,18 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ extract_bwidth(&tmpstr1, &session->bw_type, &session->bw_width); } + /* Find sendrecv_mode between session begin and first media. + * parse session attributes to check is_on_hold for a= for all medias. */ + a1p = find_first_sdp_line(o1p, m1p, 'a', NULL); + while (a1p) { + tmpstr1.s = a1p; + tmpstr1.len = m1p - a1p; + if (extract_sendrecv_mode(&tmpstr1, &session->sendrecv_mode, &session->is_on_hold) == 0) { + break; + } + a1p = find_next_sdp_line(a1p, m1p, 'a', NULL); + } + /* Have session. Iterate media descriptions in session */ m2p = m1p; stream_num = 0; diff --git a/src/core/parser/sdp/sdp.h b/src/core/parser/sdp/sdp.h index 84ebcfc8a2..d8c1b15b66 100644 --- a/src/core/parser/sdp/sdp.h +++ b/src/core/parser/sdp/sdp.h @@ -111,6 +111,8 @@ typedef struct sdp_session_cell { AS - application specific */ str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ int streams_num; /**< number of streams inside a session */ + str sendrecv_mode; + int is_on_hold; /**< flag indicating if this session is on hold */ struct sdp_stream_cell* streams; } sdp_session_cell_t;

1 0

git:5.5:dadac04b: textops: check session sendrecv_mode in is_audio_on_hold
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: dadac04b0153a29ed7c1ebb48e887c06989fa49c URL: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:08+02:00 textops: check session sendrecv_mode in is_audio_on_hold - if sendrecv_mode is not set in media, check if its set in session (cherry picked from commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… Patch: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 2998906051..4b3216d4d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4367,8 +4367,15 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; + if(sdp_stream->media.len==AUDIO_STR_LEN && + strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + !sdp_stream->sendrecv_mode.len && + sdp_session->sendrecv_mode.len && + sdp_session->is_on_hold) + return sdp_session->is_on_hold; sdp_stream_num++; } sdp_session_num++;

1 0

git:5.5:ede5a839: core: parser sdp - shorten debug message with sdp line
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: ede5a8399662903c2aa081b7010603398a598e94 URL: https://github.com/kamailio/kamailio/commit/ede5a8399662903c2aa081b70106033… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:29:51+02:00 core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars (cherry picked from commit 4191a8193025499df64f13d59f5716563e573161) --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/ede5a8399662903c2aa081b70106033… Patch: https://github.com/kamailio/kamailio/commit/ede5a8399662903c2aa081b70106033… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 7dbf259379..d5e4f0695b 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -584,7 +584,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ a1p = stream->path.s + stream->path.len; } else { /* unknown a= line, ignore -- jump over it */ - LM_DBG("ignoring unknown type in a= line: `%.*s'\n", tmpstr1.len, tmpstr1.s); + LM_DBG("ignoring unknown type in a= line: `%.*s...'\n", + (tmpstr1.len>20)?20:tmpstr1.len, tmpstr1.s); a1p += 2; }

1 0

git:5.5:96f24cae: sdpops: refactored sdp_remove_str_codec_id_attrs()
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 96f24caed768b1b382b166eea835e555eac5e933 URL: https://github.com/kamailio/kamailio/commit/96f24caed768b1b382b166eea835e55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:30:01+02:00 sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 (cherry picked from commit 1a15a18eacd5764e9ba6240acbe37e645368f825) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/96f24caed768b1b382b166eea835e55… Patch: https://github.com/kamailio/kamailio/commit/96f24caed768b1b382b166eea835e55… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index bebe01ba5c..37655fde4b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -195,48 +195,45 @@ int sdp_locate_line(sip_msg_t* msg, char *pos, str *aline) int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, sdp_stream_cell_t* sdp_stream, str *rm_codec) { + str sdp_attrs_list[] = { + str_init("a=rtpmap:"), + str_init("a=fmtp:"), + str_init("a=rtcp-fb:"), + {0, 0} + }; + int i; str aline = {0, 0}; - sdp_payload_attr_t *payload; + str raw_stream = {0, 0}; struct lump *anchor; - payload = sdp_stream->payload_attr; - while (payload) { - LM_DBG("a= ... for codec %.*s/%.*s\n", - payload->rtp_payload.len, payload->rtp_payload.s, - payload->rtp_enc.len, payload->rtp_enc.s); - if(rm_codec->len==payload->rtp_payload.len - && strncmp(payload->rtp_payload.s, rm_codec->s, - rm_codec->len)==0) { - if(payload->rtp_enc.s!=NULL) { - if(sdp_locate_line(msg, payload->rtp_enc.s, &aline)==0) - { - LM_DBG("removing line: %.*s", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; - } - } - } - if(payload->fmtp_string.s!=NULL) { - if(sdp_locate_line(msg, payload->fmtp_string.s, &aline)==0) - { - LM_DBG("removing line: %.*s\n", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; + raw_stream = sdp_stream->raw_stream; + while(raw_stream.len>5) { + sdp_locate_line(msg, raw_stream.s, &aline); + /* process attribute lines: a=x:c... */ + if((aline.len>5) && ((aline.s[0] | 0x20)=='a')) { + LM_DBG("processing sdp line [%.*s]\n", aline.len, aline.s); + for(i=0; sdp_attrs_list[i].s!=NULL; i++) { + if(aline.len > sdp_attrs_list[i].len + rm_codec->len) { + if(strncasecmp(aline.s, sdp_attrs_list[i].s, + sdp_attrs_list[i].len)==0 + && strncmp(aline.s+sdp_attrs_list[i].len, rm_codec->s, + rm_codec->len)==0 + && aline.s[sdp_attrs_list[i].len + rm_codec->len]==' ') { + LM_DBG("removing line: [%.*s]\n", aline.len, aline.s); + anchor = del_lump(msg, aline.s - msg->buf, + aline.len, 0); + if (anchor == NULL) { + LM_ERR("failed to remove - id [%.*s] line [%.*s]\n", + rm_codec->len, rm_codec->s, + aline.len, aline.s); + return -1; + } } } } } - payload=payload->next; + raw_stream.s = aline.s + aline.len; + raw_stream.len -= aline.len; } return 0;

1 0

git:5.5:ba8a06d2: core: enables compilation with debug symbols by default for other architectures
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: ba8a06d2988e41b09947d3ae3386a13e3d8415b9 URL: https://github.com/kamailio/kamailio/commit/ba8a06d2988e41b09947d3ae3386a13… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:27:52+02:00 core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 (cherry picked from commit ed46adad82e7b6569eb42704c5460263d2af75f7) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ba8a06d2988e41b09947d3ae3386a13… Patch: https://github.com/kamailio/kamailio/commit/ba8a06d2988e41b09947d3ae3386a13…

1 0

git:5.5:48eb4165: db_redis: fix broken pipe issue, if redis server with timeout setting.
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 48eb41654859e6130c82c46400b529f2af9ce908 URL: https://github.com/kamailio/kamailio/commit/48eb41654859e6130c82c46400b529f… Author: FredWH <wh720(a)139.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:28:34+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 (cherry picked from commit 7cec977f8e12bbeb0309d903e02461d1ccbf41a8) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/48eb41654859e6130c82c46400b529f… Patch: https://github.com/kamailio/kamailio/commit/48eb41654859e6130c82c46400b529f… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index ad2921f1d5..dd421a7844 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -305,7 +305,8 @@ void *db_redis_command_argv(km_redis_con_t *con, redis_key_t *query) { LM_DBG("query has %d args\n", argc); redisReply *reply = redisCommandArgv(con->con, argc, (const char**)argv, NULL); - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -344,7 +345,8 @@ int db_redis_append_command_argv(km_redis_con_t *con, redis_key_t *query, int qu // this should actually never happen, because if all replies // are properly consumed for the previous command, it won't send // out a new query until redisGetReply is called - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -374,8 +376,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { *reply = NULL; ret = redisGetReply(con->con, reply); - if (con->con->err == REDIS_ERR_EOF) { - LM_DBG("redis connection is gone, try reconnect\n"); + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); con->append_counter = 0; if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); @@ -396,7 +398,7 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { db_redis_key_free(&query); } ret = redisGetReply(con->con, reply); - if (con->con->err != REDIS_ERR_EOF) { + if (con->con->err == REDIS_OK) { con->append_counter--; } } else {

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev