- sr-dev - kamailio.org

[kamailio/kamailio] ims_usrloc_pcscf: fix on saving protocol info into DB (#2879)
by Erhan Onur Sendag 19 Nov '21

19 Nov '21

#### Pre-Submission Checklist    - [*] Commit message has the format required by CONTRIBUTING guide - [*] Commits are split per component (core, individual modules, libs, utils, ...) - [*] 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 - [*] 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  Protocol information of pcontact was not written to mysql database You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2879 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2879/commits/c7cf1937bfc9a36e7086…">Fix on saving protocol info for ims_usrloc_pcscf</a> -- File Changes -- M src/modules/ims_usrloc_pcscf/usrloc_db.c (2) M utils/kamctl/mysql/ims_usrloc_pcscf-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2879.patch https://github.com/kamailio/kamailio/pull/2879.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/2879

4 4

git:master:5e617b5e: modules: readme files regenerated - kazoo ... [skip ci]
by Kamailio Dev 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 5e617b5e2130ed96f624e027023329433f8814ee URL: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-19T12:46:21+01:00 modules: readme files regenerated - kazoo ... [skip ci] --- Modified: src/modules/kazoo/README --- Diff: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… Patch: https://github.com/kamailio/kamailio/commit/5e617b5e2130ed96f624e0270233294… --- diff --git a/src/modules/kazoo/README b/src/modules/kazoo/README index 7497dd20e8..572774ff2c 100644 --- a/src/modules/kazoo/README +++ b/src/modules/kazoo/README @@ -67,10 +67,10 @@ Luis Azedo 5.1. amqp related 5.1.1. kazoo_publish(exchange, routing_key, - json_payload) + json_payload [, amqp_headers]) 5.1.2. kazoo_query(exchange, routing_key, json_payload - [, target_var]) + [, target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -175,9 +175,11 @@ Chapter 1. Admin Guide 5.1. amqp related - 5.1.1. kazoo_publish(exchange, routing_key, json_payload) + 5.1.1. kazoo_publish(exchange, routing_key, json_payload [, + amqp_headers]) + 5.1.2. kazoo_query(exchange, routing_key, json_payload [, - target_var]) + target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -623,9 +625,11 @@ modparam("kazoo", "pua_mode", 0) 5.1. amqp related - 5.1.1. kazoo_publish(exchange, routing_key, json_payload) + 5.1.1. kazoo_publish(exchange, routing_key, json_payload [, + amqp_headers]) + 5.1.2. kazoo_query(exchange, routing_key, json_payload [, - target_var]) + target_var] [, amqp_headers]) 5.1.3. kazoo_subscribe(exchange, exchange_type, queue, routing_key) @@ -643,10 +647,11 @@ modparam("kazoo", "pua_mode", 0) 5.1. amqp related -5.1.1. kazoo_publish(exchange, routing_key, json_payload) +5.1.1. kazoo_publish(exchange, routing_key, json_payload [, amqp_headers]) The function publishes a json payload to rabbitmq. The routing_key - parameter should be encoded. + parameter should be encoded. Optional AMQP-Headers are specified in the + format key1=value1;key2=value2 This function can be used from ANY ROUTE. @@ -661,12 +666,14 @@ $var(amqp_routing_key) = "registration.success." + $(fd{kz.encode}) + "." + $fU; kazoo_publish("callmgr", $var(amqp_routing_key), $var(amqp_payload_request)); ... -5.1.2. kazoo_query(exchange, routing_key, json_payload [, target_var]) +5.1.2. kazoo_query(exchange, routing_key, json_payload [, target_var] [, +amqp_headers]) The function publishes a json payload to rabbitmq, waits for a correlated messageand puts the result in target_var. The routing_key parameter should be encoded. target_var is optional as the function - also puts the result in pseudo-variable $kzR. + also puts the result in pseudo-variable $kzR. Optional AMQP-Headers are + specified in the format key1=value1;key2=value2 This function can be used from ANY ROUTE.

1 0

[kamailio/kamailio] Allow setting AMQP-Headers when publishing messages (Issue #2895)
by mihovilkolaric 19 Nov '21

19 Nov '21

### Description I am using kazoo-module for connecting Kamailio to RabbitMQ and publishing messages to several consumers. Now I´d like to extend my setup to a more sophisticated routing based on a consistent hash-exchange (https://github.com/rabbitmq/rabbitmq-consistent-hash-exchange), while retaining also existing topology based on routing keys. This can be achieved by using ["Routing on a Header" (hash-header)](https://github.com/rabbitmq/rabbitmq-consistent-hash-exchange…). However, [kazoo_publish](https://kamailio.org/docs/modules/5.0.x/modules/kazoo.html#i… does not allow setting such header. ### Expected behavior Please extend publish-functions of the kazoo-module with the possibility to (optionally) supply AMQP-headers. -- 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/2895

3 4

[kamailio/kamailio] kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish (PR #2925)
by mihovilkolaric 19 Nov '21

19 Nov '21

- implements GH #2895   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2895 #### Description Allows adding additional AMQP-headers in the format header1=value1;header2=value2;... Remark: I decided to re-use the definition `{"kazoo_publish", (cmd_function) kz_amqp_publish_ex, 4, fixup_kz_amqp, fixup_kz_amqp_free, ANY_ROUTE},` resp. to modify the existing method signature `int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags)` to `int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags)` as the param _pub_flags is neither described in the docs, nor it was evaluated/used, and thus was useless anyhow. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2925 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2925/commits/0aee8fc2c486f19a20c9…">kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish</a> -- File Changes -- M src/modules/kazoo/doc/kazoo_admin.xml (8) M src/modules/kazoo/kazoo.c (1) M src/modules/kazoo/kz_amqp.c (117) M src/modules/kazoo/kz_amqp.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2925.patch https://github.com/kamailio/kamailio/pull/2925.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/2925

3 4

git:master:dcb8e165: kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish
by Henning Westerholt 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: dcb8e1650204c9453457871515ab5c7ec2d497f1 URL: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7… Author: mihovilkolaric <mihovilkolaric(a)github.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-11-19T12:43:16+01:00 kazoo: Allow optional AMQP-headers in kazoo_query and kazoo_publish - implements GH #2895 --- Modified: src/modules/kazoo/doc/kazoo_admin.xml Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7… Patch: https://github.com/kamailio/kamailio/commit/dcb8e1650204c9453457871515ab5c7…

1 0

[kamailio/kamailio] Possible deadlock bug in the method acquire_spi and release_spi? (Issue #2939)
by ryancaicse 19 Nov '21

19 Nov '21

In the method `acquire_spi`, the condition of acquiring and releasing is not aligned. It seems the lock would be acquired but released only when `spi_data->spi_val == initial_val`, Would it lead to missing lock release? https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… In the method `release_spi`, the lock may be re-acquired so missing lock release in the method `acquire_spi` could lead to a deadlock. https://github.com/kamailio/kamailio/blob/1ddc27f199061025a6a43da3e8a1388fc… -- 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/2939

3 3

git:master:b5cf0796: Merge pull request #2879 from ErhanOnur/fix_ims_usrloc_pcscf_protocol
by GitHub 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: b5cf0796ffc308fdd8bf63d1f446608d63c7cac9 URL: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… Author: carstenbock <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-19T10:26:20+01:00 Merge pull request #2879 from ErhanOnur/fix_ims_usrloc_pcscf_protocol ims_usrloc_pcscf: fix on saving protocol info into DB --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… Patch: https://github.com/kamailio/kamailio/commit/b5cf0796ffc308fdd8bf63d1f446608… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ca57a2b4b3..5f0df126fa 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -341,7 +341,7 @@ int db_insert_pcontact(struct pcontact* _c) return -1; } - if (ul_dbf.insert(ul_dbh, keys, values, 15) < 0) { + if (ul_dbf.insert(ul_dbh, keys, values, 16) < 0) { LM_ERR("inserting contact in db failed\n"); return -1; } diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index cf978df1f5..2a18c59601 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -17,7 +17,7 @@ CREATE TABLE `location` ( `socket` varchar(64) DEFAULT NULL, `public_ids` varchar(2048) DEFAULT NULL, `security_type` int(11) DEFAULT NULL, - `protocol` char(5) DEFAULT NULL, + `protocol` int(10) DEFAULT NULL, `mode` char(10) DEFAULT NULL, `ck` varchar(100) DEFAULT NULL, `ik` varchar(100) DEFAULT NULL,

1 0

git:master:c7cf1937: Fix on saving protocol info for ims_usrloc_pcscf
by 67456745 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: c7cf1937bfc9a36e70865fed8cf704f34f17685f URL: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… Author: 67456745 <erhan.sendag(a)i2i-systems.com> Committer: 67456745 <erhan.sendag(a)i2i-systems.com> Date: 2021-10-11T11:51:33+03:00 Fix on saving protocol info for ims_usrloc_pcscf --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.c Modified: utils/kamctl/mysql/ims_usrloc_pcscf-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… Patch: https://github.com/kamailio/kamailio/commit/c7cf1937bfc9a36e70865fed8cf704f… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.c b/src/modules/ims_usrloc_pcscf/usrloc_db.c index ca57a2b4b33..5f0df126fa2 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.c @@ -341,7 +341,7 @@ int db_insert_pcontact(struct pcontact* _c) return -1; } - if (ul_dbf.insert(ul_dbh, keys, values, 15) < 0) { + if (ul_dbf.insert(ul_dbh, keys, values, 16) < 0) { LM_ERR("inserting contact in db failed\n"); return -1; } diff --git a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql index cf978df1f58..2a18c59601b 100644 --- a/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql +++ b/utils/kamctl/mysql/ims_usrloc_pcscf-create.sql @@ -17,7 +17,7 @@ CREATE TABLE `location` ( `socket` varchar(64) DEFAULT NULL, `public_ids` varchar(2048) DEFAULT NULL, `security_type` int(11) DEFAULT NULL, - `protocol` char(5) DEFAULT NULL, + `protocol` int(10) DEFAULT NULL, `mode` char(10) DEFAULT NULL, `ck` varchar(100) DEFAULT NULL, `ik` varchar(100) DEFAULT NULL,

1 0

[kamailio/kamailio] Fix a possible deadlock bug due to unreleased lock (PR #2941)
by ryancaicse 19 Nov '21

19 Nov '21

In acquire_spi, making condition of acquiring the releasing lock aligned. Fixes #2939 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2941 -- Commit Summary -- * Fix a possible deadlock bug due to unreleased lock -- File Changes -- M src/modules/ims_ipsec_pcscf/spi_gen.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2941.patch https://github.com/kamailio/kamailio/pull/2941.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/2941

2 6

git:master:5affee3b: modules: readme files regenerated - tsilo ... [skip ci]
by Kamailio Dev 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 5affee3bcbf5b4a4cad5acfee1c24c0def1ad58c URL: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-19T09:31:15+01:00 modules: readme files regenerated - tsilo ... [skip ci] --- Modified: src/modules/tsilo/README --- Diff: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… Patch: https://github.com/kamailio/kamailio/commit/5affee3bcbf5b4a4cad5acfee1c24c0… --- diff --git a/src/modules/tsilo/README b/src/modules/tsilo/README index 47c14ce1bb..c93fa0ebef 100644 --- a/src/modules/tsilo/README +++ b/src/modules/tsilo/README @@ -10,6 +10,10 @@ Federico Cabiddu <federico.cabiddu(a)gmail.com> +Donat Zenichev + + <dzenichev(a)sipwise.com> + Copyright © 2015 Federico Cabiddu __________________________________________________________________ @@ -32,7 +36,8 @@ Federico Cabiddu 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 5. RPC Commands @@ -53,7 +58,8 @@ Federico Cabiddu 1.2. Set use_domain parameter 1.3. ts_store usage 1.4. ts_append usage - 1.5. ts_append_to usage + 1.5. ts_append_by_contact usage + 1.6. ts_append_to usage Chapter 1. Admin Guide @@ -74,7 +80,8 @@ Chapter 1. Admin Guide 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 5. RPC Commands @@ -157,7 +164,8 @@ modparam("tsilo", "use_domain", 1) 4.1. ts_store([uri]) 4.2. ts_append(domain, ruri) - 4.3. ts_append_to(tindex, tlabel, domain, [uri]) + 4.3. ts_append_by_contact(domain, ruri [, contact]) + 4.4. ts_append_to(tindex, tlabel, domain, [uri]) 4.1. ts_store([uri]) @@ -200,7 +208,40 @@ if (is_method("REGISTER")) { } ... -4.3. ts_append_to(tindex, tlabel, domain, [uri]) +4.3. ts_append_by_contact(domain, ruri [, contact]) + + Has almost the same intention as the ts_append(), but gives a + possibility to append branches only for a specific location record + (Contact URI). The contact's URI value can be either taken from the + currently processed REGISTER or (optionally) given as a third + parameter. If the Contact URI for a lookup is given as the parameter, + it is possible to provide it as a pseudo-variable. The contact lookup + is performed on the table specified by the domain parameter. The method + should be called when a REGISTER request is received. + + Meaning of the parameters is as follows: + * domain - Name of table that should be used for looking up new + contacts for r-uri. + * ruri - The r-uri for which we want to check existing transactions + and add them new branches. Can be a static string value or a + dynamic string with pseudo-variables. + * contact - Optional, a value of the location record (contact URI) + based on which to perform the branch appending. If not given, the + value will be taken from the currently processed REGISTER. If a + location lookup based on this Contact URI fails (no location record + found), then the branch append will not happen. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + + Example 1.5. ts_append_by_contact usage +... +if (is_method("REGISTER")) { + $var(formated_ct) = $(x_hdr(Contact){nameaddr.uri}); + ts_append_by_contact("location", "$tu", "$var(formated_ct)"); +} +... + +4.4. ts_append_to(tindex, tlabel, domain, [uri]) The method add branches to the transaction identified by tindex and tlabel, performing a contacts lookup on the table specified by the @@ -218,7 +259,7 @@ if (is_method("REGISTER")) { This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. - Example 1.5. ts_append_to usage + Example 1.6. ts_append_to usage ... if (is_method("REGISTER")) { $var(tindex) = ...

1 0

[kamailio/kamailio] TSILO / TM. Lookup and branch creating by contact (location record). (PR #2931)
by zenichev 19 Nov '21

19 Nov '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) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [X] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Two separate commits per component: TSILO and TM. Important, this implementation has been tested internally and is in use by us already. Contributions to both TSILO and TM are made so, that they save full back-compatibility and do not affect existing implementation. --- TSILO: Add support of a lookup and branch creating by contact Improvement of the TSILO module, which allows to run a lookup using the provided RURI, but only to create a new branch for the Contact, which is set in the currently processed REGISTER. Or optionally a Contact URI value given as a parameter to the function. If the Contact URI for a lookup, is given as a parameter, it is possible to provide it as a pseudo-variable. Hence it is now possible to append new branch(es) for only UAC(s) getting REGISTERED at the moment of calling 'ts_append_by_contact()'. Previously it was only possible to call 'ts_append()' and create new branches for all previously present location records (for this specific URI), which was in some circumstsances undersired. New script functions introduced: - ts_append_by_contact(table, ruri [, contact]) New module functions introduced: - w_ts_append_by_contact2() / ki_ts_append_by_contact() - w_ts_append_by_contact3 / ki_ts_append_by_contact_uri() - ts_append_by_contact() / ts_append_by_contact_to() Backwards compatibility is saved, the new functionality is not overlapping with the previously existing implementation, hence it only acts when the new script function ts_append_by_contact() is used. The documentation has been updated accordingly. --- TM: API improvement, new function introduced: t_append_branch_by_contact() New module functions introduced: - t_append_branch_by_contact() This commit introduces a possibility of TM's API to append a branch based on specific location (Contact's URI). Indeed the 't_append_branch_by_contact()' is a corrected copy of the 't_append_branches()', which instead takes Contact as a parameter of str type and takes care to append a branch only for it. The separate function has been introduced, in order to save full back-compatibility, and not affect existing implementation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2931 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2931/commits/6bdb1dbdd9726b1b45c0…">tsilo: Add support of a lookup and branch creating by contact</a> * <a href="https://github.com/kamailio/kamailio/pull/2931/commits/7d0f21edde6a816a75fd…">tm: API improvement, new function introduced: t_append_branch_by_contact()</a> -- File Changes -- M src/modules/tm/t_append_branches.c (206) M src/modules/tm/t_append_branches.h (4) M src/modules/tm/tm_load.c (1) M src/modules/tm/tm_load.h (1) M src/modules/tsilo/doc/tsilo.xml (5) M src/modules/tsilo/doc/tsilo_admin.xml (54) M src/modules/tsilo/ts_append.c (116) M src/modules/tsilo/ts_append.h (2) M src/modules/tsilo/tsilo.c (269) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2931.patch https://github.com/kamailio/kamailio/pull/2931.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/2931

5 15

git:master:c1fd9eba: tsilo: Merge similar functions in ts_append.c
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: c1fd9ebaa0fe0eb7457ea74e8a22444b855af9cd URL: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Merge similar functions in ts_append.c We need to merge similar functions in ts_append.c implementation to give less work for maintaining similar code. Furthermore the purpose of them is quite the same, but differes just in some details (usage of TM's API). Merged functions are: - ts_append() and ts_append_by_contact() - ts_append_to() and ts_append_by_contact_to() Now all appending in TSILO happens only through ts_append() / ts_append_to() An implementation in tsilo.c has been updated accordingly. Usage. In case we do not want to append based on specific Contact (location), the contact parameter being passed to either ts_append() or ts_append_to() must be set to zero. In case we do want to append by a specific Contact, then we must set the Contact parameter of str type beforehand calling ts_append() / ts_append_to(). --- Modified: src/modules/tsilo/ts_append.c Modified: src/modules/tsilo/ts_append.h Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444… Patch: https://github.com/kamailio/kamailio/commit/c1fd9ebaa0fe0eb7457ea74e8a22444…

1 0

git:master:cb1b78e7: tm: merge t_append_branches() and t_append_branch_by_contact()
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: cb1b78e7bc8d61261e429664c6deb8bb1b4b53d0 URL: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tm: merge t_append_branches() and t_append_branch_by_contact() Because the implementation of the functions 't_append_branches()' and 't_append_branch_by_contact()' is pretty much the same, it's proposed to merge them into one: 't_append_branches()' The way how the function acts now depends on if the contact parameter of str type is given or not (empty or not). If the contact parameter is given, then only a desired location is meant for appending. If not found in the location table, an append will not happen for this AOR. Otherwise create branches for all existing location records of this particular AOR. Search for locations is done in the location table. --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b… Patch: https://github.com/kamailio/kamailio/commit/cb1b78e7bc8d61261e429664c6deb8b…

1 0

git:master:47464917: tsilo: Be compliant with changes in TM, now only t_append_branches()
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 474649171d3c269e2fcfb00c7b1dbd318a952f51 URL: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Be compliant with changes in TM, now only t_append_branches() Since of changes in TM's module, where 't_append_branches()' and 't_append_branch_by_contact()' have been merged into one function, we need to edit all the occurences where TM's API is called in TSILO. No logic changes. --- Modified: src/modules/tsilo/ts_append.c --- Diff: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… Patch: https://github.com/kamailio/kamailio/commit/474649171d3c269e2fcfb00c7b1dbd3… --- diff --git a/src/modules/tsilo/ts_append.c b/src/modules/tsilo/ts_append.c index 1847ac1c1b..e4967f8167 100644 --- a/src/modules/tsilo/ts_append.c +++ b/src/modules/tsilo/ts_append.c @@ -89,6 +89,10 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * int ret; str stable; + str contact; /* needed for usage of TM's API, t_append_branches() */ + contact.s = NULL; /* must be emptied */ + contact.len = 0; + orig_t = _tmb.t_gett(); if(_tmb.t_lookup_ident(&t, tindex, tlabel) < 0) @@ -129,7 +133,7 @@ int ts_append_to(struct sip_msg* msg, int tindex, int tlabel, char *table, str * goto done; } - ret = _tmb.t_append_branches(); + ret = _tmb.t_append_branches(&contact); done: /* unref the transaction which had been referred by t_lookup_ident() call. @@ -245,7 +249,7 @@ int ts_append_by_contact_to(struct sip_msg* msg, int tindex, int tlabel, char *t /* start the transaction only for the desired contact contact must be of syntax: sip:<user>@<host>:<port> with no parameters list*/ - ret = _tmb.t_append_branch_by_contact(contact); + ret = _tmb.t_append_branches(contact); done: /* unref the transaction which had been referred by t_lookup_ident() call.

1 0

git:master:f564c0d3: tm: API improvement, new function introduced: t_append_branch_by_contact()
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: f564c0d33974eeaa1833abeb7972f5d207c5663f URL: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tm: API improvement, new function introduced: t_append_branch_by_contact() New module functions introduced: - t_append_branch_by_contact() This commit introduces a possibility of TM's API to append a branch based on specific location (Contact's URI). Indeed the 't_append_branch_by_contact()' is a corrected copy of the 't_append_branches()', which instead takes Contact as a parameter of str type. The separate function has been introduced, in order to save full back-compatibility, and not affect existing implementation. --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_append_branches.h Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d… Patch: https://github.com/kamailio/kamailio/commit/f564c0d33974eeaa1833abeb7972f5d…

1 0

git:master:7265f1cf: tsilo: Add support of a lookup and branch creating by contact
by Victor Seva 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 7265f1cf7c57d258538119bc0d41146a04183eec URL: https://github.com/kamailio/kamailio/commit/7265f1cf7c57d258538119bc0d41146… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-19T09:18:55+01:00 tsilo: Add support of a lookup and branch creating by contact Improvement of the TSILO module, which allows to run a lookup using the provided RURI, but only to create a new branch for the Contact, which is set in the currently processed REGISTER. Or optionally a Contact URI value given as a parameter to the function. If the Contact URI for a lookup, is given as a parameter, it is possible to provide it as a pseudo-variable. Hence it is now possible to append new branch(es) for only UAC(s) getting REGISTERED at the moment of calling 'ts_append_by_contact()'. Previously it was only possible to call 'ts_append()' and create new branches for all previously present location records (for this specific URI), which was in some circumstsances undersired. New script functions introduced: - ts_append_by_contact(table, ruri [, contact]) New module functions introduced: - w_ts_append_by_contact2() / ki_ts_append_by_contact() - w_ts_append_by_contact3 / ki_ts_append_by_contact_uri() - ts_append_by_contact() / ts_append_by_contact_to() Backwards compatibility is saved, the new functionality is not overlapping with the previously existing implementation, hence it only acts when the new script function ts_append_by_contact() is used. The documentation has been updated accordingly. --- Modified: src/modules/tsilo/doc/tsilo.xml Modified: src/modules/tsilo/doc/tsilo_admin.xml Modified: src/modules/tsilo/ts_append.c Modified: src/modules/tsilo/ts_append.h Modified: src/modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/7265f1cf7c57d258538119bc0d41146… Patch: https://github.com/kamailio/kamailio/commit/7265f1cf7c57d258538119bc0d41146…

1 0

[kamailio/kamailio] A problem appeared after the latest changes in pv set_var_value function (Issue #2928)
by alexyosifov 19 Nov '21

19 Nov '21

### Description With the latest master, I am trying to register UE in the IMS core. In the S-CSCF Diameter MAR message Authentication scheme is sent as 'unknown". With Kamailio 5.5.1 works fine. What I see the problem appears because of the following commits: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc pv: handle case when var value ha flag str but null pointer ffe311939ebf58e7418940ec6c71bfaf9b21afad pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit Check the log messages below for detailed debug data. pv $aa is empty but after line 711 $var(alg) is with len=1 and printed value '0'. #### Reproduction Try to Register UE to the IMS core with the latest master. Check MAR message AVP 612->avp 608 3GPP-SIP-Authentication-Scheme: unknown #### Log Messages In s-cscf kamailio.cfg route[REGISTER] I have the following code: 709 route[REGISTER] { 710 xlog("ALGORITHM IS [$aa] and User-Agent is [$ua]\n"); 711 $var(alg) = $aa; 712 xlog("ALGORITHM IS [$var(alg)] and User-Agent is [$ua]\n"); 733 #user has not been authenticated. Lets send a challenge via 401 Unauthorized 734 xlog("L_DBG","About to challenge! auth_ims\n"); 735 ims_www_challenge("REG_MAR_REPLY", "$td", "$var(alg)"); 736 exit; **LOG from master branch:** Log output for lines 710 and 712: Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=710 a=25 n=xlog Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=711 a=63 n=assign Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=712 a=25 n=xlog Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) ERROR: <script>: ALGORITHM IS [0] and User-Agent is [EE VOLTE] Added and debug log into authorize.c:356 file: ... LM_DBG(" #################### Sending MAR - 0, algo.len=%d algo[%.*s]\n", algo.len, algo.len, algo.s); .... Log output: Nov 11 14:50:30 kamailio_scscf[31798]: 1(31851) DEBUG: ims_auth [authorize.c:356]: challenge(): #################### Sending MAR - 0, algo.len=1 algo[0] **LOG from Kamailio 5.5.1:** 117528 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] 117529 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=711 a=63 n=assign 117530 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[REGISTER] c=[/etc/kamailio_scscf/kamailio.cfg] l=712 a=25 n=xlog 117531 Nov 11 14:43:53 kamailio_scscf[19016]: 1(19060) ERROR: <script>: ALGORITHM IS [] and User-Agent is [EE VOLTE] Nov 11 14:43:53 mnc234 kamailio_scscf[19016]: 1(19060) DEBUG: ims_auth [authorize.c:356]: challenge(): #################### Sending MAR - 0, algo.len=0 algo[]] #### SIP Traffic ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.6.0-dev2 (x86_64/linux) ffe311-dirty 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: ffe311 -dirty compiled on 14:44:53 Nov 11 2021 with gcc 7.4.0 * **Operating System**: DISTRIB_ID=Ubuntu DISTRIB_RELEASE=18.04 DISTRIB_CODENAME=bionic DISTRIB_DESCRIPTION="Ubuntu 18.04.2 LTS" -- 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/2928

2 6

git:master:bd206729: Revert "pv: handle case when var value ha flag str but null pointer"
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: bd206729cf46bc32b3a92f870d6b77105ab35902 URL: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:45:09+01:00 Revert "pv: handle case when var value ha flag str but null pointer" This reverts commit 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… Patch: https://github.com/kamailio/kamailio/commit/bd206729cf46bc32b3a92f870d6b771… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if(value==NULL) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:e85f33d7: pv: check source for memcpy
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: e85f33d7c827b85634f6fe0377ff9f30b3bc4e84 URL: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:57:25+01:00 pv: check source for memcpy --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… Patch: https://github.com/kamailio/kamailio/commit/e85f33d7c827b85634f6fe0377ff9f3… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..f04fa9818b 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -134,7 +134,9 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) } var->v.flags |= VAR_VAL_STR; } - memcpy(var->v.value.s.s, value->s.s, value->s.len); + if(value->s.s) { + memcpy(var->v.value.s.s, value->s.s, value->s.len); + } var->v.value.s.len = value->s.len; var->v.value.s.s[value->s.len] = '\0'; } else {

1 0

git:master:f19cff46: Revert "pv: fix condition in detecting the null string value when setting $var(...)"
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: f19cff46ae1f27a456e276ea891154aeb0a51e08 URL: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:44:49+01:00 Revert "pv: fix condition in detecting the null string value when setting $var(...)" This reverts commit ffe311939ebf58e7418940ec6c71bfaf9b21afad. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… Patch: https://github.com/kamailio/kamailio/commit/f19cff46ae1f27a456e276ea891154a… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 5f4626b8d6..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

[kamailio/kamailio] ASAN: (Issue #2932)
by sergey-safarov 19 Nov '21

19 Nov '21

I have compiled Kamailio with ASAN When I start Kamailio I this error ``` core/re.c:390:2: runtime error: null pointer passed as argument 2, which is declared to never be null ``` [Link to code](https://github.com/kamailio/kamailio/blob/master/src/core/re.c#L390) ``` Breakpoint 1, replace_build (match=0xffffb0140fc0 "KZQ_CHECK_MEDIA_SERVER_INSERT", nmatch=1, pmatch=0xffffb01410a8, se=0xffffb00b9bc0, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0141120) at core/re.c:390 390 RBUF_APPEND(dest, p, end-p); (gdb) Continuing. Breakpoint 1, replace_build (match=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", nmatch=1, pmatch=0xffffb0162b60, se=0xffffb0162730, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0162bd8) at core/re.c:390 390 RBUF_APPEND(dest, p, end-p); (gdb) p p $4 = 0x0 (gdb) list 385 default: 386 LM_CRIT("unknown type %d\n", se->replace[r].type); 387 /* ignore it */ 388 } 389 } 390 RBUF_APPEND(dest, p, end-p); 391 rpl->len = dest - rbuf; 392 if ((rpl->s = pkg_malloc(rpl->len)) == NULL) { 393 PKG_MEM_ERROR; 394 goto error; (gdb) bt #0 replace_build (match=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", nmatch=1, pmatch=0xffffb0162b60, se=0xffffb0162730, msg=0x332ebe0 <_faked_msg>, rpl=0xffffb0162bd8) at core/re.c:390 #1 0x0000000000f91dc4 in subst_run (se=0xffffb0162730, input=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", msg=0x332ebe0 <_faked_msg>, count=0x0) at core/re.c:460 #2 0x0000000000f926a0 in subst_str (input=0xffffb0162a78 "auth_cache=>size=16;autoexpire=7200;REGISTRAR_S_WARM_CACHE", msg=0x332ebe0 <_faked_msg>, se=0xffffb0162730, count=0x0) at core/re.c:502 #3 0x00000000011e7d0c in pp_subst_run (data=0x338ba20 <s_buf>) at core/ppcfg.c:216 #4 0x00000000018b1f98 in yylex () at core/cfg.lex:1278 #5 0x0000000001900660 in yyparse () at core/cfg.tab.c:5160 #6 0x000000000048c4e4 in main (argc=11, argv=0xfffffffff3b8) at main.c:2487 ``` -- 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/2932

2 2

git:master:136071c4: core: re - check source of memcpy
by Daniel-Constantin Mierla 19 Nov '21

19 Nov '21

Module: kamailio Branch: master Commit: 136071c4a3cd306ef1043b02d1b61ce7d37efa52 URL: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-19T08:25:45+01:00 core: re - check source of memcpy --- Modified: src/core/re.c --- Diff: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… Patch: https://github.com/kamailio/kamailio/commit/136071c4a3cd306ef1043b02d1b61ce… --- diff --git a/src/core/re.c b/src/core/re.c index 4ce18d8c4d..47322284b6 100644 --- a/src/core/re.c +++ b/src/core/re.c @@ -339,8 +339,10 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, LM_ERR("Buffer too small\n"); \ goto error; \ } \ - memcpy((dst), (src), (size)); \ - (dst) += (size); + if(likely(src)) { \ + memcpy((dst), (src), (size)); \ + (dst) += (size); \ + } p=se->replacement.s; end=p+se->replacement.len;

1 0

git:master:7f89e4cc: core: mechanism to execute child_init() for special ranks on demand
by Daniel-Constantin Mierla 18 Nov '21

18 Nov '21

Module: kamailio Branch: master Commit: 7f89e4cc5c84b720928c2936c9e2e0630aebec9e URL: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-18T14:33:28+01:00 core: mechanism to execute child_init() for special ranks on demand - new special rank PROC_POSTCHILDINIT, to execute child_init() for main process only when ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT) is executed in mod_init() --- Modified: src/core/sr_module.c Modified: src/core/sr_module.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06… Patch: https://github.com/kamailio/kamailio/commit/7f89e4cc5c84b720928c2936c9e2e06…

1 0

[kamailio/kamailio] pv: new variable $xavp_count (PR #2936)
by Nicolas C 18 Nov '21

18 Nov '21

Retrieve the number of rows stored in an xavp As discussed on the mailing list, this is useful to at least two people. #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ x ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ x ] PR should be backported to stable branches - [ x ] Tested changes locally You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2936 -- Commit Summary -- * pv: new variable $xavp_count -- File Changes -- M src/modules/pv/pv.c (3) M src/modules/pv/pv_xavp.c (33) M src/modules/pv/pv_xavp.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2936.patch https://github.com/kamailio/kamailio/pull/2936.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/2936

2 5

git:5.4:52c6c54e: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted
by Victor Seva 18 Nov '21

18 Nov '21

Module: kamailio Branch: 5.4 Commit: 52c6c54ecefaad4d0fab514b0e11169bdd99e25e URL: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:42:21+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 (cherry picked from commit fa6038172c0095287096c7021ca5dadad728cfaa) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… Patch: https://github.com/kamailio/kamailio/commit/52c6c54ecefaad4d0fab514b0e11169… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 81b89b46c7..3acb2937f7 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1609,13 +1609,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1631,10 +1630,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1652,13 +1658,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1737,15 +1738,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1753,7 +1753,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1800,7 +1800,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -1835,7 +1835,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

1 0

git:5.5:a9889437: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted
by Victor Seva 18 Nov '21

18 Nov '21

Module: kamailio Branch: 5.5 Commit: a988943760ffecd07c10a45bd8be5bf0165057b2 URL: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:40:18+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 (cherry picked from commit fa6038172c0095287096c7021ca5dadad728cfaa) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… Patch: https://github.com/kamailio/kamailio/commit/a988943760ffecd07c10a45bd8be5bf… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 1392a0af2a..9e45a61079 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1609,13 +1609,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1631,10 +1630,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1652,13 +1658,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1737,15 +1738,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1753,7 +1753,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1800,7 +1800,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -1835,7 +1835,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

1 0

git:master:fa603817: nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted
by Victor Seva 18 Nov '21

18 Nov '21

Module: kamailio Branch: master Commit: fa6038172c0095287096c7021ca5dadad728cfaa URL: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… Author: Dmitry Wagin <dmitry.wagin(a)ya.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-18T11:16:31+01:00 nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted - doesn't throw an error while "a=rtcp" param is omitted (RFC1889 behavior) or address is omitted - replace_sdp_ip() returns 0 on omitted IP-address - added param can_omit to replace_sdp_ip() fixes #2784 regression introduced by #2497 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… Patch: https://github.com/kamailio/kamailio/commit/fa6038172c0095287096c7021ca5dad… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index bd71eaafc4..ed81edf691 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1777,13 +1777,12 @@ static int is_rfc1918_f(struct sip_msg *msg, char *str1, char *str2) #define AOLDMEDPRT_LEN (sizeof(AOLDMEDPRT) - 1) -/* replace ip addresses in SDP and return umber of replacements */ +/* replace ip addresses in SDP and return number of replacements */ static inline int replace_sdp_ip( - struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen) + struct sip_msg *msg, str *org_body, char *line, str *ip, int linelen, int can_omit) { str body1, oldip, newip; str body = *org_body; - unsigned hasreplaced = 0; int pf, pf1 = 0; str body2; char *bodylimit = body.s + body.len; @@ -1799,10 +1798,17 @@ static inline int replace_sdp_ip( } body1 = body; for(;;) { - if(nh_extract_mediaip(&body1, &oldip, &pf, line, linelen) == -1) + ret = nh_extract_mediaip(&body1, &oldip, &pf, line, linelen); + if(ret == 0) break; - if(pf != AF_INET) { - LM_ERR("not an IPv4 address in '%s' SDP\n", line); + if(ret == -1) { + if(can_omit) { + body2.s = body1.s + linelen; + body2.len = bodylimit - body2.s; + body1 = body2; + continue; + } + LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } if(!pf1) @@ -1820,13 +1826,8 @@ static inline int replace_sdp_ip( return -1; } count += ret; - hasreplaced = 1; body1 = body2; } - if(!hasreplaced && linelen>=6 && memcmp("a=rtcp", line, 6)!=0) { - LM_ERR("can't extract '%s' IP from the SDP\n", line); - return -1; - } return count; } @@ -1905,15 +1906,14 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & (FIX_MEDIP | FIX_ORGIP)) { /* Iterate all a=rtcp and replace ips in them. rfc3605 */ - ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6); + ret = replace_sdp_ip(msg, &body, "a=rtcp", (ip && ip->len>0) ? ip : 0, 6, 1); if(ret == -1) - LM_DBG("a=rtcp parameter does not exist. nothing to do.\n"); - else - count += ret; + return -1; + count += ret; if(level & FIX_MEDIP) { /* Iterate all c= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "c=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1921,7 +1921,7 @@ static int ki_fix_nated_sdp_ip(sip_msg_t *msg, int level, str *ip) if(level & FIX_ORGIP) { /* Iterate all o= and replace ips in them. */ - ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2); + ret = replace_sdp_ip(msg, &body, "o=", (ip && ip->len>0) ? ip : 0, 2, 0); if(ret == -1) return -1; count += ret; @@ -1968,7 +1968,7 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = cp1 + linelen; } if(cp1 == NULL) - return -1; + return 0; mediaip->s = cp1 + linelen; mediaip->len = @@ -2003,7 +2003,6 @@ static int nh_extract_mediaip(str *body, str *mediaip, int *pf, char *line, cp = eat_space_end(cp + len, mediaip->s + mediaip->len); } if(nextisip != 2 || mediaip->len == 0) { - LM_ERR("no `IP[4|6]' in `%s' field\n", line); return -1; } return 1;

1 0

[kamailio/kamailio] nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted (#2784)
by Dmitry Wagin 18 Nov '21

18 Nov '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) - [x] No commits to README files for modules (changes must be done to docbook files in doc/ subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2459, #2768 #### Description There's a small regression after #2497. If SDP didn't have an "a=rtcp" header (RFC1889 behavior), Kamailio had thrown an Error `can't extract 'a=rtcp' IP from the SDP` on every INVITE. After the PR Kamailio does not flood into log. Also refactored #2769. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2784 -- Commit Summary -- * nathelper: fix_nated_sdp added ignoring RFC3605-param if omitted -- File Changes -- M src/modules/nathelper/nathelper.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2784.patch https://github.com/kamailio/kamailio/pull/2784.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/2784

4 14

git:master:1a68ddfc: pv: new transformation class {val}
by Daniel-Constantin Mierla 17 Nov '21

17 Nov '21

Module: kamailio Branch: master Commit: 1a68ddfcbe46cfa4d956a1541f17517d9ba94381 URL: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-17T17:16:17+01:00 pv: new transformation class {val} - {val.n0} - return int 0 instead of $null value, or existing value - {val.json} - if value is $null, return empty string; if value is string, then it is escaped for use as json value (without surrounding quotes) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517… Patch: https://github.com/kamailio/kamailio/commit/1a68ddfcbe46cfa4d956a1541f17517…

1 0

[kamailio/kamailio] presence: add option to return 200 instead of 202 on subscriptions (PR #2937)
by Laurențiu Nicola 17 Nov '21

17 Nov '21

Backport of #2930 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2937 -- Commit Summary -- * presence: add option to return 200 instead of 202 on subscriptions -- File Changes -- M src/modules/presence/doc/presence_admin.xml (25) M src/modules/presence/presence.c (2) M src/modules/presence/presence.h (1) M src/modules/presence/subscribe.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2937.patch https://github.com/kamailio/kamailio/pull/2937.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/2937

2 2

git:master:08ce00c4: core: relocate str json escape function to strutils
by Daniel-Constantin Mierla 17 Nov '21

17 Nov '21

Module: kamailio Branch: master Commit: 08ce00c43409e9ee7c0797413ce17b68da9a2ed8 URL: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-17T12:49:56+01:00 core: relocate str json escape function to strutils --- Modified: src/core/dprint.c Modified: src/core/strutils.c Modified: src/core/strutils.h --- Diff: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6… Patch: https://github.com/kamailio/kamailio/commit/08ce00c43409e9ee7c0797413ce17b6…

1 0

ki_jsonrpcs_dispatch(): invalid json doc
by Patrick Karton 16 Nov '21

16 Nov '21

hello , im using kamailio and rtpengine. i use rtpengine with rtp timeout as follows rtpengine --timeout=240 --silent-timeout=600 -b2b-url=http://kamailioip:5060/RPC --xmlrpc-format=2 and in kamailio modparam("jsonrpcs", "pretty_format", 1) modparam("jsonrpcs", "transport", 7) event_route[xhttp:request] { if ($hu =~ "^/RPC") { jsonrpc_dispatch(); xhttp_reply("200", "OK", "text/xml", "<methodResponse><params><param><value><string>OK</string></value></param></params></methodResponse>"); exit; } } rtpengine successfully reaches the rpc endpoint but i have an error on the jsonrpcs module 43(50) ERROR: jsonrpcs [jsonrpcs_mod.c:1275]: ki_jsonrpcs_dispatch(): invalid json doc [[<?xml version="1.0" encoding="UTF-8"?> <methodCall> <methodName>dlg.terminate_dlg</methodName> <params> <param><value><string>1-10(a)172.22.244.139</string></value></param> <param><value><string>10SIPpTag091</string></value></param> <param><value><string>8U173ymKpc1pp</string></value></param> </params> </methodCall> ]] and so the dialog module can not ends the call Kamailio 5.5.2 on debian bullseye rtpengine 10.0.1.8 on debian bullseye Thanks.

2 2

git:master:adb4d30a: pv: new variable $rsi - return status code for replies and 0 for requests
by Daniel-Constantin Mierla 16 Nov '21

16 Nov '21

Module: kamailio Branch: master Commit: adb4d30a985b8f1425934f5bf22295b7ad62c249 URL: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-16T09:10:38+01:00 pv: new variable $rsi - return status code for replies and 0 for requests --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… Patch: https://github.com/kamailio/kamailio/commit/adb4d30a985b8f1425934f5bf22295b… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 65108bdc8c..9de6bc49af 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -379,6 +379,9 @@ static pv_export_t mod_pvs[] = { {{"rs", (sizeof("rs")-1)}, /* */ PVT_OTHER, pv_get_status, 0, 0, 0, 0, 0}, + {{"rsi", (sizeof("rsi")-1)}, /* */ + PVT_OTHER, pv_get_statusi, 0, + 0, 0, 0, 0}, {{"rt", (sizeof("rt")-1)}, /* */ PVT_OTHER, pv_get_refer_to, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 352114d259..ac15bfac2b 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -248,6 +248,20 @@ int pv_get_status(struct sip_msg *msg, pv_param_t *param, &msg->first_line.u.reply.status); } +int pv_get_statusi(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type != SIP_REPLY) + return pv_get_sintval(msg, param, res, 0); + + return pv_get_intstrval(msg, param, res, + (int)msg->first_line.u.reply.statuscode, + &msg->first_line.u.reply.status); +} + int pv_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 6406d9054a..5e0f6860b5 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -55,6 +55,9 @@ int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_statusi(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_reason(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:03050d70: core: new flag p for json logging
by Daniel-Constantin Mierla 16 Nov '21

16 Nov '21

Module: kamailio Branch: master Commit: 03050d7046a7a356cd5fdd31d32003dbac73fb0a URL: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-16T08:40:49+01:00 core: new flag p for json logging - prefix is printed as it is in the root json, expected to be a list of json field starting with comma --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d… Patch: https://github.com/kamailio/kamailio/commit/03050d7046a7a356cd5fdd31d32003d…

1 0

git:master:7c7f967e: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 7c7f967e6c66a119c5aa9e64fbd447b48ecd8875 URL: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-15T19:16:14+01:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b… Patch: https://github.com/kamailio/kamailio/commit/7c7f967e6c66a119c5aa9e64fbd447b…

1 0

git:master:33db4765: presence: add option to return 200 instead of 202 on subscriptions
by Henning Westerholt 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 33db47652628b299c96a591ec939ca2ea9f6e268 URL: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2… Author: LaurenÈiu Nicola <lnicola(a)dend.ro> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-11-15T19:04:26+01:00 presence: add option to return 200 instead of 202 on subscriptions RFC6665 mandates 200 return codes, although 202 seems mandated by RFC3265. We add a new parameter, `subs_respond_200`, to control this. --- Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2… Patch: https://github.com/kamailio/kamailio/commit/33db47652628b299c96a591ec939ca2…

1 0

git:master:34300dd8: modules: readme files regenerated - permissions ... [skip ci]
by Kamailio Dev 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 34300dd8db7d52c639307f4121f8e61619a53f99 URL: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-15T10:46:22+01:00 modules: readme files regenerated - permissions ... [skip ci] --- Modified: src/modules/permissions/README --- Diff: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61… Patch: https://github.com/kamailio/kamailio/commit/34300dd8db7d52c639307f4121f8e61…

1 0

[kamailio/kamailio] permissions: crash during a RPC reload of trusted (Issue #2909)
by Victor Seva 15 Nov '21

15 Nov '21

### Description We are having several customers with crashes during calls to RPC `permissions.trustedReload` even after introducing the basic safety for concurrent RPC reload https://github.com/kamailio/kamailio/commit/c87f5202d778cf110ce0fbbc554310c… ### Possible solution It seems that we need to implement locking in order to be sure the memory is not gone in the middle of a read. #### Reproduction It's quite difficult to reproduce since `match_hash_table` call has to happen during a RPC reload #### Debugging Data ``` (gdb) bt full #0 match_hash_table (table=<optimized out>, msg=msg@entry=0x7fc3d800a808, src_ip_c_str=src_ip_c_str@entry=0x7fc3d7f217b8 "A.A.A.A", proto=proto@entry=1, from_uri=from_uri@entry=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at hash.c:280 __func__ = "match_hash_table" ruri = <optimized out> ruri_string = "sip:41584006001@B.B.B.B:5060\000\264{\224\377\177\000\000\000\240\200\331\302\177\000\000\300\000\000\000\000\000\000\000\332\003\000\000\000\000\000\000\300\067~\372PV\000\000\000\220 \324m,\233߁\260\341D\334\302\177\000\000\260go\372PV\000\000P\343!\332\302\177\000\000\004\340{\372PV\000\000`;~\372PV\000\000\300\067~\372PV\000\000@\024\000\000\000\000\000\000`\342!\332\302\177\000\000\001\00 0\000\000\000\000\000\000\310\066\204\331\302\177\000\000\000\240\200\331\302\177\000\000\300\000\000\000\000\000\000\000\300\067~\372PV\000\000`;~\372PV\000\000\332\003\000\000\000\000\000\000\000"... preg = {__buffer = 0x0, __allocated = 0, __used = 224, __syntax = 16843462, __fastmap = 0x0, __translate = 0x0, re_nsub = 0, __can_be_null = 0, __regs_allocated = 0, __fastmap_accurate = 1, __no_sub = 1, __not_bol = 0, __not_eol = 0, __newline_anchor = 0} np = 0x455449564e492035 src_ip = {s = 0x7fc3d7f217b8 "A.A.A.A", len = <optimized out>} val = <optimized out> count = 0 #1 0x00007fc3d2362765 in allow_trusted (msg=msg@entry=0x7fc3d800a808, src_ip=0x7fc3d7f217b8 "A.A.A.A", proto=proto@entry=1, from_uri=from_uri@entry=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at trusted.c:499 __func__ = "allow_trusted" result = <optimized out> res = 0x0 keys = {0x7fc3d7f1b750} vals = {{type = 3595139888, nul = 32707, free = -671045624, val = {int_val = -1803829520, ll_val = 140735684525808, double_val = 6.9532666868153257e-310, time_val = 140735684525808, string_val = 0x7fff947bbef0 "\001", str_val = {s = 0x7fff947bbef0 "\001", len = -94468017}, blob_val = {s = 0x7fff947bbef0 "\001", len = -94468017}, bitmap_val = 2491137776, uint_val = 2491137776, ull_val = 140735684525808}}} cols = {0x0, 0x5650fa650c25 <pv_printf+229>, 0x7fff947bb670, 0x0} #2 0x00007fc3d2363ef3 in allow_trusted_furi (_msg=_msg@entry=0x7fc3d800a808, _src_ip_sp=_src_ip_sp@entry=0x7fc3d6494340 "xEI\326\303\177", _proto_sp=_proto_sp@entry=0x7fc3d64925e0 "\330\375H\326\303\177", from_uri=0x7fc3d7f1b750 "sip:fake@B.B.B.B") at trusted.c:590 src_ip = {s = 0x7fc3d7f217b8 "A.A.A.A", len = 11} proto = {s = 0x7fc3d7f27820 "udp", len = 3} proto_int = 1 __func__ = "allow_trusted_furi" #3 0x00007fc3d23647d0 in allow_trusted_3 (_msg=0x7fc3d800a808, _src_ip_sp=0x7fc3d6494340 "xEI\326\303\177", _proto_sp=0x7fc3d64925e0 "\330\375H\326\303\177", _from_uri=<optimized out>) at trusted.c:634 from_uri = {s = 0x7fc3d7f1b750 "sip:fake@B.B.B.B", len = 34} __func__ = "allow_trusted_3" #4 0x00005650fa513319 in do_action (h=h@entry=0x7fff947bbef0, a=a@entry=0x7fc3d6497b30, msg=msg@entry=0x7fc3d800a808) at core/action.c:1085 ``` -- 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/2909

1 1

[kamailio/kamailio] permissions: implement lock for trusted hash (PR #2910)
by Victor Seva 15 Nov '21

15 Nov '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) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #2909 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2910 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2910/commits/0b424ca7b7a8ac7f2e3e…">permissions: implement lock for trusted hash</a> -- File Changes -- M src/modules/permissions/permissions.c (6) M src/modules/permissions/rpc.c (6) M src/modules/permissions/trusted.c (16) M src/modules/permissions/trusted.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2910.patch https://github.com/kamailio/kamailio/pull/2910.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/2910

2 12

git:master:ea4c09d8: permissions: add trusted_cleanup_interval documentation [skip ci]
by Victor Seva 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: ea4c09d8a93cf7f79901628573a62e2571781d88 URL: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: add trusted_cleanup_interval documentation [skip ci] --- Modified: src/modules/permissions/doc/permissions_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… Patch: https://github.com/kamailio/kamailio/commit/ea4c09d8a93cf7f79901628573a62e2… --- diff --git a/src/modules/permissions/doc/permissions_admin.xml b/src/modules/permissions/doc/permissions_admin.xml index e3b65816e5..2c55f246c7 100644 --- a/src/modules/permissions/doc/permissions_admin.xml +++ b/src/modules/permissions/doc/permissions_admin.xml @@ -869,6 +869,27 @@ modparam("permissions", "load_backends", 1) <programlisting format="linespecific"> ... modparam("permissions", "reload_delta", 1) +... + </programlisting> + </example> + </section> + <section id ="permissions.p.trusted_cleanup_interval"> + <title><varname>trusted_cleanup_interval</varname> (int)</title> + <para> + If module parameter <varname>db_mode</varname> is set to 1 a cleanup timer + is set to the trusted_cleanup_interval value in seconds. + This process will cleanup the previous values from memory after a RPC reload. + </para> + <para> + <emphasis> + Default value is <quote>60</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>trusted_cleanup_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "trusted_cleanup_interval", 120) ... </programlisting> </example>

1 0

git:master:fae3611c: permissions: don't remove old data at the end of the reload process
by Victor Seva 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: fae3611c873738d42a979d96e0d0b47af726bc47 URL: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: don't remove old data at the end of the reload process --- Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… Patch: https://github.com/kamailio/kamailio/commit/fae3611c873738d42a979d96e0d0b47… --- diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 2f9c7d42a4..7714a32461 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -59,7 +59,6 @@ int reload_trusted_table(void) db_val_t* val; struct trusted_list **new_hash_table; - struct trusted_list **old_hash_table; int i; int priority; @@ -160,9 +159,7 @@ int reload_trusted_table(void) perm_dbf.free_result(perm_db_handle, res); - old_hash_table = *perm_trust_table; *perm_trust_table = new_hash_table; - empty_hash_table(old_hash_table); LM_DBG("trusted table reloaded successfully.\n");

1 0

git:master:0a6a750a: permissions: trusted_cleanup_interval
by Victor Seva 15 Nov '21

15 Nov '21

Module: kamailio Branch: master Commit: 0a6a750a96b620b3024acd391436a94def3133e1 URL: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-15T10:35:54+01:00 permissions: trusted_cleanup_interval cleanup old data of trusted hash_table by timer function. --- Modified: src/modules/permissions/permissions.c Modified: src/modules/permissions/permissions.h Modified: src/modules/permissions/trusted.c --- Diff: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… Patch: https://github.com/kamailio/kamailio/commit/0a6a750a96b620b3024acd391436a94… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 12ab2d889a..d5655206e4 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -61,6 +61,7 @@ static char* perm_deny_suffix = ".deny"; /* for allow_trusted and allow_address function */ str perm_db_url = {NULL, 0}; /* Don't connect to the database by default */ int perm_reload_delta = 5; +int perm_trusted_table_interval = 60; /* for allow_trusted function */ int perm_db_mode = DISABLE_CACHE; /* Database usage mode: 0=no cache, 1=cache */ @@ -188,6 +189,7 @@ static param_export_t params[] = { {"max_subnets", PARAM_INT, &_perm_max_subnets }, {"load_backends", PARAM_INT, &_perm_load_backends }, {"reload_delta", PARAM_INT, &perm_reload_delta }, + {"trusted_cleanup_interval", PARAM_INT, &perm_trusted_table_interval }, {0, 0, 0} }; diff --git a/src/modules/permissions/permissions.h b/src/modules/permissions/permissions.h index 2a417ffd58..c08666a1c0 100644 --- a/src/modules/permissions/permissions.h +++ b/src/modules/permissions/permissions.h @@ -60,6 +60,7 @@ extern str perm_mask_col; /* Name of mask column */ extern str perm_port_col; /* Name of port column */ extern int perm_peer_tag_mode; /* Matching mode */ extern int perm_reload_delta; /* seconds between RPC reloads */ +extern int perm_trusted_table_interval; /* interval of timer to clean old trusted data */ /* backends to be loaded */ #define PERM_LOAD_ADDRESSDB (1<<0) diff --git a/src/modules/permissions/trusted.c b/src/modules/permissions/trusted.c index 7714a32461..49e871a125 100644 --- a/src/modules/permissions/trusted.c +++ b/src/modules/permissions/trusted.c @@ -166,6 +166,7 @@ int reload_trusted_table(void) return 1; } +void perm_ht_timer(unsigned int ticks, void *); /* * Initialize data structures @@ -224,6 +225,9 @@ int init_trusted(void) goto error; } + if(register_timer(perm_ht_timer, NULL, perm_trusted_table_interval) < 0) + goto error; + perm_dbf.close(perm_db_handle); perm_db_handle = 0; } @@ -280,6 +284,22 @@ int init_child_trusted(int rank) } +void perm_ht_timer(unsigned int ticks, void *param) { + if(perm_rpc_reload_time == NULL) + return; + + if(*perm_rpc_reload_time != 0 + && *perm_rpc_reload_time > time(NULL) - perm_trusted_table_interval) + return; + + LM_DBG("cleaning old trusted table\n"); + if (*perm_trust_table == perm_trust_table_1) { + empty_hash_table(perm_trust_table_2); + } else { + empty_hash_table(perm_trust_table_1); + } +} + /* * Close connections and release memory */

1 0

[kamailio/kamailio] nats module subscriber issue when connected to more "nats_urls" (Issue #2916)
by Stefan Mititelu 14 Nov '21

14 Nov '21

### Description, Troubleshooting, Reproduction I have 3 go nats servers running and the following kamailio config for nats: ``` modparam("nats", "nats_url", "nats://127.0.0.1:4222") modparam("nats", "nats_url", "nats://127.0.0.2:4222") modparam("nats", "nats_url", "nats://127.0.0.3:4222") modparam("nats", "subject_queue_group", "foo:2020") ... event_route[nats:foo] { xlog("L_ERR", "==============> received $natsData"); } ``` I try to publish using some nats publisher (e.g. nats.c example/libuv-pub.c), and nothing gets printed in event route: ``` ./pub -s nats://127.0.0.1:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log NOT printed ./pub -s nats://127.0.0.2:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log NOT printed ``` However, if I try to publish on the last server "127.0.0.3", log *is* printed: ``` ./pub -s nats://127.0.0.3:4222 -txt "aaaaaaaaaaaa" -count 1 // event route log IS printed ``` I expected to see 1 log message for each of the above publish(es). Found this while implementing and testing #2915 Thanks, Stefan -- 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/2916

2 3

[kamailio/kamailio] asan: left shift of 255 by 24 places cannot be represented in type 'int' (Issue #2926)
by sergey-safarov 14 Nov '21

14 Nov '21

``` [root@sbc-stage config]# kamcmd cfg.seti core debug 2 ../../src/modules/ctl/binrpc.h:219:34: runtime error: left shift of 255 by 24 places cannot be represented in type 'int' ``` Daniel @miconda could you look. -- 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/2926

2 6

[kamailio/kamailio] Selective tracing of locally generated messages (Issue #2933)
by xaled1 14 Nov '21

14 Nov '21

For selectively tracing sip messages *sent* by kamailio, we successfully use onsend_route: but this works for forwarded requests/responses only. For locally generated messages, there does not seem to be a reliable method: – tm:local-request: message is usually not final, not executed for locally generated ACK and CANCEL – tm:local-response: works for responses only (triggered *after* sending) – sl:local-response: works for responses only (triggered *after* sending) We also tried event_route[network:msg], but sip_trace() does not work there (msg not parsed/available?). Might it be possible to add a core option "onsend_route_localsrc", that can be enabled to make kamailio trigger onsend_route also for locally generated requests (and also locally generated responses, if "onsend_route_reply" is enabled)? -- 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/2933

2 2

git:master:908ca872: acc: set again the type of db vals
by Daniel-Constantin Mierla 14 Nov '21

14 Nov '21

Module: kamailio Branch: master Commit: 908ca872bec956d5f755a1b51df781bf66ad3866 URL: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T10:31:38+01:00 acc: set again the type of db vals - work properly when nullable modparam is set and var can be null on some transactions --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… Patch: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index b75e155743..dce7ee0a8b 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -466,7 +466,9 @@ int acc_db_request( struct sip_msg *rq) LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { - LM_DBG("attr[%d] is STR\n", i); + LM_DBG("attr[%d] is STR len=%d\n", i, val_arr[i].len); + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i) = val_arr[i]; } } @@ -502,6 +504,8 @@ int acc_db_request( struct sip_msg *rq) if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { VAL_NULL(db_vals + i) = 1; } else { + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i)=val_arr[i]; } }

1 0

git:master:b3e8d030: ctl: use unsigned int for bit left shifting
by Daniel-Constantin Mierla 14 Nov '21

14 Nov '21

Module: kamailio Branch: master Commit: b3e8d03038402dec78b4845255f34862407983c9 URL: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T20:23:08+01:00 ctl: use unsigned int for bit left shifting - deal with runtime error: left shift of X by N places cannot be represented in type 'int' --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Patch: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index bd7e2cb9c5..cb7204fffd 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -215,12 +215,15 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, int i, int *len) { int size; + unsigned int u; - for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); + u = (unsigned int)i; + + for (size=4; size && ((u & (0xffu<<24))==0); u<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ - *p=(unsigned char)(i>>24); - i<<=8; + *p=(unsigned char)(u>>24); + u<<=8; } return p; } @@ -515,24 +518,28 @@ static inline int binrpc_addfault( struct binrpc_pkt* pkt, static inline unsigned char* binrpc_read_int( int* i, int len, - unsigned char* s, + unsigned char* s, unsigned char* end, int *err ) { unsigned char* start; - + unsigned int u; + start=s; *i=0; + u = 0; *err=0; for(;len>0; len--, s++){ if (s>=end){ *err=E_BINRPC_MORE_DATA; + *i = (int)u; return start; } - *i<<=8; - *i|=*s; + u<<=8; + u|=*s; }; + *i = (int)u; return s; }

1 0

git:master:c4c9e6f5: core: json logging - apply j flag for prefix field
by Daniel-Constantin Mierla 12 Nov '21

12 Nov '21

Module: kamailio Branch: master Commit: c4c9e6f50306addd12ccf9fa03743c664e5442f1 URL: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T14:17:18+01:00 core: json logging - apply j flag for prefix field --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6… Patch: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6…

1 0

get Received interface name
by Patrick Karton 12 Nov '21

12 Nov '21

Hello, i declare my interfaces like that in configuration listen=udp:SIP_EXTERNAL_IP:5060 name "external" listen=udp:SIP_INTERNAL_IP:5060 name "internal" how do i get the inferface name where the request was received ? i saw some pseudo variables that deals with received interface but it is always about ip or port or proto but not the interface name ( external or internal like mentioned in the configuration file ). Thanks

1 0

match e2e proxied ACK Request when INVITE Transaction is still in memory
by Patrick Karton 12 Nov '21

12 Nov '21

Hello , i want to know how can i match e2e ACK when the INVITE TRansaction is still in memory. t_check_trans() normally return 1 if we receive e2e ACK but i always get 0 even when the INVITE transaction is still in memory ( wt_timer param of tm module ). Thanks.

2 6

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev