sr-dev July 2018

sr-dev@lists.kamailio.org

17 participants
229 discussions

git:5.0:2e2c07a6: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Jul '18

13 Jul '18

Module: kamailio Branch: 5.0 Commit: 2e2c07a6340c4109f86afca277f9a01e8101adcb URL: https://github.com/kamailio/kamailio/commit/2e2c07a6340c4109f86afca277f9a01… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-13T11:46:35+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth_xkeys/README Modified: src/modules/dialog/README Modified: src/modules/mqueue/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/2e2c07a6340c4109f86afca277f9a01… Patch: https://github.com/kamailio/kamailio/commit/2e2c07a6340c4109f86afca277f9a01…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

- URL: https://github.com/kamailio/kamailio/commit/605cf8658e4814ab09b708228618e69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:36:47+02:00 rtpengine: docs - updated some of rtpproxy occurences to rtpengine (cherry picked from commit 9383174b32b6b49dd9f0757450abadb45690515f) (cherry picked from commit 00419fbc81795564f5e5a5363b6c081c02a9ad8d) - URL: https://github.com/kamailio/kamailio/commit/a87cf53c03736d1950715985e45e707… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:37:03+02:00 dispatcher: safety check for null value of attrs field in database (cherry picked from commit f3f14c6d85a7055c3a729ec46b83ff2a179ac397) (cherry picked from commit 9ee7fc5767ffe77932c30962be934a0fb62d22bc) - URL: https://github.com/kamailio/kamailio/commit/6c47da40f0fde86eaf31e763663fe80… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:37:17+02:00 rtpproxy: mark RPC call with proper tag and small typo fix (cherry picked from commit 21c219bcdd3f74a029582cd353c5f91d91a46f3d) (cherry picked from commit a878d5f332688c19d027fc2d085d7221441f0017) - URL: https://github.com/kamailio/kamailio/commit/46257a48187dd5459763a6d3dd824c3… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:37:26+02:00 mqueue: fix typo in variable name documentation (cherry picked from commit 9ba37fd602a67066bd49f6959350ea1fd72d5e47) (cherry picked from commit a85f6b5e0918ee6ae3f9dabab185cc415c9bac13) - URL: https://github.com/kamailio/kamailio/commit/515f8867adc160b664d4b401e782d97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:37:43+02:00 jsonrpcc: init and update cfg framework for io handler process - GH #1520 (cherry picked from commit bb14964dd8337d0946c7e233ff3cc81f22e8e1bb) (cherry picked from commit 16071968ed45f7eaa9108c7148500c4d3964b744) - URL: https://github.com/kamailio/kamailio/commit/6cb0416d6239fd78d28a7d9b72858e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:37:58+02:00 auth_db: set id for section not title tag of is_subscriber() (cherry picked from commit 14180b449d8feb9ae9adcb74926d64138b7cd750) (cherry picked from commit 1da0a1b06a726e9e4e730f60a53975dcdab01e3e) - URL: https://github.com/kamailio/kamailio/commit/d9b90bfa5a7f20210fe50d631ee770c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:38:12+02:00 auth_xkeys: docs - fixed name of the function in example (cherry picked from commit 0d4f48d168167df5fc6be38721cab69115637dae) (cherry picked from commit 89f2e86bb2ace38b530b136edecae69052d3188a) - URL: https://github.com/kamailio/kamailio/commit/9fe2240fc100c51b7b4a483cb71b915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:38:32+02:00 tm: more explicit debug message when not matching reply to transaction (cherry picked from commit 961c2b3df008bb6df78c2e62dc943ebacd4db9b2) (cherry picked from commit 269b338ab8aa5b9cbce236d2984d39d0e3930c75) - URL: https://github.com/kamailio/kamailio/commit/7003e7aea505e20fc5a8822ec083900… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:38:43+02:00 core: test if address for IPv6 is IP format in lump substitutions - reported by GH #1581 (cherry picked from commit 1d78456562418b785126af09761c12571ef2394d) (cherry picked from commit 0a0a1f4866c4e056b443546eda0c57437580e4cb) - URL: https://github.com/kamailio/kamailio/commit/73b749815cb8f9a8a5270128e820279… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:39:12+02:00 app_java: Makefile - condition on USE_GCJ to compile with gcc or not - GH #1487, patch built reusing part of the one from A. Messina - set USE_GCJ=yes if OS has GCC with Java compiler, by default it is USE_GCJ=no (gcc 7 has removed gcj) (cherry picked from commit 3422f3c87b9d19444723cf59d30665cb49019127) (cherry picked from commit e109819479b633e750a51006ec9fd4d14df35dcf) - URL: https://github.com/kamailio/kamailio/commit/645696a67b159d29e1fd5b475fc1989… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:39:21+02:00 app_java: Makefile - USE_GCJ set to yes - be compatible with current behavior to avoid breaking CI and package building procedures (cherry picked from commit 450649c417a4b1c149185d7d0bdac35e392a89c3) (cherry picked from commit d86806fbede06730c7a11dc8c0ad4b039dc77877) - URL: https://github.com/kamailio/kamailio/commit/ed100adc095487e9180b26502f9181a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:40:32+02:00 app_lua: restore top index to lua stack after executing a function - could be related to GH #1577 (cherry picked from commit eb96593d0f1bb60fe6e955daa1a1b91ef65c69bd) (cherry picked from commit e872f707b1dc92de2a1c45ccb7eb028eb84cf9f4) - URL: https://github.com/kamailio/kamailio/commit/47f13ee48960edb6f605459d092ee1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:40:47+02:00 app_jsdt: restore JS stack after executing a function (cherry picked from commit acb90b6634e65a21c655e9bb94c1af00c138e6d4) (cherry picked from commit 484d096020440fc0ee092e90639443846258ac89) - URL: https://github.com/kamailio/kamailio/commit/0c4ed189b94c4c28f95175b8467fc8a… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-07-13T11:41:24+02:00 app_lua: fixing bug for setting global table lua (cherry picked from commit ea390d69d946314f93bfeeef77b4421f0c04cba3) (cherry picked from commit 26d2c501a3dc101edb050ae59923c949c5dd8141) - URL: https://github.com/kamailio/kamailio/commit/4725253328cb49834824a18498f05cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:41:33+02:00 dialog: handle . for optional body parameter for rpc dlg.bridge_dlg - consider as parameter not provided and use the default SDP string - "" or "_" behaves as provided body is empty string and the request has no body (cherry picked from commit 832fcfd839a193e5631df6c8ff1d2a84565d3822) (cherry picked from commit 361d952da6878e236effa07c4f9ea484a8caa831) - URL: https://github.com/kamailio/kamailio/commit/0f41977dab41ae367ef1ba4b6ec53f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:41:44+02:00 dialog: docs - notes about special values for optional parameters (cherry picked from commit c0aa8ab52e635c8b3173fdef77b25925e44cd4d4) (cherry picked from commit dbeab12f6ebe7a5f5b03c283d86fff6257c781a3)

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

