sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:master:76470463: carrierroute: update doc for the new rpc commands

by Stefan Mititelu

Module: kamailio Branch: master Commit: 7647046384883f3506ec2321794f2b2e95032146 URL: https://github.com/kamailio/kamailio/commit/7647046384883f3506ec2321794f2b2… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: update doc for the new rpc commands --- Modified: src/modules/carrierroute/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/7647046384883f3506ec2321794f2b2… Patch: https://github.com/kamailio/kamailio/commit/7647046384883f3506ec2321794f2b2…

4 years, 9 months

[kamailio/kamailio] Master rebase (#2225)

by Stefan Mititelu

#### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ X ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ X] PR should be backported to stable branches - [ X ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Hello, what we've done in these commits: - ported corresponding functions from MI fifo to RPC (see cr_rpc.c) - used the helper functions from MI, in RPC (see cr_rpc_helper.c) - updated doc - deleted MI fifo files Hopefully nobody uses the MI commands for this module. Please let me know otherwise, in order to delete the last commit of this PR. Thanks, Stefan You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2225 -- Commit Summary -- * carrierroute: organize and add new rpc commands * carrierroute: add new rpc commands * carrierroute: update doc for the new rpc commands * carrierroute: remove mi fifo files -- File Changes -- M src/modules/carrierroute/carrierroute.c (50) D src/modules/carrierroute/cr_fifo.c (1243) A src/modules/carrierroute/cr_rpc.c (369) R src/modules/carrierroute/cr_rpc.h (79) A src/modules/carrierroute/cr_rpc_helper.c (589) M src/modules/carrierroute/doc/carrierroute_db.xml (2) M src/modules/carrierroute/doc/rpc.xml (129) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2225.patch https://github.com/kamailio/kamailio/pull/2225.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2225

4 years, 9 months

git:master:dd186700: carrierroute: add new rpc commands

by Stefan Mititelu

Module: kamailio Branch: master Commit: dd186700b6c7a62a19ddde15f3d367bc48a0aa29 URL: https://github.com/kamailio/kamailio/commit/dd186700b6c7a62a19ddde15f3d367b… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: add new rpc commands - add cr.add_host command - add cr.delete_host command --- Modified: src/modules/carrierroute/cr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/dd186700b6c7a62a19ddde15f3d367b… Patch: https://github.com/kamailio/kamailio/commit/dd186700b6c7a62a19ddde15f3d367b… --- diff --git a/src/modules/carrierroute/cr_rpc.c b/src/modules/carrierroute/cr_rpc.c index cf86ae7830..8979d25e8b 100644 --- a/src/modules/carrierroute/cr_rpc.c +++ b/src/modules/carrierroute/cr_rpc.c @@ -164,8 +164,6 @@ static const char *cr_rpc_dump_routes_doc[2] = { }; - - static void cr_rpc_activate_host(rpc_t *rpc, void *ctx) { int ret; str argument; @@ -245,6 +243,79 @@ static const char *cr_rpc_deactivate_host_doc[2] = { +static void cr_rpc_add_host(rpc_t *rpc, void *ctx) { + int ret; + str argument; + rpc_opt_t options; + + if (mode != CARRIERROUTE_MODE_FILE) { + rpc->fault(ctx, 500, "Not running in config file mode, cannot modify route from command line"); + return; + } + + if (rpc->scan(ctx, "S", &argument) < 1) { + rpc->fault(ctx, 500, "Get argument failed"); + return; + } + + if ((ret = get_rpc_opts(&argument, &options, opt_settings[OPT_ADD])) < 0) { + rpc->fault(ctx, 500, "Get options failed"); + return; + } + + options.status = 1; + options.cmd = OPT_ADD; + + if (update_route_data(&options) < 0) { + rpc->fault(ctx, 500, "Update options failed"); + return; + } + + rpc->add(ctx, "s", "200 ok"); + return; +} + +static const char *cr_rpc_add_host_doc[2] = { + "Add carrierroute host", 0 +}; + + + +static void cr_rpc_delete_host(rpc_t *rpc, void *ctx) { + int ret; + str argument; + rpc_opt_t options; + + if (mode != CARRIERROUTE_MODE_FILE) { + rpc->fault(ctx, 500, "Not running in config file mode, cannot modify route from command line"); + return; + } + + if (rpc->scan(ctx, "S", &argument) < 1) { + rpc->fault(ctx, 500, "Get argument failed"); + return; + } + + if ((ret = get_rpc_opts(&argument, &options, opt_settings[OPT_REMOVE])) < 0) { + rpc->fault(ctx, 500, "Get options failed"); + return; + } + + options.cmd = OPT_REMOVE; + + if (update_route_data(&options) < 0) { + rpc->fault(ctx, 500, "Update options failed"); + return; + } + + rpc->add(ctx, "s", "200 ok"); + return; +} + +static const char *cr_rpc_delete_host_doc[2] = { + "Remove carrierroute host", 0 +}; + static void cr_rpc_replace_host(rpc_t *rpc, void *ctx) { int ret; @@ -291,6 +362,8 @@ rpc_export_t cr_rpc_methods[] = { {"cr.dump_routes", cr_rpc_dump_routes, cr_rpc_dump_routes_doc, 0}, {"cr.activate_host", cr_rpc_activate_host, cr_rpc_activate_host_doc, 0}, {"cr.deactivate_host", cr_rpc_deactivate_host, cr_rpc_deactivate_host_doc, 0}, + {"cr.add_host", cr_rpc_add_host, cr_rpc_add_host_doc, 0}, + {"cr.delete_host", cr_rpc_delete_host, cr_rpc_delete_host_doc, 0}, {"cr.replace_host", cr_rpc_replace_host, cr_rpc_replace_host_doc, 0}, {0, 0, 0, 0} };

4 years, 9 months

git:master:4c7896fa: carrierroute: organize and add new rpc commands

by Stefan Mititelu

Module: kamailio Branch: master Commit: 4c7896fa7f0294fb33d918c7e528871d5969daaf URL: https://github.com/kamailio/kamailio/commit/4c7896fa7f0294fb33d918c7e528871… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu(a)enea.com> Date: 2020-02-24T10:16:37+02:00 carrierroute: organize and add new rpc commands - organize helper commands from deprecated MI FIFO - add cr.activate_host command - add cr.deactivate_host command - add cr.replace_host command --- Added: src/modules/carrierroute/cr_rpc.c Added: src/modules/carrierroute/cr_rpc.h Added: src/modules/carrierroute/cr_rpc_helper.c Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/cr_fifo.c --- Diff: https://github.com/kamailio/kamailio/commit/4c7896fa7f0294fb33d918c7e528871… Patch: https://github.com/kamailio/kamailio/commit/4c7896fa7f0294fb33d918c7e528871…

4 years, 9 months

git:master:10b96696: core: better debug logging in mk_action function

by Henning Westerholt

Module: kamailio Branch: master Commit: 10b96696b82d2e70c15f3e4bc52097f0a5062499 URL: https://github.com/kamailio/kamailio/commit/10b96696b82d2e70c15f3e4bc52097f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-02-23T21:45:48+01:00 core: better debug logging in mk_action function --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/kamailio/commit/10b96696b82d2e70c15f3e4bc52097f… Patch: https://github.com/kamailio/kamailio/commit/10b96696b82d2e70c15f3e4bc52097f… --- diff --git a/src/core/route_struct.c b/src/core/route_struct.c index 063e1773aa..51f48a0a6d 100644 --- a/src/core/route_struct.c +++ b/src/core/route_struct.c @@ -125,8 +125,7 @@ struct action* mk_action(enum action_type type, int count, ...) for (i=0; i<a->count; i++) { a->val[i].type = va_arg(args, int); a->val[i].u.data = va_arg(args, void *); - - DBG("ACTION_#%d #%d/%d: %d(%x)/ %p\n", a->type, i, a->count, a->val[i].type, a->val[i].type, a->val[i].u.data); + DBG("ACTION type%d, i/count %d/%d: type %d(%x)/ data %p\n", a->type, i, a->count, a->val[i].type, a->val[i].type, a->val[i].u.data); } va_end(args);

4 years, 9 months

git:master:3d28b4c3: modules: readme files regenerated - rtpengine ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 3d28b4c3fcb2131c0f360487b0d233ed93388aac URL: https://github.com/kamailio/kamailio/commit/3d28b4c3fcb2131c0f360487b0d233e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-23T12:31:14+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/3d28b4c3fcb2131c0f360487b0d233e… Patch: https://github.com/kamailio/kamailio/commit/3d28b4c3fcb2131c0f360487b0d233e… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 67e7b4475f..d6ae750551 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2210,7 +2210,7 @@ rtpengine_query(); 5.7. rtpengine_manage([flags]) - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. @@ -2229,7 +2229,9 @@ rtpengine_query(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do rtpengine_delete() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpengine_answer() if the request had SDP or tm is not loaded, diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index 93cb48b609..c40d15810e 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -636,7 +636,9 @@ rtpproxy_destroy(); resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of t_continue() does - the same as in failure_route). + the same as in failure_route; use a branch route to engage + rtpengine for a forwarded branch after resuming the transaction). + * It does nothing if used inside event_route[tm:branch-failure:...] * If reply to INVITE with code >= 300 do unforce_rtpproxy() * If reply with SDP to INVITE having code 1xx and 2xx, then do rtpproxy_answer() if the request had SDP or tm is not loaded,

4 years, 9 months

git:master:b15362ec: rtpproxy: docs updated for rtpproxy_manage()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b15362ec487d14b2a428dabbcce4f3de4cf1fc59 URL: https://github.com/kamailio/kamailio/commit/b15362ec487d14b2a428dabbcce4f3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:30:02+01:00 rtpproxy: docs updated for rtpproxy_manage() --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b15362ec487d14b2a428dabbcce4f3d… Patch: https://github.com/kamailio/kamailio/commit/b15362ec487d14b2a428dabbcce4f3d… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 203f280f90..536d7c6d0a 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -685,7 +685,14 @@ rtpproxy_destroy(); this function after resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpproxy_manage() in the route block of - t_continue() does the same as in failure_route). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

4 years, 9 months

git:master:bdba22bb: rtpengine: docs updated for rtpengine_manage()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bdba22bb9b573c7b32a7de45154f9159c725715f URL: https://github.com/kamailio/kamailio/commit/bdba22bb9b573c7b32a7de45154f915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:29:44+01:00 rtpengine: docs updated for rtpengine_manage() --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bdba22bb9b573c7b32a7de45154f915… Patch: https://github.com/kamailio/kamailio/commit/bdba22bb9b573c7b32a7de45154f915… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index f4213f2cab..fafff2e4c5 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2564,7 +2564,7 @@ rtpengine_query(); <function moreinfo="none">rtpengine_manage([flags])</function> </title> <para> - Manage the RTPProxy session - it combines the functionality of + Manage the RTPEngine session - it combines the functionality of rtpengine_offer(), rtpengine_answer() and rtpengine_delete(), detecting internally based on message type and method which one to execute. </para> @@ -2601,7 +2601,14 @@ rtpengine_query(); this function after resuming a suspended transaction (e.g., after t_continue()), because the context of executed route is FAILURE ROUTE (in other words, rtpengine_manage() in the route block of - t_continue() does the same as in failure_route). + t_continue() does the same as in failure_route; use a branch route + to engage rtpengine for a forwarded branch after resuming the + transaction). + </para> + </listitem> + <listitem> + <para> + It does nothing if used inside event_route[tm:branch-failure:...] </para> </listitem> <listitem>

4 years, 9 months

git:master:4305c501: rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4305c501128a0d37453a39795bd00314d7f60e4f URL: https://github.com/kamailio/kamailio/commit/4305c501128a0d37453a39795bd0031… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:22:08+01:00 rtpproxy: do nothing in rtpproxy_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/4305c501128a0d37453a39795bd0031… Patch: https://github.com/kamailio/kamailio/commit/4305c501128a0d37453a39795bd0031… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 972c6b1148..8aef20019f 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -1814,9 +1814,14 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) int method; int nosdp; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) - || (msg->cseq==NULL))) - { + || (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -1831,8 +1836,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) if(method==METHOD_CANCEL || method==METHOD_BYE) return unforce_rtp_proxy(msg, flags); - if(ip==NULL) - { + if(ip==NULL) { cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); }

4 years, 9 months

git:master:387de23a: rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...]

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 387de23a5c9252ee8409d378ea452bfd52e416d4 URL: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-23T12:20:17+01:00 rtpengine: do nothing in rtpengine_manage() when used in event_route[tm:branch-failure:...] - avoid duplicating sdp operations --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… Patch: https://github.com/kamailio/kamailio/commit/387de23a5c9252ee8409d378ea452bf… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4db1461f0d..c040c36444 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3616,9 +3616,14 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) int nosdp; tm_cell_t *t = NULL; + if(route_type==BRANCH_FAILURE_ROUTE) { + /* do nothing in branch failure event route + * - delete done on transaction failure route */ + return 1; + } + if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || - (msg->cseq==NULL))) - { + (msg->cseq==NULL))) { LM_ERR("no CSEQ header\n"); return -1; } @@ -3626,7 +3631,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + || method==METHOD_BYE || method==METHOD_UPDATE)) return -1; if (method==METHOD_CANCEL || method==METHOD_BYE)

4 years, 9 months

← Newer
1
...
14
15
16
17
18
19
20
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2020