sr-dev June 2019

sr-dev@lists.kamailio.org

19 participants
216 discussions

git:master:fea4b388: kamctl: added subcommand srv version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fea4b3881574c304b7e73aa764cd49b109f24c61 URL: https://github.com/kamailio/kamailio/commit/fea4b3881574c304b7e73aa764cd49b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T09:51:39+02:00 kamctl: added subcommand srv version - print the server version using rpc command --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/fea4b3881574c304b7e73aa764cd49b… Patch: https://github.com/kamailio/kamailio/commit/fea4b3881574c304b7e73aa764cd49b… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index cc92e0eba6..a6dbd47a2b 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1791,6 +1791,11 @@ ksr_srv() { mecho "list server rpc commands" ctl_cmd_run system.listMethods ;; + rpclist) + require_ctlengine + mecho "list server version" + ctl_cmd_run core.version + ;; *) usage_ksr_srv exit 1 diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 46494f5a04..d16fa978b8 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -553,6 +553,7 @@ cat <<EOF srv sockets ................... show the list of listen sockets srv aliases ................... show the list of server aliases srv rpclist ................... show the list of server rpc commands + srv version ................... show the server version EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"

5 years, 5 months

git:master:6ada2d4f: kemix: added from uri user and host functions to exports structure

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6ada2d4f04fd5439eb7b424dfaae422ff1bc203c URL: https://github.com/kamailio/kamailio/commit/6ada2d4f04fd5439eb7b424dfaae422… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T08:46:04+02:00 kemix: added from uri user and host functions to exports structure --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6ada2d4f04fd5439eb7b424dfaae422… Patch: https://github.com/kamailio/kamailio/commit/6ada2d4f04fd5439eb7b424dfaae422… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index a01a72f7a3..aef7fc75d1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -460,6 +460,36 @@ 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_ruser"), + SR_KEMIP_XVAL, ki_kx_get_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_ruser"), + SR_KEMIP_XVAL, ki_kx_getw_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_ruser"), + SR_KEMIP_XVAL, ki_kx_gete_ruser, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_rhost"), + SR_KEMIP_XVAL, ki_kx_get_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("getw_rhost"), + SR_KEMIP_XVAL, ki_kx_getw_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("gete_rhost"), + SR_KEMIP_XVAL, ki_kx_gete_rhost, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_ouri"), SR_KEMIP_XVAL, ki_kx_get_ouri, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -470,38 +500,38 @@ 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_turi"), - SR_KEMIP_XVAL, ki_kx_get_turi, + { str_init("kx"), str_init("get_fuser"), + SR_KEMIP_XVAL, ki_kx_get_fuser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_ruser"), - SR_KEMIP_XVAL, ki_kx_get_ruser, + { str_init("kx"), str_init("getw_fuser"), + SR_KEMIP_XVAL, ki_kx_getw_fuser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("getw_ruser"), - SR_KEMIP_XVAL, ki_kx_getw_ruser, + { str_init("kx"), str_init("gete_fuser"), + SR_KEMIP_XVAL, ki_kx_gete_fuser, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("gete_ruser"), - SR_KEMIP_XVAL, ki_kx_gete_ruser, + { str_init("kx"), str_init("get_fhost"), + SR_KEMIP_XVAL, ki_kx_get_fhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("get_rhost"), - SR_KEMIP_XVAL, ki_kx_get_rhost, + { str_init("kx"), str_init("getw_fhost"), + SR_KEMIP_XVAL, ki_kx_getw_fhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("getw_rhost"), - SR_KEMIP_XVAL, ki_kx_getw_rhost, + { str_init("kx"), str_init("gete_fhost"), + SR_KEMIP_XVAL, ki_kx_gete_rhost, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init("kx"), str_init("gete_rhost"), - SR_KEMIP_XVAL, ki_kx_gete_rhost, + { str_init("kx"), str_init("get_turi"), + SR_KEMIP_XVAL, ki_kx_get_turi, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

5 years, 5 months

