sr-dev March 2019

sr-dev@lists.kamailio.org

28 participants
322 discussions

git:master:d33d60e0: core: exported functions to check incoming protocol

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d33d60e08b5081a605149b3bff2a0397c0952e9b URL: https://github.com/kamailio/kamailio/commit/d33d60e08b5081a605149b3bff2a039… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-07T16:24:24+01:00 core: exported functions to check incoming protocol - corresponding to proto==UDP/TCP/TLS/... --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d33d60e08b5081a605149b3bff2a039… Patch: https://github.com/kamailio/kamailio/commit/d33d60e08b5081a605149b3bff2a039… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 3457c6e860..5480405f24 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -993,6 +993,54 @@ static int sr_kemi_core_is_method_prack(sip_msg_t *msg) return sr_kemi_core_is_method_type(msg, METHOD_PRACK); } +/** + * + */ +static int sr_kemi_core_is_proto_udp(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_UDP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_tcp(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_TCP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_tls(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_TLS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_ws(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_WS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_wss(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_WSS)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + +/** + * + */ +static int sr_kemi_core_is_proto_sctp(sip_msg_t *msg) +{ + return (msg->rcv.proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; +} + /** * */ @@ -1511,6 +1559,36 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_UDP"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_TCP"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_tcp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_TLS"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_tls, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_WS"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_ws, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_WSS"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_wss, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_SCTP"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto_sctp, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

5 years, 9 months

git:5.2:60cf0c4e: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: 60cf0c4e4042ce858460193cad64b3aad2ecfd53 URL: https://github.com/kamailio/kamailio/commit/60cf0c4e4042ce858460193cad64b3a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-03-06T09:01:46+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/dialog/README Modified: src/modules/dialplan/README Modified: src/modules/dispatcher/README Modified: src/modules/jsonrpcs/README Modified: src/modules/pipelimit/README Modified: src/modules/rr/README Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/60cf0c4e4042ce858460193cad64b3a… Patch: https://github.com/kamailio/kamailio/commit/60cf0c4e4042ce858460193cad64b3a…

5 years, 9 months

