sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
273 discussions

git:master:261a3464: Merge pull request #222 from mslehto/tautological-compare
by Daniel-Constantin Mierla 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: 261a3464f0a65dcf0de5458eff50aa4b9f64964c URL: https://github.com/kamailio/kamailio/commit/261a3464f0a65dcf0de5458eff50aa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-25T11:58:20+02:00 Merge pull request #222 from mslehto/tautological-compare modules/[rls|presence_xml]: fixes warning [-Wtautological-compare] --- Modified: modules/presence_xml/presence_xml.c Modified: modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/261a3464f0a65dcf0de5458eff50aa4… Patch: https://github.com/kamailio/kamailio/commit/261a3464f0a65dcf0de5458eff50aa4… --- diff --git a/modules/presence_xml/presence_xml.c b/modules/presence_xml/presence_xml.c index 29bf3ec..f8781ef 100644 --- a/modules/presence_xml/presence_xml.c +++ b/modules/presence_xml/presence_xml.c @@ -382,7 +382,7 @@ static int pxml_add_xcap_server( modparam_t type, void* val) LM_ERR("while converting string to int\n"); goto error; } - if(port< 0 || port> 65535) + if(port< 1 || port> 65535) { LM_ERR("wrong port number\n"); goto error; diff --git a/modules/rls/rls.c b/modules/rls/rls.c index 23c6a7c..26d9be0 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -333,7 +333,7 @@ static int mod_init(void) port_str.len, port_str.s); return -1; } - if(xcap_port< 0 || xcap_port> 65535) + if(xcap_port< 1 || xcap_port> 65535) { LM_ERR("wrong xcap server port\n"); return -1;

1 0

git:master:d5339cf3: modules/[rls|presence_xml]: fixes warning [-Wtautological-compare]
by Mikko Lehto 25 Jun '15

25 Jun '15

Module: kamailio Branch: master Commit: d5339cf397b83b79cd1594e37df69990374ec467 URL: https://github.com/kamailio/kamailio/commit/d5339cf397b83b79cd1594e37df6999… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T23:59:49+03:00 modules/[rls|presence_xml]: fixes warning [-Wtautological-compare] warning: comparison of unsigned expression < 0 is always false --- Modified: modules/presence_xml/presence_xml.c Modified: modules/rls/rls.c --- Diff: https://github.com/kamailio/kamailio/commit/d5339cf397b83b79cd1594e37df6999… Patch: https://github.com/kamailio/kamailio/commit/d5339cf397b83b79cd1594e37df6999… --- diff --git a/modules/presence_xml/presence_xml.c b/modules/presence_xml/presence_xml.c index 29bf3ec..f8781ef 100644 --- a/modules/presence_xml/presence_xml.c +++ b/modules/presence_xml/presence_xml.c @@ -382,7 +382,7 @@ static int pxml_add_xcap_server( modparam_t type, void* val) LM_ERR("while converting string to int\n"); goto error; } - if(port< 0 || port> 65535) + if(port< 1 || port> 65535) { LM_ERR("wrong port number\n"); goto error; diff --git a/modules/rls/rls.c b/modules/rls/rls.c index c87e91e..d77c74c 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -338,7 +338,7 @@ static int mod_init(void) port_str.len, port_str.s); return -1; } - if(xcap_port< 0 || xcap_port> 65535) + if(xcap_port< 1 || xcap_port> 65535) { LM_ERR("wrong xcap server port\n"); return -1;

1 0