- URL: https://github.com/kamailio/kamailio/commit/00419fbc81795564f5e5a5363b6c081… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:00:57+02:00 rtpengine: docs - updated some of rtpproxy occurences to rtpengine (cherry picked from commit 9383174b32b6b49dd9f0757450abadb45690515f) - URL: https://github.com/kamailio/kamailio/commit/9ee7fc5767ffe77932c30962be934a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:04:35+02:00 dispatcher: safety check for null value of attrs field in database (cherry picked from commit f3f14c6d85a7055c3a729ec46b83ff2a179ac397) - URL: https://github.com/kamailio/kamailio/commit/a878d5f332688c19d027fc2d085d722… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:08:48+02:00 rtpproxy: mark RPC call with proper tag and small typo fix (cherry picked from commit 21c219bcdd3f74a029582cd353c5f91d91a46f3d) - URL: https://github.com/kamailio/kamailio/commit/a85f6b5e0918ee6ae3f9dabab185cc4… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2018-07-13T11:08:58+02:00 mqueue: fix typo in variable name documentation (cherry picked from commit 9ba37fd602a67066bd49f6959350ea1fd72d5e47) - URL: https://github.com/kamailio/kamailio/commit/c9e1fa657a58e0da9ad1261a8e6d832… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:15:06+02:00 topos: print warn message of missing record-route only for initial requests (cherry picked from commit ecfb1b6c9abcaa662155f67b56516fd2d0750fe7) - URL: https://github.com/kamailio/kamailio/commit/f9468e261824d340e6b3c7d3e1a9c2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:15:25+02:00 topos: debug log messages with linked contact addresses (cherry picked from commit 5bafb32fa3dd0aefdb5e0c1a8bbd94638fe1022d) - URL: https://github.com/kamailio/kamailio/commit/5223c83f255cf8a5333563cd954dde7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:15:57+02:00 app_lua: support for more combinations of functions with 4 params (cherry picked from commit 8ff9f0dc0c00e80ad3a9add41823ca3dc101b94e) - URL: https://github.com/kamailio/kamailio/commit/d305cffd0e688a22ea67bcdcfb00db3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:08+02:00 app_python: support for more combinations of functions with 4 params (cherry picked from commit 3e7ff1f3613db1c5de559bbf259a621647a5424b) - URL: https://github.com/kamailio/kamailio/commit/16071968ed45f7eaa9108c7148500c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:21+02:00 jsonrpcc: init and update cfg framework for io handler process - GH #1520 (cherry picked from commit bb14964dd8337d0946c7e233ff3cc81f22e8e1bb) - URL: https://github.com/kamailio/kamailio/commit/6649720935317c128f3480929186baa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:32+02:00 app_jsdt: updated duktape js engine to v2.2.1 (cherry picked from commit 94ec7c778f0a98b91b6518575748875b6034edf0) - URL: https://github.com/kamailio/kamailio/commit/c9cf7771ff8745cfe7b18405079ec77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:42+02:00 app_jsdt: support for more combinations of fuctions with 4 params (cherry picked from commit ef90af6335d0f3d54686f6e039ff3bab4e5c4729) - URL: https://github.com/kamailio/kamailio/commit/2aa70f9669525354128a0d0010e5a0a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:16:54+02:00 app_sqlang: support functions with more combinations of 4 params (cherry picked from commit 08f942c9efc4e898de3985d25379b88a9ffe73a4) - URL: https://github.com/kamailio/kamailio/commit/1da0a1b06a726e9e4e730f60a53975d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:17:35+02:00 auth_db: set id for section not title tag of is_subscriber() (cherry picked from commit 14180b449d8feb9ae9adcb74926d64138b7cd750) - URL: https://github.com/kamailio/kamailio/commit/89f2e86bb2ace38b530b136edecae69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:17:46+02:00 auth_xkeys: docs - fixed name of the function in example (cherry picked from commit 0d4f48d168167df5fc6be38721cab69115637dae) - URL: https://github.com/kamailio/kamailio/commit/269b338ab8aa5b9cbce236d2984d39d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:18:52+02:00 tm: more explicit debug message when not matching reply to transaction (cherry picked from commit 961c2b3df008bb6df78c2e62dc943ebacd4db9b2) - URL: https://github.com/kamailio/kamailio/commit/0a0a1f4866c4e056b443546eda0c574… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:19:52+02:00 core: test if address for IPv6 is IP format in lump substitutions - reported by GH #1581 (cherry picked from commit 1d78456562418b785126af09761c12571ef2394d) - URL: https://github.com/kamailio/kamailio/commit/40722d5ee5a31f60d3949d22fed02a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:20:56+02:00 INSTALL: removed notes for gentoo - GH #1530 (cherry picked from commit 94902f678ffa31fbb6f3a0231730d7d6bd2239a1) - URL: https://github.com/kamailio/kamailio/commit/e109819479b633e750a51006ec9fd4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:21:14+02:00 app_java: Makefile - condition on USE_GCJ to compile with gcc or not - GH #1487, patch built reusing part of the one from A. Messina - set USE_GCJ=yes if OS has GCC with Java compiler, by default it is USE_GCJ=no (gcc 7 has removed gcj) (cherry picked from commit 3422f3c87b9d19444723cf59d30665cb49019127) - URL: https://github.com/kamailio/kamailio/commit/d86806fbede06730c7a11dc8c0ad4b0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:21:22+02:00 app_java: Makefile - USE_GCJ set to yes - be compatible with current behavior to avoid breaking CI and package building procedures (cherry picked from commit 450649c417a4b1c149185d7d0bdac35e392a89c3) - URL: https://github.com/kamailio/kamailio/commit/e2dc8ba6aa8be0a7074cecb5fc490fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:21:35+02:00 nat_traversal: use ipv6 address with surrounding square brackets in pv value (cherry picked from commit 7f034bf845eb65beaf2dc09594ab496998aa97a7) - URL: https://github.com/kamailio/kamailio/commit/e872f707b1dc92de2a1c45ccb7eb028… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:22:39+02:00 app_lua: restore top index to lua stack after executing a function - could be related to GH #1577 (cherry picked from commit eb96593d0f1bb60fe6e955daa1a1b91ef65c69bd) - URL: https://github.com/kamailio/kamailio/commit/484d096020440fc0ee092e906394438… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:22:50+02:00 app_jsdt: restore JS stack after executing a function (cherry picked from commit acb90b6634e65a21c655e9bb94c1af00c138e6d4) - URL: https://github.com/kamailio/kamailio/commit/3528c383f5288317ae6ec25fb0007c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:23:42+02:00 nathelper: safety check for sipping_from when building SIP keepalive request - reported by GH #1587 (cherry picked from commit ade1cad69b659e5b0923e548d3c04f550204e793) - URL: https://github.com/kamailio/kamailio/commit/2ef1a93369f8029e0f8afa16b6fa2cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:23:53+02:00 nathelper: send always SIP ping if ping_nated_only=0 and sipping_flag is set - reported by GH #1587 (cherry picked from commit 1be693d432cd0ec3ce2cd68847791689143ae351) - URL: https://github.com/kamailio/kamailio/commit/40b58e21d70689ed2cab45bf2788f19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:24:03+02:00 nathelper: docs - note about the behavior of ping_nated_only=0 with sipping_flag set (cherry picked from commit 8f7eca3cdadd42ae2bf30a603b5b50c95f33937e) - URL: https://github.com/kamailio/kamailio/commit/26d2c501a3dc101edb050ae59923c94… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-07-13T11:24:17+02:00 app_lua: fixing bug for setting global table lua (cherry picked from commit ea390d69d946314f93bfeeef77b4421f0c04cba3) - URL: https://github.com/kamailio/kamailio/commit/361d952da6878e236effa07c4f9ea48… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:24:33+02:00 dialog: handle . for optional body parameter for rpc dlg.bridge_dlg - consider as parameter not provided and use the default SDP string - "" or "_" behaves as provided body is empty string and the request has no body (cherry picked from commit 832fcfd839a193e5631df6c8ff1d2a84565d3822) - URL: https://github.com/kamailio/kamailio/commit/dbeab12f6ebe7a5f5b03c283d86fff6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T11:24:56+02:00 dialog: docs - notes about special values for optional parameters (cherry picked from commit c0aa8ab52e635c8b3173fdef77b25925e44cd4d4)