git: new commits in branch 5.2

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/d44cf2168b45ec24926ca9a4bc5d255… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:20:06+01:00 doc/tutorials/tcp_tunning: note about network buffers size - they may need tunning when dealing with large data (cherry picked from commit 38a696fff66f0a453e54c92c93e8c459a1b4e77d) - URL: https://github.com/kamailio/kamailio/commit/75786d1a4f589111e677f03a019ea11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:21:09+01:00 dialog: clean very old dialogs for both unconfirmed and early state - it was done only for unconfirmed state (cherry picked from commit 8fd514f9bb9e819fa6e5880dc229955cafd72494) - URL: https://github.com/kamailio/kamailio/commit/80b6b69d8e7aa16bc572b275e3ea315… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:21:28+01:00 dialog: docs - small addition to early_timeout param (cherry picked from commit bdc4d3c7dea73e10353d37655f31d6e36c87126b) - URL: https://github.com/kamailio/kamailio/commit/95a9bf10c235bdbd13e5898d827ec60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:21:45+01:00 jsonrpcs: enable http transport in example (cherry picked from commit 7d2e1c83861214489b786bb31b03991588733937) - URL: https://github.com/kamailio/kamailio/commit/a7e227ffe1675d1f47f2209541c15a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:21:56+01:00 presence_mwi: small improvement to error log message (cherry picked from commit 91c0e1434d743b8af7bcaa7d993029b6a3c15cb8) - URL: https://github.com/kamailio/kamailio/commit/705cb9dfc4a9d3b4ddc59aa6a807cef… Author: Alex Hermann <alex(a)speakup.nl> Date: 2019-03-06T08:22:19+01:00 pipelimit: Fix memleak on shutdown (cherry picked from commit ffdec6d38d0935d8af2633e3d3ded8a985ddfcca) - URL: https://github.com/kamailio/kamailio/commit/07c0b560fa66c51b5fa00aca3746d35… Author: Alex Hermann <alex(a)speakup.nl> Date: 2019-03-06T08:22:34+01:00 pipelimit: Cleanup unused pipes when pipes are unused by a configurable number of timer intervals, remove them, freeing memory. (cherry picked from commit 048c928ec68dc82bd628f27bfc9f7901e4c4e9d2) - URL: https://github.com/kamailio/kamailio/commit/89c9da58ec864c90b4cc4afdfda1282… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:22:58+01:00 app_python: print script name in error message (cherry picked from commit 18db511c6ab8d97daed37582379cd2ba865abde4) - URL: https://github.com/kamailio/kamailio/commit/b310509c7eed3b057a4e126538ed646… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:23:46+01:00 pike: init head list and safety check - related to GH #1822 (cherry picked from commit a055214404b86d6418b7b6797e789773f1f42adb) - URL: https://github.com/kamailio/kamailio/commit/ae05d4c40611bf800375d128655ee31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:25:08+01:00 dispatcher: docs - fixed typos (cherry picked from commit bcb92740f043dce7c5145070cb298de5f7d02c6e) - URL: https://github.com/kamailio/kamailio/commit/55540fdf63a6b057d546dea9016af65… Author: Yasin CANER <caner_yaso(a)hotmail.com> Date: 2019-03-06T08:25:48+01:00 src/Makefile: added target to install files for systemd on Centos 7 (#1831) * src/Makefile: added target to install files for systemd on Centos 7 added target to install systemd and sysconfig files for systemd service installation method : make install-systemd-centos * src/makefile : add --system parameter for user src/makefile : add --system parameter for user after rebooting , /run/kamailio folder is survived. (cherry picked from commit 9f9ec197e029dca44ac57575b214a32916c838cb) - URL: https://github.com/kamailio/kamailio/commit/8f130b456f2019d6a100e26c0a69692… Author: Alex Hermann <alex(a)hexla.nl> Date: 2019-03-06T08:26:11+01:00 rr: Add new return value for preloaded route set to loose_route() Instead of returning just -1 (error), return a dedicated value. Now it is possible to detect from the script if a preloaded Route header was removed that pointed at the local proxy. The new return code is kept negative, so all code checking for failure response keeps working. (cherry picked from commit c5b8e5b3a82ac0f61a059f69921866952405ffe5) - URL: https://github.com/kamailio/kamailio/commit/f57924dafe81d8a993f59bcaf659557… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:26:34+01:00 misc/examples: exec.cfg updated for latest releases (cherry picked from commit 25173335dda3142e01243f209d24ba571d61578d) - URL: https://github.com/kamailio/kamailio/commit/7c64052b4b101846c9334ea4193a0df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:26:47+01:00 mqueue: added missing license header, removed svn ids (cherry picked from commit 065b1d64453d8b5709069f50cfd705901206feb3) - URL: https://github.com/kamailio/kamailio/commit/cc782576b769d6a66c04749658e2632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:28:21+01:00 core: removed return never executed (cherry picked from commit fb2ac639037cb911162bb61a541976899fa1bdab) - URL: https://github.com/kamailio/kamailio/commit/68b0d916ab9f994918ab83cba690393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:28:34+01:00 uac: error message made warning for loading uac api - some modules have optional use of uac (cherry picked from commit e54530901c92f2578dc149ac780867d318c54912) - URL: https://github.com/kamailio/kamailio/commit/3073b9609258446f141dc0405e96cd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:29:03+01:00 rtjson: mark for new branching after setting ruri or duri (cherry picked from commit dfc893140a860f9ece20ddf7743541dbbc260c6c) - URL: https://github.com/kamailio/kamailio/commit/ea53255bc17d0c0fbcec2f1c9f15bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:29:20+01:00 gzcompress: removed svn id line (cherry picked from commit f29b55f62513544e1481db5fd763204bd6bf1a4d) - URL: https://github.com/kamailio/kamailio/commit/440b6e6e8cdc8c75c862a9e3fe0fac3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:29:28+01:00 corex: removed svn id headers (cherry picked from commit f36cb4cff6fb7e373557c055d7ae0ad5aa28d4ca) - URL: https://github.com/kamailio/kamailio/commit/5e3cdf062b1f1e1a9aae34f4804cf4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:29:41+01:00 app_lua: docs - added note about KSR KEMI exports for register parameter - mention that old 'sr' Lua module might be obsoleted soon (cherry picked from commit bf13f41a642752602c49d090a06a615a19f84ee5) - URL: https://github.com/kamailio/kamailio/commit/a909e7d9213ee071917c785f10d883e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:30:12+01:00 tm: debug message when matching a skip method for transaction lookup (cherry picked from commit 0374a573604dfac337d69f8db38cca0e3ef30300) - URL: https://github.com/kamailio/kamailio/commit/a06423e2de3b4dd293ce92535d33e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:31:29+01:00 topos_redis: print expires value in log messages (cherry picked from commit f60b6e45d2b2f14a89e51eebe56e2ae857481c90) - URL: https://github.com/kamailio/kamailio/commit/6202cc8fb4dd8949584b92f6083b03a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:31:38+01:00 topos: fix typos in the debug messages (cherry picked from commit a21ae6ea14de0f7db2a66d806ecab4888dec0093) - URL: https://github.com/kamailio/kamailio/commit/88d4e86bccd252717329e75924a44dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:31:56+01:00 core: log printed size, current token size and buffer size for pv printf overflow (cherry picked from commit 44e48809a608d4de46d61198137cd669c6a4763f) - URL: https://github.com/kamailio/kamailio/commit/e5312652699b280e3f7f6e342db82da… Author: Sergey Basov <sergey.v.basov(a)gmail.com> Date: 2019-03-06T08:32:24+01:00 sipt: $sipt(redirection_number) evaluates the value as a numerical value sipt: $sipt(redirection_number) evaluates the value as a numerical value (cherry picked from commit 34fb47f28948e701c3ea98c673c8fb324b2f790e) - URL: https://github.com/kamailio/kamailio/commit/b7cf46a00168fcbd322e8969e61f2a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:32:37+01:00 kamailio.cfg: explicitely set the tcp/tls connections upper limits - notes about tcp_children and relation with children parameter (cherry picked from commit 409cb202057c89e87d910a1877ce719c6335ebdb) - URL: https://github.com/kamailio/kamailio/commit/4b08c9b7f14f8eec3f8b0a3e7dd940a… Author: root <root(a)livepbx-nit-syd-kam-01.livepbx.com.au> Date: 2019-03-06T08:33:36+01:00 siputils: fix debug logging (cherry picked from commit 91b2c5da34ba7064f858b13bf0a1d27da74336d4) - URL: https://github.com/kamailio/kamailio/commit/198442f53181f588b2a829892baa8c2… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-03-06T08:34:14+01:00 Revert "siputils: fix debug logging" This reverts commit 91b2c5da34ba7064f858b13bf0a1d27da74336d4. (cherry picked from commit 14b89ca98fbcd355e822115c126f23cba1649ca2) - URL: https://github.com/kamailio/kamailio/commit/a0f8a03be9d9b28bd29eac6dfc275fb… Author: Ovidiu Sas <osas(a)voipembedded.com> Date: 2019-03-06T08:34:22+01:00 siputils: fix debug logging (cherry picked from commit 83a31b81740ac57ca8a82e5e4a9509484e740ae7) - URL: https://github.com/kamailio/kamailio/commit/71a718d9f541d16e98a3fb592678777… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:34:54+01:00 jsonrpcs: exported exec function to KEMI also as execx - exec is a builtin in older versions of python and results in error if used as a member of an object - alternative: jsonrpcs_exec = getattr(KSR.jsonrpc, "exec") jsonrpcs_exec("...") (cherry picked from commit 4952da77e3e72933ab0301d9362f7d105ae3b4cf) - URL: https://github.com/kamailio/kamailio/commit/23591999287a38517b942d8f40be6b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:35:06+01:00 ndb_mongodb: exported exec function to KEMI also as execx (cherry picked from commit 64a17f5587f95145365345de474810de151acdd6) - URL: https://github.com/kamailio/kamailio/commit/44a70e5c60d11e3240205e353002dbf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:35:14+01:00 app_python: exported exec function to KEMI also as execx (cherry picked from commit d77cff5f89889d8fae704b247fc9cc954182062d) - URL: https://github.com/kamailio/kamailio/commit/a85da2a8399643ca4686564c7d78c9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:35:23+01:00 app_python3: exported exec function to KEMI also as execx (cherry picked from commit 49120624eab8eb1a9e69c00eba3216e1417d526e) - URL: https://github.com/kamailio/kamailio/commit/58261d83f454e9f3ad259532d35ca2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:35:52+01:00 core: set msg->pid when building local sip_msg_t from buf (cherry picked from commit b5f3a21d919f44f8842c2d85fb9447072b0f1889) - URL: https://github.com/kamailio/kamailio/commit/7648648fc95cc2a9de752ebefee11c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:36:01+01:00 cdp: proper check not to go over allocated size of apps ids - GH #1851 (cherry picked from commit f4b803183e71e0356eedadaca3801bbae26cf6fb) - URL: https://github.com/kamailio/kamailio/commit/08c683bfa8f2f05b02a878c861af345… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:36:10+01:00 tm: use msg_ctx_id_t to detect same msg/transaction processing - relies on msg id and pid, not only msg id (which is incremeted by each process and has potential conflicts with failure routing) (cherry picked from commit 95ea56b79192af60f53b9be1bde4450abdd73dd0) - URL: https://github.com/kamailio/kamailio/commit/acbbd03e2dbb8f6c96d4bd0815364eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:36:22+01:00 core: return the correct position in out buffer for decode base58 - GH #1868 (cherry picked from commit 8a9161b321035d805083316d3eb707c6c1b56652) - URL: https://github.com/kamailio/kamailio/commit/4f378b23d18da266e8c443fef1061cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:36:46+01:00 core: kemi - wraper to execute top routing function - reset the static buffer for selects and script flags (cherry picked from commit 6be53f64755358334e9f1c0971ce886a5e299efb) - URL: https://github.com/kamailio/kamailio/commit/5b1f5ac651363c725e92d2bff21ea50… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:36:56+01:00 core: receive - use kemi wrapper to execute top keng routes - reset the select static buffer - GH #1829 (cherry picked from commit 48686943aa37747a9a7581a5eb8c69098ce324d7) - URL: https://github.com/kamailio/kamailio/commit/d269ebd0c817e40a0c7055f2e246d2c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:37:06+01:00 core: use kemi exec route wrapper for onsend_route and child one init event (cherry picked from commit 23b65718462a6bbc860fe7b4159d3c7aac34d3b8) - URL: https://github.com/kamailio/kamailio/commit/67ff7d2ab011214aa24fa40a2c62c57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:37:15+01:00 tm: use kemi wrapper to execute routing functions (cherry picked from commit 31586e9e4eb0c43e1e34ad3ac730ba5f0942e838) - URL: https://github.com/kamailio/kamailio/commit/6600c2426d067cc57b10b346ee2f9db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:37:25+01:00 rtimer: use kemi wrapper to execute routing functions (cherry picked from commit 3008874c1971d09cb71cf8560fc280cfc305dadc) - URL: https://github.com/kamailio/kamailio/commit/6384256c3df3770e66989511b2019f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:37:33+01:00 htable: use kemi wrapper to execute routing functions (cherry picked from commit e5bffb306c45f7a0f0f672368884f430d63c09ba) - URL: https://github.com/kamailio/kamailio/commit/af9d741f3ef8a2e814bd1edb9a3cdcf… Author: denyspozniak <denys.pozniak(a)gmail.com> Date: 2019-03-06T08:37:42+01:00 dispatcher: more details for use_default param with dispatcher.list file (cherry picked from commit a70fd487a7509be41e558a9f54efaa7f038fd3e2) - URL: https://github.com/kamailio/kamailio/commit/a37df2461ee6a21d0bef093102f0dbe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:37:59+01:00 xmlrpc: use kemi wrapper to execute routing functions (cherry picked from commit 9446ed393d515255da7a04c881c92169e78c491d) - URL: https://github.com/kamailio/kamailio/commit/dbcc4b611d7eee0f97d96208d1dce97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:07+01:00 xhttp: use kemi wrapper to execute routing functions (cherry picked from commit 6497efe137afb3da632eb278fc69079a7e77215d) - URL: https://github.com/kamailio/kamailio/commit/ef0a63249fdf35695f5483d6bba3883… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:15+01:00 websocket: use kemi wrapper to execute routing functions (cherry picked from commit 9e1c17d3c9e7c323bda8f99bfc27a8113ebd55ba) - URL: https://github.com/kamailio/kamailio/commit/403da8e8dcc2e4986595f183f0ac37a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:23+01:00 topos: use kemi wrapper to execute routing functions (cherry picked from commit 53786f5223260c1a5c03685ca26ad73774c75bc0) - URL: https://github.com/kamailio/kamailio/commit/8a9c35f92afb33179e4d8a06024abf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:31+01:00 topoh: use kemi wrapper to execute routing functions (cherry picked from commit 2f421594c3d34a02f38283f64e739860acc142bc) - URL: https://github.com/kamailio/kamailio/commit/d4f63e8cd2ec5c87818fdaf29c85244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:39+01:00 tls: use kemi wrapper to execute routing functions (cherry picked from commit eb653f02cfe25a2c3b6388d5c581a37139707e77) - URL: https://github.com/kamailio/kamailio/commit/4caec075eeb6585bd52e05a882b59fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:47+01:00 timer: use kemi wrapper to execute routing functions (cherry picked from commit f66bbf48d04fc94cb3849cc977990ded935dffff) - URL: https://github.com/kamailio/kamailio/commit/e2a48d84090960f6c3f33db3595435a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:38:56+01:00 sipcapture: use kemi wrapper to execute routing functions (cherry picked from commit 1b45419212f72d51dbe99d42087e119bb9dd15de) - URL: https://github.com/kamailio/kamailio/commit/82c7616e86678a4ef79ad7f07791ee5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:39:04+01:00 registrar: use kemi wrapper to execute routing functions (cherry picked from commit c3ed3d9a531c403fc850d229252eb4bcd4cc473e) - URL: https://github.com/kamailio/kamailio/commit/ebef67b51d532c121b47238dfde16b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:39:14+01:00 msrp: use kemi wrapper to execute routing functions (cherry picked from commit 3c2cf7c3aad2670b1feff5b5fde9a49ba9aeb295) - URL: https://github.com/kamailio/kamailio/commit/77be3404cce56e00d5cf652b6522ebf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:39:34+01:00 http_async_client: use kemi wrapper to execute routing functions (cherry picked from commit 30533678a1132951bc0e354c1503325b8325474f) - URL: https://github.com/kamailio/kamailio/commit/5fe4eaea8afc87bdbfaf0b507de045f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:39:59+01:00 evapi: use kemi wrapper to execute routing functions (cherry picked from commit 8c930c09dcf20263fa34cd2568f2600785440da2) - URL: https://github.com/kamailio/kamailio/commit/8b57c0b4be65be758b1d0b6b8cf8935… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:40:09+01:00 dispatcher: use kemi wrapper to execute routing functions (cherry picked from commit ea9c1f5d8f074a057c53c5d3f6f1f32bce998143) - URL: https://github.com/kamailio/kamailio/commit/8421a744736bf2bfd6ee007a026e75e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:40:19+01:00 dialog: use kemi wrapper to execute routing functions (cherry picked from commit d4f4a8ad572c0335ddc28231bf02cc65ede181f0) - URL: https://github.com/kamailio/kamailio/commit/209dd6fcba96f3ff436298ebe5d1710… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:40:40+01:00 tcpops: event routes executed via kemi framework - fixed missing compatibility with kemi execution - event_callback parameter allows setting the name of kemi function (cherry picked from commit d36cde90f345621cdab557e9f46bc8490e221004) - URL: https://github.com/kamailio/kamailio/commit/faed5b294d15ba642e2b58a7577bbaa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:40:48+01:00 tcpops: docs for event_callback parameter (cherry picked from commit aab836d84d1121f9c8dd3b0fb090d6767b4e05a8) - URL: https://github.com/kamailio/kamailio/commit/2e3e72cfe906bf08b0c940d4e461890… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:41:04+01:00 tm: put back t in wait timer if still referenced more than once - have a safety upper limit for putting back in wait timer - special credits to Yufei Tao for testing and helping to troubleshoot (cherry picked from commit 814d5cc1f4f5b1e4b95737108dffc1e7d7bd566f) - URL: https://github.com/kamailio/kamailio/commit/567c5b91ff0de3237d4dc98138675f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:41:15+01:00 dialplan: basic safety for concurent rpc reload - reported by GH #1874 (cherry picked from commit 99d5da8d595961063249f871a5d150474fa6f317) - URL: https://github.com/kamailio/kamailio/commit/e1116aca38ad55305593c8936fcacff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:41:36+01:00 dialplan: docs - note about limiting to max 1 rpc reload in 5 seconds (cherry picked from commit 34f928427ecf315f638cd59fa512d59f4c64f22e) - URL: https://github.com/kamailio/kamailio/commit/b30881d5d7cd9f8896ea07bf5852649… Author: Carsten Bock <carsten(a)ng-voice.com> Date: 2019-03-06T08:41:46+01:00 tcpops: Fix minor typo: tcp_init_evroutes => tcpops_init_evroutes (cherry picked from commit cbadbca348c5deb97522afe440dc6055475ea72c) - URL: https://github.com/kamailio/kamailio/commit/544d1ccab56ddc3b58c5301ade5c241… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:41:58+01:00 topoh: detect when via param is shorter than expected prefix (cherry picked from commit e6950ffb1985493e717e3d774eddad779aed1514) - URL: https://github.com/kamailio/kamailio/commit/24a739225f29650c3b4eef7fb46cce6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:42:16+01:00 rtjson: user wrapper functions for kemi exports (cherry picked from commit 138172a388bc8b23035a7a422b97fc0276ed1462) - URL: https://github.com/kamailio/kamailio/commit/18b8cf91fd370523ec3da5f34b86eb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:42:24+01:00 rtjson: more debug messages when getting routes from json (cherry picked from commit 649687fd8dd5a3d9b6b04d75d4e0d129f14e91d6) - URL: https://github.com/kamailio/kamailio/commit/f3e02e66beb2f461905d33157ae2aa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:42:33+01:00 rtjson: reuse r-uri if not given in the rtjson field (cherry picked from commit b6b91a6d517675e9891e83b57dcdf90d7db0673d)