git:master:e63e182b: kemix: functions to return from-uri user and host

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e63e182bb0cf62fa7ec2941c25e8459fe59382d7 URL: https://github.com/kamailio/kamailio/commit/e63e182bb0cf62fa7ec2941c25e8459… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-19T08:37:37+02:00 kemix: functions to return from-uri user and host --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e63e182bb0cf62fa7ec2941c25e8459… Patch: https://github.com/kamailio/kamailio/commit/e63e182bb0cf62fa7ec2941c25e8459… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index add50f09cb..a01a72f7a3 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -272,6 +272,71 @@ static sr_kemi_xval_t* ki_kx_gete_rhost(sip_msg_t *msg) return ki_kx_get_ruri_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_furi_attr(sip_msg_t *msg, int iattr, int xmode) +{ + sip_uri_t *uri; + + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + uri=parse_from_uri(msg); + if(uri==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, xmode); + return &_sr_kemi_kx_xval; + } + + return ki_kx_get_xuri_attr(msg, uri, iattr, xmode); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_fuser(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 1, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_fuser(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 1, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_fuser(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 1, SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_fhost(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 2, SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_getw_fhost(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 2, SR_KEMI_XVAL_NULL_PRINT); +} + +/** + * + */ +static sr_kemi_xval_t* ki_kx_gete_fhost(sip_msg_t *msg) +{ + return ki_kx_get_furi_attr(msg, 2, SR_KEMI_XVAL_NULL_EMPTY); +} + /** * */

5 years, 5 months

git:master:3c07e235: pdb: safety check for header length in pdb_msg_dbg()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3c07e2351a94e4ff2cf3c6b9b9df4d7462cd5760 URL: https://github.com/kamailio/kamailio/commit/3c07e2351a94e4ff2cf3c6b9b9df4d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-18T16:25:25+02:00 pdb: safety check for header length in pdb_msg_dbg() --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/3c07e2351a94e4ff2cf3c6b9b9df4d7… Patch: https://github.com/kamailio/kamailio/commit/3c07e2351a94e4ff2cf3c6b9b9df4d7… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index eb59656734..b72ecf7f29 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -148,9 +148,13 @@ static void pdb_msg_dbg(struct pdb_msg msg, char *dbg_msg) { char buf[PAYLOADSIZE * 3 + 1]; char *ptr = buf; - for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { - ptr += sprintf(ptr,"%02X ", msg.bdy.payload[i]); - } + if(msg.hdr.length > sizeof(msg.hdr)) { + for (i = 0; i < msg.hdr.length - sizeof(msg.hdr); i++) { + ptr += sprintf(ptr, "%02X ", msg.bdy.payload[i]); + } + } else { + *ptr = '\0'; + } LM_DBG("%s\n" "version = %d\ntype = %d\ncode = %d\nid = %d\nlen = %d\n"

5 years, 5 months

git:master:bb66d054: core: kemi - added KSR.hsr.rminsert(hrm, hadd)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bb66d054b2eb0d7bd8c4d8a3040b790ce4a03918 URL: https://github.com/kamailio/kamailio/commit/bb66d054b2eb0d7bd8c4d8a3040b790… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-18T14:22:52+02:00 core: kemi - added KSR.hsr.rminsert(hrm, hadd) - helper function to remove and insert headers in a single operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/bb66d054b2eb0d7bd8c4d8a3040b790… Patch: https://github.com/kamailio/kamailio/commit/bb66d054b2eb0d7bd8c4d8a3040b790… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index d95a0a3cea..3ca2e9065f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1970,6 +1970,21 @@ static int sr_kemi_hdr_rmappend(sip_msg_t *msg, str *hrm, str *hadd) return sr_kemi_hdr_append(msg, hadd); } +/** + * + */ +static int sr_kemi_hdr_rminsert(sip_msg_t *msg, str *hrm, str *hadd) +{ + int ret; + + ret = sr_kemi_hdr_remove(msg, hrm); + if(ret<0) { + return ret; + } + return sr_kemi_hdr_insert(msg, hadd); +} + + /** * */ @@ -2108,6 +2123,11 @@ static sr_kemi_t _sr_kemi_hdr[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("hdr"), str_init("rminsert"), + SR_KEMIP_INT, sr_kemi_hdr_rminsert, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("hdr"), str_init("is_present"), SR_KEMIP_INT, sr_kemi_hdr_is_present, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

5 years, 5 months

Question about registrar behaviour

by Lars Olsson

Hi, I have found a behaviour in the registrar module that I do have a question about. Is the current behaviour correct and wanted? Using the save() method in the script I see the following: * Processing a register request for a user gives return code 1 ( or 2 ) * Processing a unregister request (expires=0) for registered user gives return code 3 * Processing a unregister request (expires=0) for a user which is NOT registered gives return code 1. Why? What is the reason behind this? No database entry is added which is expected. Test performed on 5.1.4, using DB mode 3. Cheers, Lars

5 years, 5 months

Info: Kamailio.org - Infrastructure Maintenance - June 18, 2019

by Daniel-Constantin Mierla

