sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

[kamailio/kamailio] path: insert flow token in path header with received (#1261)

by Rick

#### 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  - added the possiblity to have the received parameter and flow toke in the add_path_received function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1261 -- Commit Summary -- * path: insert flow token in path header with received -- File Changes -- M src/modules/path/doc/path_admin.xml (9) M src/modules/path/path.c (78) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1261.patch https://github.com/kamailio/kamailio/pull/1261.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/1261

6 years, 6 months

git:master:fa8441fb: Merge pull request #1261 from dunst0/feature/flowTokenAndReceived

by GitHub

Module: kamailio Branch: master Commit: fa8441fb92460d235d8aa7cbf2611b07dfa6230b URL: https://github.com/kamailio/kamailio/commit/fa8441fb92460d235d8aa7cbf2611b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-09T16:32:20+02:00 Merge pull request #1261 from dunst0/feature/flowTokenAndReceived path: insert flow token in path header with received --- Modified: src/modules/path/doc/path_admin.xml Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/fa8441fb92460d235d8aa7cbf2611b0… Patch: https://github.com/kamailio/kamailio/commit/fa8441fb92460d235d8aa7cbf2611b0…

6 years, 6 months

git:master:3c04bda0: path: insert flow token in path header with received

by Rick Barenthin

Module: kamailio Branch: master Commit: 3c04bda005430206dd1b9da4f11b474ab8fea363 URL: https://github.com/kamailio/kamailio/commit/3c04bda005430206dd1b9da4f11b474… Author: Rick Barenthin <dunst0(a)gmail.com> Committer: Rick Barenthin <dunst0(a)gmail.com> Date: 2017-10-04T17:41:39+02:00 path: insert flow token in path header with received - added the possiblity to have the received parameter and flow toke in the add_path_received function --- Modified: src/modules/path/doc/path_admin.xml Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/3c04bda005430206dd1b9da4f11b474… Patch: https://github.com/kamailio/kamailio/commit/3c04bda005430206dd1b9da4f11b474…

6 years, 6 months

git:master:08f81795: modules: readme files regenerated - db_flatstore ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 08f817957d1f262aaf5ef4b927c1e9c64a70ec9c URL: https://github.com/kamailio/kamailio/commit/08f817957d1f262aaf5ef4b927c1e9c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-09T16:31:28+02:00 modules: readme files regenerated - db_flatstore ... [skip ci] --- Modified: src/modules/db_flatstore/README --- Diff: https://github.com/kamailio/kamailio/commit/08f817957d1f262aaf5ef4b927c1e9c… Patch: https://github.com/kamailio/kamailio/commit/08f817957d1f262aaf5ef4b927c1e9c… --- diff --git a/src/modules/db_flatstore/README b/src/modules/db_flatstore/README index a8d45e8d9e..16164ce65d 100644 --- a/src/modules/db_flatstore/README +++ b/src/modules/db_flatstore/README @@ -5,7 +5,14 @@ Jan Janak FhG FOKUS <jan(a)iptel.org> +Julien Chavanton + + Flowroute + <jchavanton(a)gmail.com> + Copyright © 2004, 2005 FhG FOKUS + + Copyright © 2017 Flowroute __________________________________________________________________ Table of Contents @@ -19,6 +26,7 @@ Jan Janak 2. Parameters 2.1. flush (integer) + 2.2. encode_delimiter (integer) Chapter 1. Admin Guide @@ -31,6 +39,7 @@ Chapter 1. Admin Guide 2. Parameters 2.1. flush (integer) + 2.2. encode_delimiter (integer) 1. Overview @@ -81,10 +90,11 @@ modparam("acc", "db_url", "flatstore:/var/log/acc") 1.1. Rotating Log Files The module implements a Kamailio management interface command called - flatstore.rotate. When Kamailio receives the command it will close and - reopen all files used by the db_flatstore module. The rotation itself - has to be done by another application (such as logrotate). Follow these - steps to rotate files generated by the db_flatstore module: + flatstore.k_rotate. When Kamailio receives the command it will close + and reopen all files used by the db_flatstore module. The rotation + itself has to be done by another application (such as logrotate). + Follow these steps to rotate files generated by the db_flatstore + module: * Rename the files that you want to rotate: cd /var/log/acc mv acc_1.log acc_1.log.20050605 @@ -95,7 +105,7 @@ mv acc_4.log acc_3.log.20050605 into the renamed files. * Send Kamailio the management command to close and reopen the renamed files: -kamcmd flatstore.rotate +kamcmd flatstore.k_rotate This will force Kamailio to close the renamed files and open new ones with original names, such as acc_1.log. New files will be open at the point when Kamailio has some data to write. It is normal @@ -106,9 +116,18 @@ kamcmd flatstore.rotate 2. Parameters 2.1. flush (integer) + 2.2. encode_delimiter (integer) 2.1. flush (integer) Enable or disable flushing after each write. Default value is 1. + +2.2. encode_delimiter (integer) + + Enable or disable encoding tof the escaped character using ""%" HEX + HEX" mechanism for escaping from RFC 2396 + + Default value is 1. Default delimiter '|' is replaced with %7C if found + in any string

6 years, 6 months

git:master:c203af8d: Merge pull request #1262 from jchavanton/db_flatstore_delimiter

by GitHub

Module: kamailio Branch: master Commit: c203af8d977cd977f2614d22fab84fead07dc25a URL: https://github.com/kamailio/kamailio/commit/c203af8d977cd977f2614d22fab84fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-10-09T16:29:17+02:00 Merge pull request #1262 from jchavanton/db_flatstore_delimiter db_flatstore: encode delimiter param --- Modified: src/modules/db_flatstore/db_flatstore.c Modified: src/modules/db_flatstore/doc/db_flatstore.xml Modified: src/modules/db_flatstore/doc/db_flatstore_params.xml Modified: src/modules/db_flatstore/km_flatstore.c Modified: src/modules/db_flatstore/km_flatstore.h --- Diff: https://github.com/kamailio/kamailio/commit/c203af8d977cd977f2614d22fab84fe… Patch: https://github.com/kamailio/kamailio/commit/c203af8d977cd977f2614d22fab84fe…

6 years, 6 months

[kamailio/kamailio] db_flatstore: encode delimiter param (#1262)

by Julien Chavanton

using ""%" HEX HEX" mechanism for escaping from RFC 2396 #### 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 I consider it non breaking because with the existing a field containing an ASCII vertical bar '|' would break the separator count and result in broken CDRs, etc. in this case changing the default behavior is probably recommended, someone could abuse this flaw. Test: consider the following message, the '|' character in the call-id will break the accounting event. ``` INVITE sip:+11231234567@127.0.0.101 SIP/2.0 Via: SIP/2.0/UDP 1.1.69.51:5070;rport;branch=z9hG4bKPjpM.BvWCQzoS0BJ7TgnuLF9YtmHQTlDgd Max-Forwards: 70 Call-ID: fG8qa5Xc-iNDLhIAnuLZP|njL1sojRRD ``` With the encoding it is replaced with '%7C', no modifications should be required to systems processing the ACC events since different behavior will only take place when there is an invalid ACC event: ``` cat /var/log/acc/acc_129.log INVITE|upDPn89PCIq7SLTssEGoLoSbC-jDRnfj||fG8qa5Xc-iNDLhIAnuLZP%7CnjL1sojRRD.|403|Forbidden ``` Extra comments: I corrected the documentation on the command 'flatstore.rotate', since it was not working, but this one is 'flatstore.k_rotate' If I understand correctly this module was never migrated from SER to Kamailio completely ... This change may be the only important one for operation, so I am not proposing any extra refactoring. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1262 -- Commit Summary -- * db_flatstore: encode delimiter param -- File Changes -- M src/modules/db_flatstore/db_flatstore.c (5) M src/modules/db_flatstore/doc/db_flatstore.xml (14) M src/modules/db_flatstore/doc/db_flatstore_params.xml (11) M src/modules/db_flatstore/km_flatstore.c (15) M src/modules/db_flatstore/km_flatstore.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1262.patch https://github.com/kamailio/kamailio/pull/1262.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/1262

6 years, 6 months

git:master:4571f168: db_flatstore: encode delimiter param

by Julien Chavanton

Module: kamailio Branch: master Commit: 4571f168ea1d8d51ed31a5dd7e581ecc84b53d00 URL: https://github.com/kamailio/kamailio/commit/4571f168ea1d8d51ed31a5dd7e581ec… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2017-10-04T08:36:12-07:00 db_flatstore: encode delimiter param using ""%" HEX HEX" mechanism for escaping from RFC 2396 --- Modified: src/modules/db_flatstore/db_flatstore.c Modified: src/modules/db_flatstore/doc/db_flatstore.xml Modified: src/modules/db_flatstore/doc/db_flatstore_params.xml Modified: src/modules/db_flatstore/km_flatstore.c Modified: src/modules/db_flatstore/km_flatstore.h --- Diff: https://github.com/kamailio/kamailio/commit/4571f168ea1d8d51ed31a5dd7e581ec… Patch: https://github.com/kamailio/kamailio/commit/4571f168ea1d8d51ed31a5dd7e581ec…

6 years, 6 months

git:master:b8d5c7fb: p_usrloc: location.sql missing INSTANCE_COL

by Lucian Balaceanu

Module: kamailio Branch: master Commit: b8d5c7fbe994bb581c1e78285f08ec1980f6b89f URL: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-10-09T16:05:01+03:00 p_usrloc: location.sql missing INSTANCE_COL --- Modified: src/modules/p_usrloc/location.sql --- Diff: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1… Patch: https://github.com/kamailio/kamailio/commit/b8d5c7fbe994bb581c1e78285f08ec1… --- diff --git a/src/modules/p_usrloc/location.sql b/src/modules/p_usrloc/location.sql index e729c0f94e..9f39dd4218 100644 --- a/src/modules/p_usrloc/location.sql +++ b/src/modules/p_usrloc/location.sql @@ -17,6 +17,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, + instance VARCHAR(255) DEFAULT NULL, reg_id INTEGER DEFAULT 0 NOT NULL ) ENGINE=MyISAM;

6 years, 6 months

[kamailio/kamailio] p_usrloc: location.sql missing RUID_COL and REG_ID_COL (#1265)

by Andrew Siplas

## p_usrloc: location.sql missing columns [location.sql](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dda5… should include columns corresponding to `RUID_COL` and `REG_ID_COL`) from [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… ### Log Messages ``` kamailio: ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Unknown column 'reg_id' in 'field list' (1054) kamailio: ERROR: <core> [db_query.c:132]: db_do_query_internal(): error while submitting query kamailio: ERROR: p_usrloc [ul_db_query.c:110]: db_exec_query(): could not query table location. ``` ``` kamailio: ERROR: db_mysql [km_dbase.c:127]: db_mysql_submit_query(): driver error on query: Unknown column 'ruid' in 'field list' (1054) kamailio: ERROR: <core> [db_query.c:132]: db_do_query_internal(): error while submitting query kamailio: ERROR: p_usrloc [ul_db_query.c:110]: db_exec_query(): could not query table location. ``` ### Solutions Adding columns referenced by [p_usrloc_mod.c](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff56dd… to match `kamdbctl`'s [usrloc-create.sql](https://github.com/kamailio/kamailio/blob/6c01e2692d5ff5… -- 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/1265

6 years, 6 months

git:master:f9115fc5: Merge pull request #1266 from asiplas/master

by GitHub

Module: kamailio Branch: master Commit: f9115fc5fcdc0f4348e3c38b72117e09ce670226 URL: https://github.com/kamailio/kamailio/commit/f9115fc5fcdc0f4348e3c38b72117e0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: GitHub <noreply(a)github.com> Date: 2017-10-09T15:36:23+03:00 Merge pull request #1266 from asiplas/master p_usrloc: Fix #1265: missing columns in location.sql file. --- Modified: src/modules/p_usrloc/location.sql --- Diff: https://github.com/kamailio/kamailio/commit/f9115fc5fcdc0f4348e3c38b72117e0… Patch: https://github.com/kamailio/kamailio/commit/f9115fc5fcdc0f4348e3c38b72117e0… --- diff --git a/src/modules/p_usrloc/location.sql b/src/modules/p_usrloc/location.sql index a80902abbe..e729c0f94e 100644 --- a/src/modules/p_usrloc/location.sql +++ b/src/modules/p_usrloc/location.sql @@ -1,6 +1,7 @@ drop table if exists location; CREATE TABLE location ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + ruid VARCHAR(64) DEFAULT '' NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, domain VARCHAR(64) DEFAULT NULL, contact VARCHAR(255) DEFAULT '' NOT NULL, @@ -15,7 +16,8 @@ CREATE TABLE location ( cflags INT(11) DEFAULT 0 NOT NULL, user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, - methods INT(11) DEFAULT NULL + methods INT(11) DEFAULT NULL, + reg_id INTEGER DEFAULT 0 NOT NULL ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact);

6 years, 6 months

← Newer
1
...
24
25
26
27
28
29
30
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017