1 0

git:master:ce0a16b3: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: ce0a16b3426f500d66eb987ea9c0dd59f25018a4 URL: https://github.com/kamailio/kamailio/commit/ce0a16b3426f500d66eb987ea9c0dd5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-13T11:02:19+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/ce0a16b3426f500d66eb987ea9c0dd5… Patch: https://github.com/kamailio/kamailio/commit/ce0a16b3426f500d66eb987ea9c0dd5… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index a3baacf621..2a29057b6b 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -2018,8 +2018,15 @@ kamcmd dlg.profile_list inbound_calls Parameters: * from - SIP address to initiate the call * to - SIP address to refer 'from' to - * op (optional) - outbound proxy SIP address - * body (optional) - SDP body for initial INVITE + * op (optional) - outbound proxy SIP address. If its value is set to + '.' (dot), then it is ignored (like it would not have been + provided). + * body (optional) - SDP body for initial INVITE. If its value is set + to '.' (dot), then it is ignored (like it would not have been + provided). If body is not set via RPC command parameter, then an + internal generated SDP with G711a and G711u is used. If its value + is set to '' (empty string) or '_' (underline), then the INVITE is + sent without an SDP body. RPC Command Format: ...

1 0

git:master:c0aa8ab5: dialog: docs - notes about special values for optional parameters
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: c0aa8ab52e635c8b3173fdef77b25925e44cd4d4 URL: https://github.com/kamailio/kamailio/commit/c0aa8ab52e635c8b3173fdef77b2592… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T10:46:48+02:00 dialog: docs - notes about special values for optional parameters --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c0aa8ab52e635c8b3173fdef77b2592… Patch: https://github.com/kamailio/kamailio/commit/c0aa8ab52e635c8b3173fdef77b2592… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index e1d2bc275d..6d936491cb 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2581,11 +2581,17 @@ if(has_totag()) { <emphasis>to</emphasis> - SIP address to refer 'from' to </para></listitem> <listitem><para> - <emphasis>op</emphasis> (optional) - outbound proxy SIP address + <emphasis>op</emphasis> (optional) - outbound proxy SIP address. + If its value is set to '.' (dot), then it is ignored (like it + would not have been provided). </para></listitem> <listitem><para> <emphasis>body</emphasis> (optional) - SDP body for initial - INVITE + INVITE. If its value is set to '.' (dot), then it is ignored + (like it would not have been provided). If body is not set via + RPC command parameter, then an internal generated SDP with G711a + and G711u is used. If its value is set to '' (empty string) or + '_' (underline), then the INVITE is sent without an SDP body. </para></listitem> </itemizedlist> <para>RPC Command Format:</para>

