sr-dev April 2016

sr-dev@lists.kamailio.org

23 participants
430 discussions

git:master:34366898: rtpproxy: exported rtpproxy_manage() variants to kemi
by Daniel-Constantin Mierla 22 Apr '16

22 Apr '16

Module: kamailio Branch: master Commit: 3436689833c1a7473f50c218e3a86bf2eb93940a URL: https://github.com/kamailio/kamailio/commit/3436689833c1a7473f50c218e3a86bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-04-22T08:39:18+02:00 rtpproxy: exported rtpproxy_manage() variants to kemi --- Modified: modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/3436689833c1a7473f50c218e3a86bf… Patch: https://github.com/kamailio/kamailio/commit/3436689833c1a7473f50c218e3a86bf… --- diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index bb644de..9240337 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -218,11 +218,12 @@ #include "../../mod_fix.h" #include "../../dset.h" #include "../../route.h" +#include "../../kemi.h" #include "../../modules/tm/tm_load.h" #include "rtpproxy.h" #include "rtpproxy_funcs.h" #include "rtpproxy_stream.h" - + MODULE_VERSION #if !defined(AF_LOCAL) @@ -3045,3 +3046,57 @@ int set_rtp_inst_pvar(struct sip_msg *msg, const str * const uri) { return 0; } +/** + * + */ +static int ki_rtpproxy_manage0(sip_msg_t *msg) +{ + return rtpproxy_manage(msg, NULL, NULL); +} + +/** + * + */ +static int ki_rtpproxy_manage(sip_msg_t *msg, str *flags) +{ + return rtpproxy_manage(msg, ((flags && flags->len>0)?flags->s:NULL), NULL); +} + +/** + * + */ +static int ki_rtpproxy_manage_ip(sip_msg_t *msg, str *flags, str *mip) +{ + /* str->s from kemi params is zero-terminated */ + return rtpproxy_manage(msg, ((flags && flags->len>0)?flags->s:NULL), + ((mip && mip->len>0)?mip->s:NULL)); +} + +/** + * + */ +static sr_kemi_t sr_kemi_rtpproxy_exports[] = { + { str_init("rtpproxy"), str_init("rtpproxy_manage0"), + SR_KEMIP_INT, ki_rtpproxy_manage0, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("rtpproxy"), str_init("rtpproxy_manage"), + SR_KEMIP_INT, ki_rtpproxy_manage, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("rtpproxy"), str_init("rtpproxy_manage_ip"), + SR_KEMIP_INT, ki_rtpproxy_manage_ip, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; + +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_rtpproxy_exports); + return 0; +}

1 0