[kamailio] modules/[rls|presence_xml]: fixes warning [-Wtautological-compare] (#222)
by Mikko Lehto 25 Jun '15

25 Jun '15

warning: comparison of unsigned expression < 0 is always false You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/222 -- Commit Summary -- * modules/[rls|presence_xml]: fixes warning [-Wtautological-compare] -- File Changes -- M modules/presence_xml/presence_xml.c (2) M modules/rls/rls.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/222.patch https://github.com/kamailio/kamailio/pull/222.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/222

2 1

deb building system
by Victor Seva 25 Jun '15

25 Jun '15

Hello, I would like to inform that the deb nightly builds are going to be disabled. I'm having problems with the actual configuration and until I found the time to fix them the service will be out of order. No new debs will be produced until further notice. Cheers, Victor

1 0

Kamailio Server Maintenance - Wed-Thu Night
by Daniel-Constantin Mierla 25 Jun '15

25 Jun '15

Hello, during the night between Wed (June 24) and Thu (June 25), planned to start not early than 00:00 GMT+1, there will be some schedule maintenance work to the infrastructure that is hosting some of the kamailio.org servers. The main affected services will be: - main website (www.kamailio.org) - wiki portals - mailing lists (lists.sip-router.org) - git mirror (git.kamailio.org) It is expected to have short downtimes of few minutes. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com

1 1

db_mysql MYSQL_TYPE_TIMESTAMP conversion
by smititelu 24 Jun '15

24 Jun '15

Hello, I have a question related to the location table's "last_modified" column type. The standard type is _datetime_. However, when the actual database type is _timestamp_ (not the standard type), db_mysql_get_columns() in modules/db_mysql/km_res.c interprets the values as _int_ (see case MYSQL_TYPE_TIMESTAMP||). Eventually an "error while converting rows" error is dumped. Is this conversion on purpose? On the other hand, check_result() in modules/db_mysql/my_cmd.c interprets _timestamp_ as _datetime_. Everything works fine when _timestamp_ is converted to _datetime_ in db_mysql_get_columns() . Regards, Stefan ||

1 0

git:4.2:cf75fdfe: mtree, tmrec, tmx, uac: refresed the readme
by Daniel-Constantin Mierla 24 Jun '15

24 Jun '15

Module: kamailio Branch: 4.2 Commit: cf75fdfe99d5683675c7b9016a31ff3c5eb93fe0 URL: https://github.com/kamailio/kamailio/commit/cf75fdfe99d5683675c7b9016a31ff3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:50:18+02:00 mtree,tmrec,tmx,uac: refresed the readme --- Modified: modules/mtree/README Modified: modules/tmrec/README Modified: modules/tmx/README Modified: modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/cf75fdfe99d5683675c7b9016a31ff3… Patch: https://github.com/kamailio/kamailio/commit/cf75fdfe99d5683675c7b9016a31ff3…

1 0

git: new commits in branch 4.2
by Daniel-Constantin Mierla 24 Jun '15

24 Jun '15

- URL: https://github.com/kamailio/kamailio/commit/1fea10a610895d93869ccdf0ef4768c… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2015-06-24T13:36:39+02:00 modules/db_mysql: include (start of) mysql query to async query error message (cherry picked from commit 301793c4f10c860e263a243863f7b833ba3bb0f6) - URL: https://github.com/kamailio/kamailio/commit/d266a0549e91d7b233ac8560c1e552e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-24T13:37:06+02:00 usrloc: run callbacks after updating the info on DB_ONLY mode (cherry picked from commit a61f325589a3bef6164b1eca8bd93ca3dace4549) - URL: https://github.com/kamailio/kamailio/commit/efd63b687ad9af775bd8dff773351d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:38:09+02:00 lib/srdb1: use last @ as delimiter for start of host in db url - allow @ to be part of password - reported by GH#169, Debojit Kakoti (cherry picked from commit c02e165cc7a44e525dd55714c4471f1236e96b43) - URL: https://github.com/kamailio/kamailio/commit/e608f9d805299bf92b0e6b1119affd3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-24T13:38:27+02:00 Makefile: use distclean as shortcut of maintainer-clean Fixes: #167 Nowadays people expect distclean to be the rule to do the cleaning (cherry picked from commit a19337d305ba13ade7c30bfaa2926ee1d63930d9) - URL: https://github.com/kamailio/kamailio/commit/cc70547b32e5cc29a548814aafc7d58… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2015-06-24T13:39:02+02:00 modules/usrloc: added note about handle_lost_tcp in DB-Only scheme (cherry picked from commit fe7351d586b56237669a29f15dcdf83b78136cb4) - URL: https://github.com/kamailio/kamailio/commit/530469a760ea156b85702aa928e717d… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T13:39:25+02:00 modules/tmx doc: t_reply_callid() works also for other requests than INVITE (cherry picked from commit e76577a2c6d8d0628ff9548e5cbfee0302a41e15) - URL: https://github.com/kamailio/kamailio/commit/e03fe9773000a73dcd3aba557d167fd… Author: lucian balanceanu <lucian.balanceanu(a)1and1.ro> Date: 2015-06-24T13:40:36+02:00 acc, dialog: change cdr dialog duration - CDR duration for timed out acknowledged dialogs is no longer left empty (cherry picked from commit d46f3f642f491968e06faea4eb1aab30ff7582fd) - URL: https://github.com/kamailio/kamailio/commit/89b278f6bdfd5590355e0c7843184c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-06-24T13:41:14+02:00 uac: fix spelling error (cherry picked from commit a2de9d6f3af59951c06d0a12e205e1d5814213a6) (cherry picked from commit 28a8c966ba4334ea68ef90d74e49d705dfdff830) - URL: https://github.com/kamailio/kamailio/commit/41961898833a58d56a3d70b6379261c… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T13:42:45+02:00 modules/call_control: fixes clang compile warning - warning: expression which evaluates to zero treated as a null pointer constant of type 'void *' [-Wnon-literal-null-conversion] (cherry picked from commit 18038c2ea3b22cad9099719ecc999266b90e8786) (cherry picked from commit 803321f14153fb0ae87f99771c5d03ec6783dddd) - URL: https://github.com/kamailio/kamailio/commit/3118fb9c198ae9674de025c0ce463d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:43:06+02:00 mtree: internal prefix max size set to 64 - allow for larger prefix values to be used (e.g., case of uuid, ipv6) - db corresponding field still set to varchar(32) (cherry picked from commit 47086a4ee0a6ee6a766d7591e91e5663acf31562) (cherry picked from commit bfe40dd69e154b90820d8e87ea5ea46e51601e54) - URL: https://github.com/kamailio/kamailio/commit/c5d355064c23a01432eb2540a575022… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:43:15+02:00 mtree: more details about what module does and max prefix size (cherry picked from commit 74fadc549929d3dc873ce3b8b1db20559562ab54) (cherry picked from commit 9e05772c277f487d0c5bacdb33b1aaa8634e133f) - URL: https://github.com/kamailio/kamailio/commit/377d2202c872cc4d7b22567cc5d79e3… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T13:44:10+02:00 modules/call_control: change type to fix clang compiler warning call_control.c:503:19: warning: implicit conversion from 'hdr_flags_t' (aka 'unsigned long long') to 'int' changes value from 18446744073709551615 to -1 [-Wconstant-conversion] (cherry picked from commit f6fc513ad968c40d1c990024c4985fa285ba93b6) (cherry picked from commit 3a05838bbd408490b660764a3601653f022a9752) - URL: https://github.com/kamailio/kamailio/commit/7501fba10641b12258bde8a032acd20… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T13:44:22+02:00 modules/nat_traversal: avoid clang warnings with cast to (enum _hdr_types_t) nat_traversal.c:1477:54: warning: implicit conversion from 'hdr_flags_t' (aka 'unsigned long long') to 'enum _hdr_types_t' changes value from 18446744073709551615 to -1 [-Wconstant-conversion] nat_traversal.c:1487:49: warning: implicit conversion from 'hdr_flags_t' (aka 'unsigned long long') to 'enum _hdr_types_t' changes value from 18446744073709551615 to -1 [-Wconstant-conversion] (cherry picked from commit 658932119824a0576ce708ed0d09fd43c95addfc) (cherry picked from commit ade2e05d41af057db3004fcc521ba04e7657e0f2) - URL: https://github.com/kamailio/kamailio/commit/8fd81333a4bf9de641321430aebfdda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:45:18+02:00 uac: updated notes about uac_auth() (cherry picked from commit db829aabf30c5b4fdfee5ebd842959b63a598b26) (cherry picked from commit 43b70c5c809f666c74bc0b75ce7549d2a7b0518e) - URL: https://github.com/kamailio/kamailio/commit/ac5f71b14056c85e59a926d8d35ffb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:45:27+02:00 dialog: re-entrant mutex for dialogs hash table slots - changed from a lock set usage to per slot lock field (cherry picked from commit 9c3ea838b31039ac067e17d519df67b64b0dada1) (cherry picked from commit 69fe3fae08a8ebbe4926fb1e96e52547fe1047bb) - URL: https://github.com/kamailio/kamailio/commit/f756860270d955c3fa159f3a652ec1e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:45:36+02:00 dialog: removed unused variable (cherry picked from commit 6dba3a2d2785cba6b29bcb3d11b318687a12b632) (cherry picked from commit f4f400c6078ac45133c546ed0e42e434ae06c983) - URL: https://github.com/kamailio/kamailio/commit/9f1bbea2dc64339f4e1c1981668e412… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T13:45:59+02:00 Makefile.defs: fixes indentation (cherry picked from commit 89633c4c85a6a44df3bbe4a80cf5ca595b59c196) (cherry picked from commit 6da6b53ba373af00f4f29b097c28709b9436583b) - URL: https://github.com/kamailio/kamailio/commit/6a09ddfca15d0d610363ea34dcb5a22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:46:09+02:00 domain: allow 'type' field in domain_attrs to be a DB1_BIGINT - in addition to allowing DB1_INT - makes it work with MySQL views on 64bit systems - based on a patch by divereigh, GH#182 (cherry picked from commit e6f3a512c599678fca08daca561bcad4c05add23) (cherry picked from commit 75b853cf54c2dd7595c094b302af169fcad25fe0) - URL: https://github.com/kamailio/kamailio/commit/f60819f011df87fb71cfe0b05641668… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:46:19+02:00 sdpops: don't return 0 if no match for sdp_get_line_startswith() - that causes exit of config execution - reported by Sebastian Damm (cherry picked from commit 0870ab88262bb61124899ad98d06a72a6cdc7129) (cherry picked from commit 388433d265cfcf8637c4e549803ee84cc9ef8519) - URL: https://github.com/kamailio/kamailio/commit/6020811478119e58fd25b327e745153… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:46:30+02:00 Makefile: kamailio user home dir set to /var/run/kamailio for install-initd-centos - affects the useradd command - it was pointing to lib dir (cherry picked from commit dc2d3c3f609c81e21928390110952f4070ea9c62) (cherry picked from commit 2894aff93058d29e2ad336c43478c3fcb5d082b1) - URL: https://github.com/kamailio/kamailio/commit/0b2c179030aaa2eacc2dead48f6fb34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:46:43+02:00 evapi: evapi_close() doesn't use any parameter (cherry picked from commit cccd1a4b20c750246b491ff41090c5749561948d) (cherry picked from commit dcd1ba0e3a4e37b0a291bdebb69df0edec29aff2) - URL: https://github.com/kamailio/kamailio/commit/e49d367a0c8bc7a7a05a37e30515b5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:47:00+02:00 evapi: more documentation for exported functions (cherry picked from commit 96225847ddfc2f879d63adbc0117748c9cf76f02) (cherry picked from commit c6b64b214af224e3416cc1d302bea472d847cebf) - URL: https://github.com/kamailio/kamailio/commit/b90cdaf34bc7a3da55a0b5617199093… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:47:07+02:00 uac: fixed typos in log message (cherry picked from commit 42f0a1ffe551442058f53c9446495d5e62dc5abc) (cherry picked from commit bebf30abb057221be646e95b07cdaca88cab63b5) - URL: https://github.com/kamailio/kamailio/commit/c952b718ce8a371014d5a8bf180d2ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:47:23+02:00 evapi: don't print the message after relaying to evapi dispatcher - the dispatcher process can consume it and frees the pointers (cherry picked from commit 57b75141542cdaa471dab00cfb4f7d8812d41824) (cherry picked from commit 32243fd248a5d49b22ee597fe02ca95f58cab8a5)

1 0

git: new commits in branch 4.3
by Daniel-Constantin Mierla 24 Jun '15

24 Jun '15

- URL: https://github.com/kamailio/kamailio/commit/43b70c5c809f666c74bc0b75ce7549d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:23:25+02:00 uac: updated notes about uac_auth() (cherry picked from commit db829aabf30c5b4fdfee5ebd842959b63a598b26) - URL: https://github.com/kamailio/kamailio/commit/69fe3fae08a8ebbe4926fb1e96e5254… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:24:13+02:00 dialog: re-entrant mutex for dialogs hash table slots - changed from a lock set usage to per slot lock field (cherry picked from commit 9c3ea838b31039ac067e17d519df67b64b0dada1) - URL: https://github.com/kamailio/kamailio/commit/f4f400c6078ac45133c546ed0e42e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:24:31+02:00 dialog: removed unused variable (cherry picked from commit 6dba3a2d2785cba6b29bcb3d11b318687a12b632) - URL: https://github.com/kamailio/kamailio/commit/82b3e56c0ea38682d82ac7b5411555e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:24:44+02:00 utils: fixed indentation (cherry picked from commit 8a9d7df57e0ac83bb8fb6f97c71b01ec96184ba0) - URL: https://github.com/kamailio/kamailio/commit/6da6b53ba373af00f4f29b097c28709… Author: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-24T13:25:08+02:00 Makefile.defs: fixes indentation (cherry picked from commit 89633c4c85a6a44df3bbe4a80cf5ca595b59c196) - URL: https://github.com/kamailio/kamailio/commit/75b853cf54c2dd7595c094b302af169… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:25:33+02:00 domain: allow 'type' field in domain_attrs to be a DB1_BIGINT - in addition to allowing DB1_INT - makes it work with MySQL views on 64bit systems - based on a patch by divereigh, GH#182 (cherry picked from commit e6f3a512c599678fca08daca561bcad4c05add23) - URL: https://github.com/kamailio/kamailio/commit/388433d265cfcf8637c4e549803ee84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:25:42+02:00 sdpops: don't return 0 if no match for sdp_get_line_startswith() - that causes exit of config execution - reported by Sebastian Damm (cherry picked from commit 0870ab88262bb61124899ad98d06a72a6cdc7129) - URL: https://github.com/kamailio/kamailio/commit/2894aff93058d29e2ad336c43478c3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:25:53+02:00 Makefile: kamailio user home dir set to /var/run/kamailio for install-initd-centos - affects the useradd command - it was pointing to lib dir (cherry picked from commit dc2d3c3f609c81e21928390110952f4070ea9c62) - URL: https://github.com/kamailio/kamailio/commit/dcd1ba0e3a4e37b0a291bdebb69df0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:26:16+02:00 evapi: evapi_close() doesn't use any parameter (cherry picked from commit cccd1a4b20c750246b491ff41090c5749561948d) - URL: https://github.com/kamailio/kamailio/commit/85f93d29191ee099704c850a8742cf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:26:25+02:00 rtjson: error log level set to notice for importing uac api - printed at module init, it is not preventing to start the server (cherry picked from commit 239c54843897ec143c03693e44c994ee9cdde684) - URL: https://github.com/kamailio/kamailio/commit/bebf30abb057221be646e95b07cdaca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:26:34+02:00 uac: fixed typos in log message (cherry picked from commit 42f0a1ffe551442058f53c9446495d5e62dc5abc) - URL: https://github.com/kamailio/kamailio/commit/c6b64b214af224e3416cc1d302bea47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:26:45+02:00 evapi: more documentation for exported functions (cherry picked from commit 96225847ddfc2f879d63adbc0117748c9cf76f02) - URL: https://github.com/kamailio/kamailio/commit/f1a39a6580f6af041f3b002961dcd6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:27:02+02:00 rtjson: proper access to items in routes array - more debug messages to show the internal operations (cherry picked from commit 8025761dc0c75fd50e3ee24be96d420df79659d5) - URL: https://github.com/kamailio/kamailio/commit/32243fd248a5d49b22ee597fe02ca95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:27:17+02:00 evapi: don't print the message after relaying to evapi dispatcher - the dispatcher process can consume it and frees the pointers (cherry picked from commit 57b75141542cdaa471dab00cfb4f7d8812d41824) - URL: https://github.com/kamailio/kamailio/commit/4b19b9223d73d7138a48e7b358a86f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:27:33+02:00 rtjson: safety check for branch index stored interanlly in xavp (cherry picked from commit 59389b288fd50369226681b309c0895de03d7b77) - URL: https://github.com/kamailio/kamailio/commit/a5bb99b4499b1ffde155cad9b2bc137… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:27:44+02:00 rtjson: more documentation about json routing document format (cherry picked from commit 5db8bec2fdfba911f7053e615cf156d76af5fa46) - URL: https://github.com/kamailio/kamailio/commit/119a878abf15ae2af524174a5948f9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:31:56+02:00 rtjson: updated the readme content - URL: https://github.com/kamailio/kamailio/commit/66cbab29ef285ea71116f8141081064… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-24T13:32:12+02:00 uac: refreshed the readme

1 0

git:master:8217e812: rtjson: regenerated readme
by Daniel-Constantin Mierla 23 Jun '15

23 Jun '15

Module: kamailio Branch: master Commit: 8217e812d5ba0dcd975c24aa1ead066e80742315 URL: https://github.com/kamailio/kamailio/commit/8217e812d5ba0dcd975c24aa1ead066… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-23T23:22:37+02:00 rtjson: regenerated readme --- Modified: modules/rtjson/README --- Diff: https://github.com/kamailio/kamailio/commit/8217e812d5ba0dcd975c24aa1ead066… Patch: https://github.com/kamailio/kamailio/commit/8217e812d5ba0dcd975c24aa1ead066… --- diff --git a/modules/rtjson/README b/modules/rtjson/README index b1cc61d..5ac95f8 100644 --- a/modules/rtjson/README +++ b/modules/rtjson/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2015 asipto.com + Copyright Â© 2015 asipto.com __________________________________________________________________ Table of Contents @@ -116,7 +116,7 @@ modparam("rtjson", "xavp_cfg", "myxavp") 4.3. rtjson_next_route() 4.4. rtjson_update_branch() -4.1. rtjson_init_routes(rtdoc) +4.1. rtjson_init_routes(rtdoc) Initialize routing based on JSON document stored in rtdoc parameter. @@ -131,7 +131,7 @@ modparam("rtjson", "xavp_cfg", "myxavp") rtjson_init_routes("$var(json)"); ... -4.2. rtjson_push_routes() +4.2. rtjson_push_routes() Push the routes given in JSON document to rtjson_init_routes(rtdoc) to the internal fields used by Kamailio for routing. @@ -144,7 +144,7 @@ rtjson_init_routes("$var(json)"); rtjson_push_routes(); ... -4.3. rtjson_next_route() +4.3. rtjson_next_route() To be used in failure_route for serial forking, to push the next route to the internal fields used by Kamailio for routing. @@ -155,13 +155,15 @@ rtjson_push_routes(); ... rtjson_init_routes("$var(json)"); rtjson_push_routes(); +t_on_failure("REROUTE"); +t_relay(); ... failure_route[REROUTE] { rtjson_next_route(); } ... -4.4. rtjson_update_branch() +4.4. rtjson_update_branch() To be used in branch_route if the JSON document had attributes that needs to be set for each branch. @@ -172,6 +174,8 @@ failure_route[REROUTE] { ... rtjson_init_routes("$var(json)"); rtjson_push_routes(); +t_on_branch("OUTGOING"); +t_relay(); ... branch_route[OUTGOING] { rtjson_update_branch(); @@ -182,13 +186,40 @@ branch_route[OUTGOING] { The format of the JSON document containing routing information. - Description of the fields: TBA. + Description of the fields in the JSON routing document: + * version - intended to enforce versioning checks (not enforced yet), + recommended to be set to "1.0". + * routing - can be "serial" or "parallel", corresponding to desired + routing type: serial or parallel forking. + * routes - an array with structures holding the attributes for + destinations. The attributes can be: + + uri - request URI + + dst_uri - outbound proxy URI + + path - Path URI vector + + socket - local socket + + headers - a structure with values for headers From and To + specified as display name and URI, plus extra headers to be + appended to SIP request. It requires uac module in order to + update From and To headers. Set by rtjson_update_branch() only + for serial routing. + + branch_flags - branch flags. Set by rtjson_update_branch() + only for serial routing. + + fr_timer - value for fr_timer parameter of tm module. Set by + rtjson_update_branch() only for serial routing. + + fr_inv_timer - value for fr_inv_timer parameter of tm module. + Set by rtjson_update_branch() only for serial routing. + + Other fields can appear in the JSON routing document, being ignored by + rtjson functions. They can be processed directly in the configuration + files using json or jansson modules. For example, the document can + include the transaction identification tuple (index,label) that can be + used to resume the execution of a suspended transaction. Example 1.6. JSON Routing Structure ... { "version": "1.0", - "routing": "parallel", + "routing": "serial", "routes": [ { "uri": "sip:127.0.0.1:5080",

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015