1 0

git:master:832fcfd8: dialog: handle . for optional body parameter for rpc dlg.bridge_dlg
by Daniel-Constantin Mierla 13 Jul '18

13 Jul '18

Module: kamailio Branch: master Commit: 832fcfd839a193e5631df6c8ff1d2a84565d3822 URL: https://github.com/kamailio/kamailio/commit/832fcfd839a193e5631df6c8ff1d2a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-13T10:39:29+02:00 dialog: handle . for optional body parameter for rpc dlg.bridge_dlg - consider as parameter not provided and use the default SDP string - "" or "_" behaves as provided body is empty string and the request has no body --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_transfer.c --- Diff: https://github.com/kamailio/kamailio/commit/832fcfd839a193e5631df6c8ff1d2a8… Patch: https://github.com/kamailio/kamailio/commit/832fcfd839a193e5631df6c8ff1d2a8… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 83883a4fac..7f6e692125 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2348,6 +2348,14 @@ static void rpc_dlg_bridge(rpc_t *rpc, void *c) { if(rpc->scan(c, "*S", &bd)<1) { bd.s = NULL; bd.len = 0; + } else { + if(bd.len==1 && *bd.s=='.') { + bd.s = NULL; + bd.len = 0; + } else if(bd.len==1 && *bd.s=='_') { + bd.s = ""; + bd.len = 0; + } } } diff --git a/src/modules/dialog/dlg_transfer.c b/src/modules/dialog/dlg_transfer.c index 74d43726ad..f3e594bcbe 100644 --- a/src/modules/dialog/dlg_transfer.c +++ b/src/modules/dialog/dlg_transfer.c @@ -357,7 +357,7 @@ int dlg_bridge(str *from, str *to, str *op, str *bd) LM_DBG("bridge <%.*s> to <%.*s>\n", dtc->from.len, dtc->from.s, dtc->to.len, dtc->to.s); - if(bd!=NULL && bd->s!=NULL && bd->len>0) { + if(bd!=NULL && bd->s!=NULL) { s_body.s = bd->s; s_body.len = bd->len; } else {