[kamailio/kamailio] dialog module : new rpc function for terminate (#555)
by Yasin CANER 22 Apr '16

22 Apr '16

- added new rpc command for terminate a dialog with callid, fromtag and totag. - added new rpc command to doc and serctl is removed - added rpc return code to dlg_terminate_dlg function - added rpc return code to rpc domain reload function You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/555 -- Commit Summary -- * dialog module : new rpc function for terminate * dialog module : rpc terminate dialog doc added * domain module : added rpc return code * dialog module: fixed response * domain module : fixed response * dialog module: fixes travis error * domain module : fixed typo -- File Changes -- M modules/dialog/dialog.c (46) M modules/dialog/doc/dialog_admin.xml (46) M modules/domain/domain_mod.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/555.patch https://github.com/kamailio/kamailio/pull/555.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/555

2 7

[kamailio] module http_client - support for keeping connections open (#542)
by filiplx 21 Apr '16

21 Apr '16

The current implementation uses curl_easy_init() to create a CURL easy handle and curl_easy_cleanup() to destroy the handle, including all open connections within it. If curl_easy_cleanup() isn't called, it's possible to reuse an open connection for the next http call. To reset the CURL options, curl_easy_reset() can be used instead. [http_client_keep_connections_open.diff](https://github.com/kamailio/kamailio/files/168832/http_client_keep_connections_open.txt) --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/542

3 11

git:master:a0e4a9c1: mtree Make table name in source code the default as documented in the README
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: a0e4a9c18eea8fe58a32aae8d722a27deac47962 URL: https://github.com/kamailio/kamailio/commit/a0e4a9c18eea8fe58a32aae8d722a27… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T22:27:36+02:00 mtree Make table name in source code the default as documented in the README --- Modified: modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a0e4a9c18eea8fe58a32aae8d722a27… Patch: https://github.com/kamailio/kamailio/commit/a0e4a9c18eea8fe58a32aae8d722a27… --- diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 05f69ac..9297a69 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -76,7 +76,7 @@ CREATE TABLE mtrees ( /** parameters */ static str db_url = str_init(DEFAULT_DB_URL); -static str db_table = str_init(""); +static str db_table = str_init("mtrees"); static str tname_column = str_init("tname"); static str tprefix_column = str_init("tprefix"); static str tvalue_column = str_init("tvalue");

1 0

git:master:459346a8: auth_db Add note about version number synchronization with uri_db
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 459346a86e276f2507d030b34cd277b3178078af URL: https://github.com/kamailio/kamailio/commit/459346a86e276f2507d030b34cd277b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T22:13:50+02:00 auth_db Add note about version number synchronization with uri_db --- Modified: modules/auth_db/auth_db_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/459346a86e276f2507d030b34cd277b… Patch: https://github.com/kamailio/kamailio/commit/459346a86e276f2507d030b34cd277b… --- diff --git a/modules/auth_db/auth_db_mod.c b/modules/auth_db/auth_db_mod.c index 3f22f4f..4d7267b 100644 --- a/modules/auth_db/auth_db_mod.c +++ b/modules/auth_db/auth_db_mod.c @@ -36,6 +36,7 @@ MODULE_VERSION +/* Note: If this is changed, please also change version in the uri_db module */ #define TABLE_VERSION 6 /* @@ -98,7 +99,7 @@ static cmd_export_t cmds[] = { {"www_authenticate", (cmd_function)www_authenticate, 2, auth_fixup, 0, REQUEST_ROUTE}, {"www_authenticate", (cmd_function)www_authenticate2, 3, auth_fixup, 0, -REQUEST_ROUTE}, + REQUEST_ROUTE}, {"proxy_authorize", (cmd_function)proxy_authenticate, 2, auth_fixup, 0, REQUEST_ROUTE}, {"proxy_authenticate", (cmd_function)proxy_authenticate, 2, auth_fixup, 0, @@ -363,21 +364,24 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) pve->text.s = sep + 1; pve->text.len = end - pve->text.s; trim(&pve->text); - if (pve->text.len == 0) + if (pve->text.len == 0) { goto parse_error; + } /* set pv spec */ pv.s = p; pv.len = sep - p; trim(&pv); - if (pv.len == 0) + if (pv.len == 0) { goto parse_error; + } } else { /* no pv, only column name */ pve->text.s = p; pve->text.len = end - pve->text.s; trim(&pve->text); - if (pve->text.len == 0) + if (pve->text.len == 0) { goto parse_error; + } /* create an avp definition for the spec parser */ pv.s = (char*)pkg_malloc(pve->text.len + 7); if (pv.s == NULL) { @@ -403,10 +407,12 @@ int parse_aaa_pvs(char *definition, pv_elem_t **pv_def, int *cnt) pve = 0; /* go to the end */ p = end; - if (*p==';') + if (*p==';') { p++; - if (*p==0) + } + if (*p==0) { break; + } } return 0;

1 0

git:master:3acd55da: uri_db Change the table version to synch with auth_db
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 3acd55dab7c68e50eee69e54908dff57695676fb URL: https://github.com/kamailio/kamailio/commit/3acd55dab7c68e50eee69e54908dff5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T22:11:08+02:00 uri_db Change the table version to synch with auth_db --- Modified: modules/uri_db/uridb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3acd55dab7c68e50eee69e54908dff5… Patch: https://github.com/kamailio/kamailio/commit/3acd55dab7c68e50eee69e54908dff5… --- diff --git a/modules/uri_db/uridb_mod.c b/modules/uri_db/uridb_mod.c index e0284c8..cf9f582 100644 --- a/modules/uri_db/uridb_mod.c +++ b/modules/uri_db/uridb_mod.c @@ -38,10 +38,11 @@ MODULE_VERSION /* * Version of domain table required by the module, * increment this value if you change the table in - * an backwards incompatible way + * an backwards incompatible way. The subscriber + * table version needs to be the same as auth_db use. */ #define URI_TABLE_VERSION 1 -#define SUBSCRIBER_TABLE_VERSION 8 +#define SUBSCRIBER_TABLE_VERSION 6 /* From auth_db */ static void destroy(void); /* Module destroy function */ static int child_init(int rank); /* Per-child initialization function */

1 0

git:master:241edc7a: uri_db Refers to wrong version of subscriber table, fix error message
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 241edc7abfbbab24eb068e944b6a875485236a12 URL: https://github.com/kamailio/kamailio/commit/241edc7abfbbab24eb068e944b6a875… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T22:01:01+02:00 uri_db Refers to wrong version of subscriber table, fix error message --- Modified: modules/uri_db/checks.c Modified: modules/uri_db/checks.h Modified: modules/uri_db/uridb_mod.c Modified: modules/uri_db/uridb_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/241edc7abfbbab24eb068e944b6a875… Patch: https://github.com/kamailio/kamailio/commit/241edc7abfbbab24eb068e944b6a875… --- diff --git a/modules/uri_db/checks.c b/modules/uri_db/checks.c index 5971d7e..afd3cc8 100644 --- a/modules/uri_db/checks.c +++ b/modules/uri_db/checks.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI checks * * Copyright (C) 2001-2004 FhG FOKUS @@ -21,12 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * -------- - * 2003-02-26: Created by janakj - * 2004-03-20: has_totag introduced (jiri) - * 2004-06-07 updated to the new DB api, added uridb_db_{bind,init,close,ver} - * (andrei) */ #include <string.h> diff --git a/modules/uri_db/checks.h b/modules/uri_db/checks.h index 53bbbec..36b9ec3 100644 --- a/modules/uri_db/checks.h +++ b/modules/uri_db/checks.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI checks * * Copyright (C) 2001-2004 FhG FOKUS @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * -------- - * 2003-03-26 created by janakj */ diff --git a/modules/uri_db/uridb_mod.c b/modules/uri_db/uridb_mod.c index 880ec7a..e0284c8 100644 --- a/modules/uri_db/uridb_mod.c +++ b/modules/uri_db/uridb_mod.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI related functions * * Copyright (C) 2001-2003 FhG Fokus @@ -21,14 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * ------- - * 2003-03-11: New module interface (janakj) - * 2003-03-16: flags export parameter added (janakj) - * 2003-03-19 replaces all mallocs/frees w/ pkg_malloc/pkg_free (andrei) - * 2003-04-05: default_uri #define used (jiri) - * 2004-03-20: has_totag introduced (jiri) - * 2004-06-07 updated to the new DB api (andrei) */ @@ -51,7 +41,7 @@ MODULE_VERSION * an backwards incompatible way */ #define URI_TABLE_VERSION 1 -#define SUBSCRIBER_TABLE_VERSION 6 +#define SUBSCRIBER_TABLE_VERSION 8 static void destroy(void); /* Module destroy function */ static int child_init(int rank); /* Per-child initialization function */ @@ -171,13 +161,13 @@ static int mod_init(void) } else { if (use_uri_table) { if (ver != URI_TABLE_VERSION) { - LM_ERR("Invalid table version of the uri table\n"); - return -1; + LM_ERR("Invalid table version of the uri table. Expected %d, database is %d\n", URI_TABLE_VERSION, ver); + return -1; } } else { if (ver != SUBSCRIBER_TABLE_VERSION) { - LM_ERR("Invalid table version of the subscriber table\n"); - return -1; + LM_ERR("Invalid table version of the subscriber table. Expected %d, database is %d\n", SUBSCRIBER_TABLE_VERSION, ver); + return -1; } } } diff --git a/modules/uri_db/uridb_mod.h b/modules/uri_db/uridb_mod.h index a53973f..9bd6e49 100644 --- a/modules/uri_db/uridb_mod.h +++ b/modules/uri_db/uridb_mod.h @@ -1,6 +1,4 @@ /* - * $Id$ - * * Various URI related functions * * Copyright (C) 2001-2004 FhG FOKUS @@ -21,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * History: - * -------- - * 2003-02-26: created by janakj */

1 0

git:master:64eff461: sca Improve error message
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 64eff461c00aaa34a46150cf45827526cda13938 URL: https://github.com/kamailio/kamailio/commit/64eff461c00aaa34a46150cf4582752… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T21:55:16+02:00 sca Improve error message --- Modified: modules/sca/sca.c --- Diff: https://github.com/kamailio/kamailio/commit/64eff461c00aaa34a46150cf4582752… Patch: https://github.com/kamailio/kamailio/commit/64eff461c00aaa34a46150cf4582752… --- diff --git a/modules/sca/sca.c b/modules/sca/sca.c index eacb704..9101975 100644 --- a/modules/sca/sca.c +++ b/modules/sca/sca.c @@ -173,7 +173,7 @@ static int sca_bind_srdb1( sca_mod *scam, db_func_t *db_api ) int rc = -1; if ( db_bind_mod( scam->cfg->db_url, db_api ) != 0 ) { - LM_ERR( "Failed to initialize required DB API\n" ); + LM_ERR( "Failed to initialize required DB API - %.*s\n", STR_FMT( scam->cfg->db_url)); goto done; } scam->db_api = db_api;

1 0

git:master:485fa633: sca Add doxygen header, add new lines to end of error/debug messages
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: 485fa6338504977d15afebc2a09b3f391c70f60f URL: https://github.com/kamailio/kamailio/commit/485fa6338504977d15afebc2a09b3f3… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T21:38:38+02:00 sca Add doxygen header, add new lines to end of error/debug messages This needs to be fixed in all files, not just the main one. --- Modified: modules/sca/sca.c --- Diff: https://github.com/kamailio/kamailio/commit/485fa6338504977d15afebc2a09b3f3… Patch: https://github.com/kamailio/kamailio/commit/485fa6338504977d15afebc2a09b3f3…

1 0

git:master:b424214e: jansson Update jansson_get doc with return values that was hidden in the source code
by Olle E. Johansson 21 Apr '16

21 Apr '16

Module: kamailio Branch: master Commit: b424214e564cfb0a5625bbbbb88093e6be0ffc4d URL: https://github.com/kamailio/kamailio/commit/b424214e564cfb0a5625bbbbb88093e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-04-21T18:21:43+02:00 jansson Update jansson_get doc with return values that was hidden in the source code --- Modified: modules/jansson/README Modified: modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b424214e564cfb0a5625bbbbb88093e… Patch: https://github.com/kamailio/kamailio/commit/b424214e564cfb0a5625bbbbb88093e… --- diff --git a/modules/jansson/README b/modules/jansson/README index 87d28a8..113fb9a 100644 --- a/modules/jansson/README +++ b/modules/jansson/README @@ -110,6 +110,8 @@ Chapter 1. Admin Guide array notation (e.g. [0]), or a combination of the two (e.g. foo.bar[0][1].baz). + Returns FALSE if the data can not be parsed, TRUE otherwise. + The function can put a string, integer, null, or new json string into destination. If the key/path can't be found in the JSON data structure, the pvar is not changed. If it had a previous value, that value remains @@ -117,8 +119,10 @@ Chapter 1. Admin Guide Example 1.1. jansson_get usage ... -jansson_get("inner.deep.list[3]", $var(myjson), "$var(n)"); -xlog("foo is $var(n)"); +if(!jansson_get("inner.deep.list[3]", $var(myjson), "$var(n)")) { + xlog("L_ERR", "Can't parse json data"); +} +xlog("L_INFO", "foo is $var(n)"); ... 4.2. jansson_set(type, key/path, value, result) diff --git a/modules/jansson/doc/jansson_admin.xml b/modules/jansson/doc/jansson_admin.xml index baab686..344de6c 100644 --- a/modules/jansson/doc/jansson_admin.xml +++ b/modules/jansson/doc/jansson_admin.xml @@ -73,6 +73,9 @@ The path string supports dot delimited notation (e.g. foo.bar.baz), array notation (e.g. [0]), or a combination of the two (e.g. foo.bar[0][1].baz). </para> <para> + Returns FALSE if the data can not be parsed, TRUE otherwise. + </para> + <para> The function can put a string, integer, null, or new json string into destination. If the key/path can't be found in the JSON data structure, the pvar is not changed. If it had a previous value, that value remains unchanged. @@ -81,8 +84,10 @@ <title><function>jansson_get</function> usage</title> <programlisting format="linespecific"> ... -jansson_get("inner.deep.list[3]", $var(myjson), "$var(n)"); -xlog("foo is $var(n)"); +if(!jansson_get("inner.deep.list[3]", $var(myjson), "$var(n)")) { + xlog("L_ERR", "Can't parse json data"); +} +xlog("L_INFO", "foo is $var(n)"); ... </programlisting> </example>

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2016