5 years, 9 months

git:master:b6b91a6d: rtjson: reuse r-uri if not given in the rtjson field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b6b91a6d517675e9891e83b57dcdf90d7db0673d URL: https://github.com/kamailio/kamailio/commit/b6b91a6d517675e9891e83b57dcdf90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:16:59+01:00 rtjson: reuse r-uri if not given in the rtjson field --- Modified: src/modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/b6b91a6d517675e9891e83b57dcdf90… Patch: https://github.com/kamailio/kamailio/commit/b6b91a6d517675e9891e83b57dcdf90… --- diff --git a/src/modules/rtjson/rtjson_routing.c b/src/modules/rtjson/rtjson_routing.c index 705a5649d3..91ebffac0b 100644 --- a/src/modules/rtjson/rtjson_routing.c +++ b/src/modules/rtjson/rtjson_routing.c @@ -520,12 +520,16 @@ int rtjson_append_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) rj = srjson_GetObjectItem(jdoc, nj, "uri"); if(rj==NULL || rj->type!=srjson_String || rj->valuestring==NULL) { - return -1; + if (msg->new_uri.s!=NULL) { + uri = msg->new_uri; + } else { + uri = msg->first_line.u.request.uri; + } + } else { + uri.s = rj->valuestring; + uri.len = strlen(uri.s); } - uri.s = rj->valuestring; - uri.len = strlen(uri.s); - rj = srjson_GetObjectItem(jdoc, nj, "dst_uri"); if(rj!=NULL && rj->type==srjson_String && rj->valuestring!=NULL) { duri.s = rj->valuestring;

