sr-dev February 2020

sr-dev@lists.kamailio.org

17 participants
324 discussions

git:master:3843ae18: usrloc: log database table if use_table() fails

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3843ae18599bfc1806ccb62df44bbc8ad41d60dd URL: https://github.com/kamailio/kamailio/commit/3843ae18599bfc1806ccb62df44bbc8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T10:32:17+01:00 usrloc: log database table if use_table() fails --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/3843ae18599bfc1806ccb62df44bbc8… Patch: https://github.com/kamailio/kamailio/commit/3843ae18599bfc1806ccb62df44bbc8… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index c95cbb0dd7..8c65063784 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -666,7 +666,13 @@ int db_insert_ucontact(ucontact_t* _c) } if (ul_dbf.use_table(ul_dbh, _c->domain) < 0) { - LM_ERR("sql use_table failed\n"); + if(_c->domain) { + LM_ERR("sql use_table failed for: %.*s\n", + (_c->domain->s)?_c->domain->len:0, + (_c->domain->s)?_c->domain->s:""); + } else { + LM_ERR("sql use_table failed - null\n"); + } return -1; }

4 years, 9 months

git:5.3:b35c2ce5: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: b35c2ce5969e018884f5ef536cab71918a2027dd URL: https://github.com/kamailio/kamailio/commit/b35c2ce5969e018884f5ef536cab719… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-24T09:46:18+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/b35c2ce5969e018884f5ef536cab719… Patch: https://github.com/kamailio/kamailio/commit/b35c2ce5969e018884f5ef536cab719… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index 124b1c1041..cb659bdf75 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -55,6 +55,11 @@ Lucian Balaceanu 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -194,6 +199,11 @@ Chapter 1. Admin Guide 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -632,6 +642,11 @@ dstavp) 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 5.1. cr.reload_routes @@ -658,6 +673,75 @@ dstavp) Parameters: * none +5.3. cr.add_host + + This command adds a new host to the route rules + + Name: cr.add_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.add_host -- '-h test.domain.com:5060 -d proxy -p null -w + 0.1' + +5.4. cr.delete_host + + This command deletes a host from the route rules + + Name: cr.delete_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.delete_host -- '-h test.domain.com:5060 -d proxy -p null' + +5.5. cr.activate_host + + This command activates a host from the route rules + + Name: cr.activate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.activate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.6. cr.deactivate_host + + This command deactivates a host from the route rules + + Name: cr.deactivate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.deactivate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.7. cr.replace_host + + This command replaces a host from the route rules + + Name: cr.replace_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.replace_host -- '-h test1.domain.com:5060 -d proxy -t + test2.domain.com:5060' + 6. Configuration examples Example 1.14. Configuration example - Routing to default tree @@ -1128,7 +1212,7 @@ modparam("carrierroute", "carrierroute_rewrite_suffix_col", "rewrite_suffix") 14. carrierroute_description_col (string) A comment for the route entry, useful for larger routing tables. The - comment is also displayed by the fifo cmd "cr_dump_routes". + comment is also displayed by the rpc cmd "cr.dump_routes". Example 2.14. Set carrierroute_description_col parameter ...

4 years, 9 months

git:5.3:3e94d214: carrierroute: remove mi fifo files

by Stefan Mititelu

Module: kamailio Branch: 5.3 Commit: 3e94d214bd9361d452c575954fc739b7bb6d3908 URL: https://github.com/kamailio/kamailio/commit/3e94d214bd9361d452c575954fc739b… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:56+02:00 carrierroute: remove mi fifo files (cherry picked from commit 18c415f27ed9a914615a95c1d648ec2677ea13f1) --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/doc/carrierroute_db.xml Removed: src/modules/carrierroute/cr_fifo.c Removed: src/modules/carrierroute/cr_fifo.h --- Diff: https://github.com/kamailio/kamailio/commit/3e94d214bd9361d452c575954fc739b… Patch: https://github.com/kamailio/kamailio/commit/3e94d214bd9361d452c575954fc739b…

4 years, 9 months

git:5.3:8ca1b7c3: carrierroute: add new rpc commands

by Stefan Mititelu

Module: kamailio Branch: 5.3 Commit: 8ca1b7c325bcfe27f1d5fb71f42bf1ea92a5b408 URL: https://github.com/kamailio/kamailio/commit/8ca1b7c325bcfe27f1d5fb71f42bf1e… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:56+02:00 carrierroute: add new rpc commands - add cr.add_host command - add cr.delete_host command (cherry picked from commit dd186700b6c7a62a19ddde15f3d367bc48a0aa29) --- Modified: src/modules/carrierroute/cr_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8ca1b7c325bcfe27f1d5fb71f42bf1e… Patch: https://github.com/kamailio/kamailio/commit/8ca1b7c325bcfe27f1d5fb71f42bf1e… --- 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:5.3:f7e481ac: carrierroute: update doc for the new rpc commands