1 0

git:master:ab6f9d54: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: ab6f9d54084d8c91939864c758ffd2fcb750c8f9 URL: https://github.com/kamailio/kamailio/commit/ab6f9d54084d8c91939864c758ffd2f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-07-12T19:31:28+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/ab6f9d54084d8c91939864c758ffd2f… Patch: https://github.com/kamailio/kamailio/commit/ab6f9d54084d8c91939864c758ffd2f…

1 0

git:master:b1535317: textops: docs for replace_body_str(...)
by Daniel-Constantin Mierla 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: b15353177f9acb8a52941f073c360753f0138145 URL: https://github.com/kamailio/kamailio/commit/b15353177f9acb8a52941f073c36075… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-12T16:27:24+02:00 textops: docs for replace_body_str(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b15353177f9acb8a52941f073c36075… Patch: https://github.com/kamailio/kamailio/commit/b15353177f9acb8a52941f073c36075… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 3e62d7ac44..7d7f2d62ce 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -439,6 +439,43 @@ replace_str("&kamailio;", "&kamailio; SIP Proxy", "a"); </example> </section> + <section id="textops.f.replace_body_str"> + <title> + <function moreinfo="none">replace_body_str(match, repl, mode)</function> + </title> + <para> + Replaces the first or all occurrence of 'match' with 'repl' by doing + string comparison for matching. It is applied over the message body. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>match</emphasis> - string to be matched. + </para> + </listitem> + <listitem> + <para><emphasis>repl</emphasis> - string to be used as replacement. + </para> + </listitem> + <listitem> + <para><emphasis>mode</emphasis> - 'f' - replace only first match; + 'a' - replace all matches. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>replace_body_str</function> usage</title> + <programlisting format="linespecific"> +... +replace_body_str("&kamailio;", "&kamailio; SIP Proxy", "a"); +... +</programlisting> + </example> + </section> + <section id="textops.f.subst"> <title> <function moreinfo="none">subst('/re/repl/flags')</function>

1 0

git:master:6c1ec5fd: textops: new function replace_body_str(mkey, rval, rmode)
by Daniel-Constantin Mierla 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: 6c1ec5fd0bb9abcfefd14a46ad3801cfb2ba36a3 URL: https://github.com/kamailio/kamailio/commit/6c1ec5fd0bb9abcfefd14a46ad3801c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-12T16:24:30+02:00 textops: new function replace_body_str(mkey, rval, rmode) - replace a string inside message body --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/6c1ec5fd0bb9abcfefd14a46ad3801c… Patch: https://github.com/kamailio/kamailio/commit/6c1ec5fd0bb9abcfefd14a46ad3801c…