5 years, 9 months

git:master:649687fd: rtjson: more debug messages when getting routes from json

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 649687fd8dd5a3d9b6b04d75d4e0d129f14e91d6 URL: https://github.com/kamailio/kamailio/commit/649687fd8dd5a3d9b6b04d75d4e0d12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:16:59+01:00 rtjson: more debug messages when getting routes from json --- Modified: src/modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/649687fd8dd5a3d9b6b04d75d4e0d12… Patch: https://github.com/kamailio/kamailio/commit/649687fd8dd5a3d9b6b04d75d4e0d12… --- diff --git a/src/modules/rtjson/rtjson_routing.c b/src/modules/rtjson/rtjson_routing.c index 2951c142c4..705a5649d3 100644 --- a/src/modules/rtjson/rtjson_routing.c +++ b/src/modules/rtjson/rtjson_routing.c @@ -271,6 +271,8 @@ int rtjson_push_routes(sip_msg_t *msg) return -1; } + LM_DBG("routes index: %d\n", iavp->val.v.i); + srjson_InitDoc(&tdoc, NULL); tdoc.root = srjson_Parse(&tdoc, javp->val.v.s.s); @@ -619,6 +621,8 @@ int rtjson_next_route(sip_msg_t *msg) return -1; } + LM_DBG("routes index: %d\n", iavp->val.v.i); + srjson_InitDoc(&tdoc, NULL); tdoc.root = srjson_Parse(&tdoc, javp->val.v.s.s); @@ -653,12 +657,16 @@ int rtjson_next_route(sip_msg_t *msg) nj = nj->next; i++; } - if(nj==NULL) + if(nj==NULL) { + LM_DBG("no route at index: %d\n", iavp->val.v.i); goto error; + } iavp->val.v.i++; - if(rtjson_append_branch(msg, &tdoc, nj)<0) + if(rtjson_append_branch(msg, &tdoc, nj)<0) { + LM_DBG("route index %d not appended\n", iavp->val.v.i); goto error; + } srjson_DestroyDoc(&tdoc); return 0;