by Stefan Mititelu

Module: kamailio Branch: 5.3 Commit: f7e481ac613c0cbc49516d579cf3dd6c9ff9aa21 URL: https://github.com/kamailio/kamailio/commit/f7e481ac613c0cbc49516d579cf3dd6… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:56+02:00 carrierroute: update doc for the new rpc commands (cherry picked from commit 7647046384883f3506ec2321794f2b2e95032146) --- Modified: src/modules/carrierroute/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/f7e481ac613c0cbc49516d579cf3dd6… Patch: https://github.com/kamailio/kamailio/commit/f7e481ac613c0cbc49516d579cf3dd6…

4 years, 9 months

git:5.3:2786033f: carrierroute: organize and add new rpc commands

by Stefan Mititelu

Module: kamailio Branch: 5.3 Commit: 2786033fa978f3059541ef6aee03c53ea570f485 URL: https://github.com/kamailio/kamailio/commit/2786033fa978f3059541ef6aee03c53… Author: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Committer: Stefan Mititelu <stefan.mititelu92(a)gmail.com> Date: 2020-02-24T10:27:48+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 (cherry picked from commit 4c7896fa7f0294fb33d918c7e528871d5969daaf) --- 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/2786033fa978f3059541ef6aee03c53… Patch: https://github.com/kamailio/kamailio/commit/2786033fa978f3059541ef6aee03c53…

4 years, 9 months

git:master:91e9835d: kemix: exported get_conid() function to retrieve tcp connection id

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 91e9835dc751403440b1b8c3d03004b3434fdd45 URL: https://github.com/kamailio/kamailio/commit/91e9835dc751403440b1b8c3d03004b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T09:31:39+01:00 kemix: exported get_conid() function to retrieve tcp connection id - returns -1 if not available --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/91e9835dc751403440b1b8c3d03004b… Patch: https://github.com/kamailio/kamailio/commit/91e9835dc751403440b1b8c3d03004b… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index d261766f85..81e433c9e3 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -32,6 +32,7 @@ #include "../../core/parser/parse_from.h" #include "../../core/parser/parse_to.h" #include "../../core/parser/digest/digest.h" +#include "../../core/tcp_conn.h" MODULE_VERSION @@ -822,6 +823,25 @@ static sr_kemi_xval_t* ki_kx_get_callid(sip_msg_t *msg) return &_sr_kemi_kx_xval; } +/** + * + */ +static int ki_kx_get_conid(sip_msg_t *msg) +{ + tcp_connection_t *con; + int conid; + + if (msg == NULL) + return -1; + + if ((con = tcpconn_get(msg->rcv.proto_reserved1, 0, 0, 0, 0)) == NULL) + return -1; + + conid = con->id; + tcpconn_put(con); + + return conid; +} /** * @@ -1058,6 +1078,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_conid"), + SR_KEMIP_INT, ki_kx_get_conid, + { 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 } } };

4 years, 9 months

git:master:150252e7: core: kemi - convenience function KS.is_proto() to test many transport protos

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 150252e785d48e051de8640a1bbfa8a2f1a34553 URL: https://github.com/kamailio/kamailio/commit/150252e785d48e051de8640a1bbfa8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-02-24T09:31:39+01:00 core: kemi - convenience function KS.is_proto() to test many transport protos --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/150252e785d48e051de8640a1bbfa8a… Patch: https://github.com/kamailio/kamailio/commit/150252e785d48e051de8640a1bbfa8a… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 612e980734..8b5663a39f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1105,6 +1105,59 @@ static int sr_kemi_core_is_proto_sctp(sip_msg_t *msg) return (msg->rcv.proto == PROTO_SCTP)?SR_KEMI_TRUE:SR_KEMI_FALSE; } +/** + * + */ +static int sr_kemi_core_is_proto(sip_msg_t *msg, str *sproto) +{ + int i; + if (msg==NULL || sproto==NULL || sproto->s==NULL || sproto->len<=0) { + return SR_KEMI_FALSE; + } + for(i=0; i<sproto->len; i++) { + switch(sproto->s[i]) { + case 'e': + case 'E': + if (msg->rcv.proto == PROTO_TLS) { + return SR_KEMI_TRUE; + } + break; + case 's': + case 'S': + if (msg->rcv.proto == PROTO_SCTP) { + return SR_KEMI_TRUE; + } + break; + case 't': + case 'T': + if (msg->rcv.proto == PROTO_TCP) { + return SR_KEMI_TRUE; + } + break; + case 'u': + case 'U': + if (msg->rcv.proto == PROTO_UDP) { + return SR_KEMI_TRUE; + } + break; + case 'v': + case 'V': + if (msg->rcv.proto == PROTO_WS) { + return SR_KEMI_TRUE; + } + break; + + case 'w': + case 'W': + if (msg->rcv.proto == PROTO_WSS) { + return SR_KEMI_TRUE; + } + break; + } + } + return SR_KEMI_FALSE; +} + /** * */ @@ -1717,6 +1770,11 @@ 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_proto"), + SR_KEMIP_BOOL, sr_kemi_core_is_proto, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_IPv4"), SR_KEMIP_BOOL, sr_kemi_core_is_af_ipv4, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