1 0

git:master:48524f0c: permissions: exported allow_address_group() to kemi framework
by Daniel-Constantin Mierla 12 Jul '18

12 Jul '18

Module: kamailio Branch: master Commit: 48524f0ce8934c4f6a46b38a1af1fff92078eb3d URL: https://github.com/kamailio/kamailio/commit/48524f0ce8934c4f6a46b38a1af1fff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-07-12T15:58:13+02:00 permissions: exported allow_address_group() to kemi framework --- Modified: src/modules/permissions/address.c Modified: src/modules/permissions/address.h Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/48524f0ce8934c4f6a46b38a1af1fff… Patch: https://github.com/kamailio/kamailio/commit/48524f0ce8934c4f6a46b38a1af1fff… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 141806edf0..cc447deaf6 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -565,50 +565,37 @@ int allow_source_address_group(struct sip_msg* _msg, char* _str1, char* _str2) * subnet table in any group. If yes, returns that group. If not returns -1. * Port value 0 in cached address and group table matches any port. */ -int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) +int ki_allow_address_group(sip_msg_t* _msg, str* _addr, int _port) { int group = -1; - unsigned int port; - str ips; ip_addr_t *ipa; - if (_addr==NULL - || (fixup_get_svalue(_msg, (gparam_p)_addr, &ips) < 0)) { - LM_ERR("cannot get value of address pvar\n"); - return -1; - } - if (_port==NULL - || (fixup_get_ivalue(_msg, (gparam_p)_port, (int*)&port) < 0)) { - LM_ERR("cannot get value of port pvar\n"); - return -1; - } - - ipa=strtoipX(&ips); + ipa=strtoipX(_addr); if ( ipa ) { LM_DBG("looking for <%.*s, %u> in address table\n", - ips.len, ips.s, port); + _addr->len, _addr->s, (unsigned int)_port); if(addr_hash_table) { group = find_group_in_addr_hash_table(*addr_hash_table, - ipa, port); + ipa, (unsigned int)_port); LM_DBG("Found address in group <%d>\n", group); if (group != -1) return group; } if(subnet_table) { LM_DBG("looking for <%.*s, %u> in subnet table\n", - ips.len, ips.s, port); + _addr->len, _addr->s, _port); group = find_group_in_subnet_table(*subnet_table, - ipa, port); + ipa, (unsigned int)_port); LM_DBG("Found a match of subnet in group <%d>\n", group); } } else { LM_DBG("looking for <%.*s, %u> in domain_name table\n", - ips.len, ips.s, port); + _addr->len, _addr->s, (unsigned int)_port); if(domain_list_table) { group = find_group_in_domain_name_table(*domain_list_table, - &ips, port); + _addr, (unsigned int)_port); LM_DBG("Found a match of domain_name in group <%d>\n", group); } } @@ -616,3 +603,22 @@ int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) LM_DBG("Found <%d>\n", group); return group; } + +int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port) +{ + int port; + str ips; + + if (_addr==NULL + || (fixup_get_svalue(_msg, (gparam_p)_addr, &ips) < 0)) { + LM_ERR("cannot get value of address pvar\n"); + return -1; + } + if (_port==NULL + || (fixup_get_ivalue(_msg, (gparam_p)_port, &port) < 0)) { + LM_ERR("cannot get value of port pvar\n"); + return -1; + } + + return ki_allow_address_group(_msg, &ips, port); +} \ No newline at end of file diff --git a/src/modules/permissions/address.h b/src/modules/permissions/address.h index cc4652a0bc..5693ce14ce 100644 --- a/src/modules/permissions/address.h +++ b/src/modules/permissions/address.h @@ -97,4 +97,6 @@ int ki_allow_source_address_group(sip_msg_t* _msg); */ int allow_address_group(struct sip_msg* _msg, char* _addr, char* _port); +int ki_allow_address_group(sip_msg_t* _msg, str* _addr, int _port); + #endif /* ADDRESS_H */ diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 822aad5e91..7f2194d595 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -1041,6 +1041,11 @@ static sr_kemi_t sr_kemi_permissions_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("permissions"), str_init("allow_address_group"), + SR_KEMIP_INT, ki_allow_address_group, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2018