5 years, 9 months

git:master:138172a3: rtjson: user wrapper functions for kemi exports

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 138172a388bc8b23035a7a422b97fc0276ed1462 URL: https://github.com/kamailio/kamailio/commit/138172a388bc8b23035a7a422b97fc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-03-06T08:16:59+01:00 rtjson: user wrapper functions for kemi exports --- Modified: src/modules/rtjson/rtjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/138172a388bc8b23035a7a422b97fc0… Patch: https://github.com/kamailio/kamailio/commit/138172a388bc8b23035a7a422b97fc0… --- diff --git a/src/modules/rtjson/rtjson_mod.c b/src/modules/rtjson/rtjson_mod.c index ed9e94ba86..de4a3f2294 100644 --- a/src/modules/rtjson/rtjson_mod.c +++ b/src/modules/rtjson/rtjson_mod.c @@ -168,27 +168,84 @@ static int w_rtjson_update_branch(sip_msg_t *msg, char *p1, char *p2) return 1; } +/** + * + */ +static int ki_rtjson_init_routes(sip_msg_t *msg, str *srdoc) +{ + if(msg==NULL) + return -1; + + if(rtjson_init_routes(msg, srdoc)<0) + return -1; + + return 1; +} + +/** + * + */ +static int ki_rtjson_push_routes(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(rtjson_push_routes(msg)<0) + return -1; + + return 1; +} + +/** + * + */ +static int ki_rtjson_next_route(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(rtjson_next_route(msg)<0) + return -1; + + return 1; +} + +/** + * + */ +static int ki_rtjson_update_branch(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(rtjson_update_branch(msg)<0) + return -1; + + return 1; +} + + /** * */ static sr_kemi_t sr_kemi_rtjson_exports[] = { { str_init("rtjson"), str_init("init_routes"), - SR_KEMIP_INT, rtjson_init_routes, + SR_KEMIP_INT, ki_rtjson_init_routes, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("rtjson"), str_init("push_routes"), - SR_KEMIP_INT, rtjson_push_routes, + SR_KEMIP_INT, ki_rtjson_push_routes, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("rtjson"), str_init("next_route"), - SR_KEMIP_INT, rtjson_next_route, + SR_KEMIP_INT, ki_rtjson_next_route, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("rtjson"), str_init("update_branch"), - SR_KEMIP_INT, rtjson_update_branch, + SR_KEMIP_INT, ki_rtjson_update_branch, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

