sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
214 discussions

git:master:be82892a: db_cluster remove old svn ID tags

by Olle E. Johansson

Module: kamailio Branch: master Commit: be82892a68342287d37de90ddb74c1f66a37e28f URL: https://github.com/kamailio/kamailio/commit/be82892a68342287d37de90ddb74c1f… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2018-05-30T12:48:26+02:00 db_cluster remove old svn ID tags --- Modified: src/modules/db_cluster/db_cluster_mod.c Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_api.h Modified: src/modules/db_cluster/dbcl_data.c Modified: src/modules/db_cluster/dbcl_data.h --- Diff: https://github.com/kamailio/kamailio/commit/be82892a68342287d37de90ddb74c1f… Patch: https://github.com/kamailio/kamailio/commit/be82892a68342287d37de90ddb74c1f… --- diff --git a/src/modules/db_cluster/db_cluster_mod.c b/src/modules/db_cluster/db_cluster_mod.c index e7ebcddc15..3e0eb06801 100644 --- a/src/modules/db_cluster/db_cluster_mod.c +++ b/src/modules/db_cluster/db_cluster_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Generic db cluster module interface * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 6ef6ec4db0..111abcca20 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_api.h b/src/modules/db_cluster/dbcl_api.h index ff581aa25d..ad95e81044 100644 --- a/src/modules/db_cluster/dbcl_api.h +++ b/src/modules/db_cluster/dbcl_api.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 66c3d30e24..c765172442 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com) diff --git a/src/modules/db_cluster/dbcl_data.h b/src/modules/db_cluster/dbcl_data.h index b745e42ff2..1c17c074eb 100644 --- a/src/modules/db_cluster/dbcl_data.h +++ b/src/modules/db_cluster/dbcl_data.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * DB CLuster core functions * * Copyright (C) 2012 Daniel-Constantin Mierla (asipto.com)

6 years, 5 months

git:master:f854f2c2: core: kemi - more log-level message shortcut functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f854f2c27bee1b1e4f43565ff1865b88c27387c9 URL: https://github.com/kamailio/kamailio/commit/f854f2c27bee1b1e4f43565ff1865b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-29T22:49:42+02:00 core: kemi - more log-level message shortcut functions --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/f854f2c27bee1b1e4f43565ff1865b8… Patch: https://github.com/kamailio/kamailio/commit/f854f2c27bee1b1e4f43565ff1865b8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 5a07abb254..ac31b1beb0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -98,6 +98,36 @@ static int sr_kemi_core_info(sip_msg_t *msg, str *txt) return 0; } +/** + * + */ +static int sr_kemi_core_warn(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_WARN("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static int sr_kemi_core_notice(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_NOTICE("%.*s", txt->len, txt->s); + return 0; +} + +/** + * + */ +static int sr_kemi_core_crit(sip_msg_t *msg, str *txt) +{ + if(txt!=NULL && txt->s!=NULL) + LM_CRIT("%.*s", txt->len, txt->s); + return 0; +} + /** * */ @@ -1157,6 +1187,21 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("warn"), + SR_KEMIP_NONE, sr_kemi_core_warn, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("notice"), + SR_KEMIP_NONE, sr_kemi_core_notice, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("crit"), + SR_KEMIP_NONE, sr_kemi_core_crit, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("log"), SR_KEMIP_NONE, sr_kemi_core_log, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

6 years, 5 months