4 years, 9 months

git:master:cd3def2d: modules: readme files regenerated - carrierroute ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: cd3def2da2b5a41ef5dac3715c18ad415d5ac218 URL: https://github.com/kamailio/kamailio/commit/cd3def2da2b5a41ef5dac3715c18ad4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-02-24T09:31:24+01:00 modules: readme files regenerated - carrierroute ... [skip ci] --- Modified: src/modules/carrierroute/README --- Diff: https://github.com/kamailio/kamailio/commit/cd3def2da2b5a41ef5dac3715c18ad4… Patch: https://github.com/kamailio/kamailio/commit/cd3def2da2b5a41ef5dac3715c18ad4… --- diff --git a/src/modules/carrierroute/README b/src/modules/carrierroute/README index 124b1c1041..cb659bdf75 100644 --- a/src/modules/carrierroute/README +++ b/src/modules/carrierroute/README @@ -55,6 +55,11 @@ Lucian Balaceanu 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -194,6 +199,11 @@ Chapter 1. Admin Guide 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 6. Configuration examples 7. Installation and Running @@ -632,6 +642,11 @@ dstavp) 5.1. cr.reload_routes 5.2. cr.dump_routes + 5.3. cr.add_host + 5.4. cr.delete_host + 5.5. cr.activate_host + 5.6. cr.deactivate_host + 5.7. cr.replace_host 5.1. cr.reload_routes @@ -658,6 +673,75 @@ dstavp) Parameters: * none +5.3. cr.add_host + + This command adds a new host to the route rules + + Name: cr.add_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.add_host -- '-h test.domain.com:5060 -d proxy -p null -w + 0.1' + +5.4. cr.delete_host + + This command deletes a host from the route rules + + Name: cr.delete_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.delete_host -- '-h test.domain.com:5060 -d proxy -p null' + +5.5. cr.activate_host + + This command activates a host from the route rules + + Name: cr.activate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.activate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.6. cr.deactivate_host + + This command deactivates a host from the route rules + + Name: cr.deactivate_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.deactivate_host -- '-h test.domain.com:5060 -d proxy -p + null' + +5.7. cr.replace_host + + This command replaces a host from the route rules + + Name: cr.replace_host + + Parameters: + * One long string parameter that contains the arguments for this + command + + Example: + * kamcmd cr.replace_host -- '-h test1.domain.com:5060 -d proxy -t + test2.domain.com:5060' + 6. Configuration examples Example 1.14. Configuration example - Routing to default tree @@ -1128,7 +1212,7 @@ modparam("carrierroute", "carrierroute_rewrite_suffix_col", "rewrite_suffix") 14. carrierroute_description_col (string) A comment for the route entry, useful for larger routing tables. The - comment is also displayed by the fifo cmd "cr_dump_routes". + comment is also displayed by the rpc cmd "cr.dump_routes". Example 2.14. Set carrierroute_description_col parameter ...

4 years, 9 months

git:master:18c415f2: carrierroute: remove mi fifo files

by Stefan Mititelu

Module: kamailio Branch: master Commit: 18c415f27ed9a914615a95c1d648ec2677ea13f1 URL: https://github.com/kamailio/kamailio/commit/18c415f27ed9a914615a95c1d648ec2… 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: remove mi fifo files --- Modified: src/modules/carrierroute/carrierroute.c Modified: src/modules/carrierroute/doc/carrierroute_db.xml Removed: src/modules/carrierroute/cr_fifo.c Removed: src/modules/carrierroute/cr_fifo.h --- Diff: https://github.com/kamailio/kamailio/commit/18c415f27ed9a914615a95c1d648ec2… Patch: https://github.com/kamailio/kamailio/commit/18c415f27ed9a914615a95c1d648ec2…

4 years, 9 months

← Newer
1
...
13
14
15
16
17
18
19
...
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