5 years, 9 months

use failure_route for local transaction

by Luis Azedo

Hi, i have a use case where i need to use failure_route for local transactions like this. route[TIMER_ROUTE] { ... do sql while rows t_uac_send ... } event_route[tm:local-request] { if this is my request t_on_reply("MY_REPLY"); t_on_failure("MY_FAULT"); t_set_fr(0, MY_TIMEOUT); handle_ruri_alias(); record_route(); } but MY_FAULT is never called even for 408 (timeout) i tracked down to t_reply:run_failure_handlers where the check fails. ... struct sip_msg *shmem_msg = t->uas.request; ... if (!shmem_msg) { LM_WARN("no UAC support (%d, %d) \n", on_failure, t->tmcb_hl.reg_types); return 0; } ... i changed the code a bit to check for is_local and parse the the request and it works for me, however i would like other to comment on this approach as there may be a simpler solution. thanks if (!shmem_msg) { sip_msg_t local_msg; if(!is_local(t)) { LM_WARN("no UAC support (%d, %d) \n", on_failure, t->tmcb_hl.reg_types); return 0; } /* parse the retr. buffer */ memset(&local_msg, 0, sizeof(struct sip_msg)); local_msg.buf = t->uac[picked_branch].request.buffer; local_msg.len = t->uac[picked_branch].request.buffer_len; if (parse_msg(local_msg.buf, local_msg.len, &local_msg) != 0) { LM_ERR("failed to parse retr buffer (weird!): \n%.*s\n", (int)local_msg.len, local_msg.buf); return 0; } t->uas.request = sip_msg_shm_clone(&local_msg, NULL, 1); free_sip_msg(&local_msg); if(!t->uas.request) { LM_ERR("UAS REQ IS NULL AFTER PARSE \n"); return 0; } shmem_msg = t->uas.request; } >