[kamailio/kamailio] JSONRPCS replacing keys in params gives unexpected behaivor (#1550)

by ovoshlook

Hi Using kamailio with http jsonrpcs found next trouble When i making request like curl -s -H 'Content-Type: application/json' --data-binary '{"method":"htable.get","params":{**"name":"mytable"**,"key":"myparam"},"jsonrpc":"2.0"}' http://127.0.0.1:5060/jsonrpc all fine. I getting good response But when I making curl -s -H 'Content-Type: application/json' --data-binary '{"method":"htable.get","params":{"key":"myparam",**"name":"mytable"**},"jsonrpc":"2.0"}' http://127.0.0.1:5060/jsonrpc i.e keys of object on different places It gives me curl -s -H 'Content-Type: application/json' --data-binary '{"jsonrpc":"2.0", "method": "htable.get","params":{"key":"mykey","name": "mytable"}}' http://127.0.0.1:5060/jsonrpc { "jsonrpc": "2.0", "error": { "code": 500, "message": "No such htable" } } Means kamailio cant find needed htable I supposed that position of the key should't have a matter for the JSON objects parsers But here is looks like different May be it is not a bug bug feature request because of it is just an unexpected behaivor Im using kamailio 5.1.3 on the Debian 9 version: kamailio 5.1.3 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 00:25:48 May 9 2018 with gcc 6.3.0 -- 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/issues/1550

6 years, 5 months

git:master:616b6890: app_jsdt: exported KSR.pv.getw(...)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 616b68904e0741ebcdb70e3c7f66b3b6d1254a8d URL: https://github.com/kamailio/kamailio/commit/616b68904e0741ebcdb70e3c7f66b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-29T13:39:04+02:00 app_jsdt: exported KSR.pv.getw(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/616b68904e0741ebcdb70e3c7f66b3b… Patch: https://github.com/kamailio/kamailio/commit/616b68904e0741ebcdb70e3c7f66b3b… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 1b6dba4145..108b96896c 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -424,6 +424,7 @@ static int jsdt_sr_pv_is_null (duk_context *J) const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "get", jsdt_sr_pv_get, 1 /* 1 args */ }, + { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

6 years, 5 months

git:master:7e08fc8d: stun: catch udp ping 0000 when trying to parse stun headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7e08fc8d2b74657d6e6171effbab2770482d693e URL: https://github.com/kamailio/kamailio/commit/7e08fc8d2b74657d6e6171effbab277… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-29T13:29:36+02:00 stun: catch udp ping 0000 when trying to parse stun headers - avoid useless debug message - info message made debug if the size of received packet is too small for a stun header --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/7e08fc8d2b74657d6e6171effbab277… Patch: https://github.com/kamailio/kamailio/commit/7e08fc8d2b74657d6e6171effbab277… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 350317b0e7..62bd368589 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -165,8 +165,12 @@ static int stun_parse_header(struct stun_msg* req, USHORT_T* error_code) { if (sizeof(req->hdr) > req->msg.buf.len) { + if(req->msg.buf.len==4 && *((int*)req->msg.buf.s)==0) { + /* likely the UDP ping 0000 */ + return FATAL_ERROR; + } /* the received message does not contain whole header */ - LOG(L_INFO, "INFO: stun_parse_header: incomplete header of STUN message\n"); + LM_DBG("incomplete header of STUN message\n"); /* Any better solution? IMHO it's not possible to send error response * because the transaction ID is not available. */

6 years, 5 months

[kamailio/kamailio] srdb1: connection string to mongodb too long (#1545)

by Konstantin

### Description We need to connect to a cluster of mongodb hosts with some specific parameters. The connection string has length more than 255 characters. We could not connect to our mongodb. ### Troubleshooting #### Reproduction Use very long string for example like bellow mongo0-pdb-demo.somedomain.com:27017,mongo1-pdb-demo.somedomain.com:27017,mongo2-pdb-demo.somedomain.com:27017/proxy-db-ft1?replicaSet=rs0&ssl=true&sslClientCertificateKeyFile=/etc/ssl/domain1234.pem&sslCertificateAuthorityFile=/etc/ssl/godaddy.pem #### Log Messages We got errors: ERROR: <core> [db.c:168]: db_bind_mod(): SQL URL too long ERROR: auth_db [auth_db_mod.c:173]: mod_init(): unable to bind to a database driver ### Additional Information version: kamailio 4.4.7 (x86_64/linux) -- 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/issues/1545

6 years, 6 months

git:master:0a9ebbbd: lib/srdb1: increased the safety check for max db url to 1023

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0a9ebbbdfe0cd4c137338adbacf5c5890222708a URL: https://github.com/kamailio/kamailio/commit/0a9ebbbdfe0cd4c137338adbacf5c58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-28T15:34:29+02:00 lib/srdb1: increased the safety check for max db url to 1023 - was 255, too small for large connection strings needed for no-sql - reported by GH #1545 --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/0a9ebbbdfe0cd4c137338adbacf5c58… Patch: https://github.com/kamailio/kamailio/commit/0a9ebbbdfe0cd4c137338adbacf5c58… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index c3908af85d..305543c931 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -60,7 +60,7 @@ #include "db_query.h" #include "db.h" -static unsigned int MAX_URL_LENGTH = 255; /*!< maximum length of a SQL URL */ +static unsigned int MAX_URL_LENGTH = 1023; /*!< maximum length of a SQL URL */ int db_check_api(db_func_t* dbf, char *mname)

6 years, 6 months

git:master:80e99881: modules: readme files regenerated - lcr ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 80e9988170ff678e26c916c18211f76884c02c0e URL: https://github.com/kamailio/kamailio/commit/80e9988170ff678e26c916c18211f76… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-28T08:01:55+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/80e9988170ff678e26c916c18211f76… Patch: https://github.com/kamailio/kamailio/commit/80e9988170ff678e26c916c18211f76…

6 years, 6 months

git:master:1d1047b8: Merge pull request #1546 from cruzccl/lcr-rule_id-avp

by GitHub

Module: kamailio Branch: master Commit: 1d1047b8da930d5091704c25197df1b289d13b85 URL: https://github.com/kamailio/kamailio/commit/1d1047b8da930d5091704c25197df1b… Author: juha-h <jh(a)tutpro.com> Committer: GitHub <noreply(a)github.com> Date: 2018-05-28T08:47:14+03:00 Merge pull request #1546 from cruzccl/lcr-rule_id-avp lcr: export rule_id_avp with matching rule id --- Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/1d1047b8da930d5091704c25197df1b… Patch: https://github.com/kamailio/kamailio/commit/1d1047b8da930d5091704c25197df1b…

6 years, 6 months

git:master:7e97e877: lcr: export rule_id_avp with matching rule id

by Carlos Cruz

Module: kamailio Branch: master Commit: 7e97e87738f15017c732f74230c79c77cffca60f URL: https://github.com/kamailio/kamailio/commit/7e97e87738f15017c732f74230c79c7… Author: Carlos Cruz <carlos(a)irontec.com> Committer: Carlos Cruz <carlos(a)irontec.com> Date: 2018-05-27T21:59:21+02:00 lcr: export rule_id_avp with matching rule id --- Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_mod.c Modified: src/modules/lcr/lcr_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/7e97e87738f15017c732f74230c79c7… Patch: https://github.com/kamailio/kamailio/commit/7e97e87738f15017c732f74230c79c7…

6 years, 6 months

← Newer
1
...
8
9
10
11
12
13
14
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018