The infrastructure hosting the main server for Kamailio project will go under scheduled maintenance during June 18, 2019 (tomorrow). The work is expected to start around 7:00am UTC and can last for a few hours. During the maintenance interval, the services related to Kamailio project may become unavailable, among them: * the web server (www.kamailio.org), including the wiki portal (www.kamailio.org/wiki) * the mailing lists and the email contact addresses * the GIT repository mirror git.kamailio.org Once the maintenance work is completed, there will be an update notification sent about it! If there are relevant events to be notified, we are going to publish on our twitter stream: * https://twitter.com/kamailio Also, you can join #kamailio channel on irc.freenode.net in case you want to report some incident related to our infrastructure that you discover while maintenance goes on. For bugs or other issues related to Kamailio code, use the tracker on github.com/kamailio/kamailio – that service is not affected being maintained by GitHub corporation. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

5 years, 5 months

git:master:92b8d7aa: core: kemi - added KSR.hsr.rmappend(hrm, hadd)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 92b8d7aa0bf0cf407ecea1211d7333562657bd5a URL: https://github.com/kamailio/kamailio/commit/92b8d7aa0bf0cf407ecea1211d73335… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-18T09:18:01+02:00 core: kemi - added KSR.hsr.rmappend(hrm, hadd) - helper function to remove and append headers in a single operation --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/92b8d7aa0bf0cf407ecea1211d73335… Patch: https://github.com/kamailio/kamailio/commit/92b8d7aa0bf0cf407ecea1211d73335… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f8c490211d..d95a0a3cea 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1956,6 +1956,20 @@ static int sr_kemi_hdr_insert_before(sip_msg_t *msg, str *txt, str *hname) return 1; } +/** + * + */ +static int sr_kemi_hdr_rmappend(sip_msg_t *msg, str *hrm, str *hadd) +{ + int ret; + + ret = sr_kemi_hdr_remove(msg, hrm); + if(ret<0) { + return ret; + } + return sr_kemi_hdr_append(msg, hadd); +} + /** * */ @@ -2089,6 +2103,11 @@ static sr_kemi_t _sr_kemi_hdr[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("hdr"), str_init("rmappend"), + SR_KEMIP_INT, sr_kemi_hdr_rmappend, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("hdr"), str_init("is_present"), SR_KEMIP_INT, sr_kemi_hdr_is_present, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

5 years, 5 months

Adding new fields in pcscf.location table

by Александър Йосифов

Hello, What is the procedure for adding new fields in some DB table? In particular, I am working under a feature for multiple tcp connections for IPSEC in P-CSCF and for this purpose new fields are needed to store pcscf client and server ports for each registered contact. The new fields 'port_pc', 'port_ps', 't_port_pc' and 't_port_ps' should be added in pcscf.location table. Thank you for your help! -- Best Regards, Aleksandar Yosifov

5 years, 5 months

git:master:955e8a54: kamctl: usrloc command to delete older expired records from database table

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 955e8a5412490020b719f7f57d0a068916bcf8e5 URL: https://github.com/kamailio/kamailio/commit/955e8a5412490020b719f7f57d0a068… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-06-14T13:06:32+02:00 kamctl: usrloc command to delete older expired records from database table - kamctl ul dbclean [<secs>] - if secs parameter is not given, the value 3600 is used --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.ctlbase --- Diff: https://github.com/kamailio/kamailio/commit/955e8a5412490020b719f7f57d0a068… Patch: https://github.com/kamailio/kamailio/commit/955e8a5412490020b719f7f57d0a068… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a5f51803d8..cc92e0eba6 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2717,6 +2717,18 @@ usrloc() { fi ;; + dbclean) + require_dbengine + KSR_CLEAN_VAL=3600 + if [ $# -eq 2 ] ; then + KSR_CLEAN_VAL=$2 + fi + QUERY="delete from $USRLOC_TABLE where expires < SUBDATE(NOW(), INTERVAL $KSR_CLEAN_VAL SECOND);" + $DBCMD "$QUERY" + + exit $? + ;; + *) usage_usrloc exit 1 diff --git a/utils/kamctl/kamctl.ctlbase b/utils/kamctl/kamctl.ctlbase index 1fc64091af..5215099a3e 100644 --- a/utils/kamctl/kamctl.ctlbase +++ b/utils/kamctl/kamctl.ctlbase @@ -71,6 +71,7 @@ cat <<EOF ul add <username> <uri> ............... introduce a permanent usrloc entry ul add <username> <uri> <expires> ..... introduce a temporary usrloc entry ul add <user> <uri> <expires> <path> .. introduce a temporary usrloc entry + ul dbclean [<secs>].................... remove older expired records from db table EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_usrloc"

5 years, 5 months

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2019