5 years, 10 months

git:master:9cbb3f20: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9cbb3f208672fab8735ca20f30b5ee65401f926a URL: https://github.com/kamailio/kamailio/commit/9cbb3f208672fab8735ca20f30b5ee6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-03-04T18:46:45+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/9cbb3f208672fab8735ca20f30b5ee6… Patch: https://github.com/kamailio/kamailio/commit/9cbb3f208672fab8735ca20f30b5ee6…

5 years, 10 months

git:master:de829e8e: rtpengine: update docs

by Richard Fuchs

Module: kamailio Branch: master Commit: de829e8e359e64e93a203c1c70da14446b6a99a8 URL: https://github.com/kamailio/kamailio/commit/de829e8e359e64e93a203c1c70da144… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-03-04T12:36:08-05:00 rtpengine: update docs Document rtpengine_info (from ffee45da0) and the via-branch=next option (from 2baa05ad) --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/de829e8e359e64e93a203c1c70da144… Patch: https://github.com/kamailio/kamailio/commit/de829e8e359e64e93a203c1c70da144… --- diff --git a/src/modules/rtpengine/doc/rtpengine.xml b/src/modules/rtpengine/doc/rtpengine.xml index 0d471d9d9d..5a6975cb71 100644 --- a/src/modules/rtpengine/doc/rtpengine.xml +++ b/src/modules/rtpengine/doc/rtpengine.xml @@ -91,7 +91,7 @@ <holder><ulink url='http://www.voipembedded.com'>VoIPEmbedded Inc.</ulink></holder> </copyright> <copyright> - <year>2013-2018</year> + <year>2013-2019</year> <holder>Sipwise GmbH</holder> </copyright> </bookinfo> diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 82db3baffd..828bfee43f 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2063,7 +2063,9 @@ rtpengine_offer(); <quote>auto</quote> - use the first <quote>Via</quote> header if this is a request, or the second one if this is a reply; <quote>extra</quote> - don't take the value from a header, but instead use - the value of the <quote>extra_id_pv</quote> variable. + the value of the <quote>extra_id_pv</quote> variable; + <quote>next</quote> - use the value of the <quote>Via/branch</quote> + tag that Kamailio will generate for the next branch. This can be used to create one media session per branch on the &rtp; proxy. When sending a subsequent <quote>delete</quote> command to the &rtp; proxy, you can then stop just the session for a specific branch when @@ -2429,6 +2431,34 @@ if (has_body("application/sdp")) { </para> </example> </section> + <section id="rtpengine.f.rtpengine_info"> + <title> + <function moreinfo="none">rtpengine_info([flags])</function> + </title> + <para> + Send an updated offer to rtpengine. This is meant to be used when processing + Tricke ICE &sdp; Fragments that are carried in &sip; INFO messages + and are proxied to endpoints that do not support ICE. With a matching + content type, the &sdp; fragment is used to update rtpengine's list of ICE + candidates. No new &sdp; is returned and so the &sip; INFO message should + be consumed after calling this function. + </para> + <para> + While this function supports the same flags as <quote>rtpengine_offer</quote> + et al, it is not normally necessary to provide any. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>rtpengine_info</function> usage</title> + <programlisting format="linespecific"> +... +rtpengine_info(); +... +</programlisting> + </example> + </section> <section id="rtpengine.f.rtpengine_delete"> <title> <function moreinfo="none">rtpengine_delete([flags])</function>

5 years, 10 months

git:master:ffee45da: rtpengine: add support for trickle ICE SDP fragments

by Richard Fuchs

Module: kamailio Branch: master Commit: ffee45da0a302e2cc70612ec9e53195b3cfe6989 URL: https://github.com/kamailio/kamailio/commit/ffee45da0a302e2cc70612ec9e53195… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2019-03-04T12:08:19-05:00 rtpengine: add support for trickle ICE SDP fragments --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/ffee45da0a302e2cc70612ec9e53195… Patch: https://github.com/kamailio/kamailio/commit/ffee45da0a302e2cc70612ec9e53195…

5 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2019