sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:e1edd6b9: ctl Minor changes to example configuration

by Olle E. Johansson

Module: kamailio Branch: master Commit: e1edd6b9b1eee3482ba50ed76eb90ff188140c81 URL: https://github.com/kamailio/kamailio/commit/e1edd6b9b1eee3482ba50ed76eb90ff… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-01-05T21:56:22+01:00 ctl Minor changes to example configuration --- Modified: src/modules/ctl/ctl.cfg --- Diff: https://github.com/kamailio/kamailio/commit/e1edd6b9b1eee3482ba50ed76eb90ff… Patch: https://github.com/kamailio/kamailio/commit/e1edd6b9b1eee3482ba50ed76eb90ff… --- diff --git a/src/modules/ctl/ctl.cfg b/src/modules/ctl/ctl.cfg index a9fe0f9..5d9bde4 100644 --- a/src/modules/ctl/ctl.cfg +++ b/src/modules/ctl/ctl.cfg @@ -1,8 +1,8 @@ # ctl example configuration file # # to test use: -# utils/sercmd/sercmd command -# or utils/sercmd/sercmd and type help (interactive mode) +# utils/kamcmd/kamcmd command +# or utils/kamcmd/kamcmd and type help (interactive mode) # @@ -24,17 +24,15 @@ rev_dns=off # (cmd. line: -R) #listen=192.168.57.33 #listen=192.168.57.72 #loop_checks=0 -# for more info: sip_router -h -alias=iptel.org +alias=example.com alias="foo.bar" -#fifo="/tmp/ser_fifo" #modules loadmodule "modules/ctl/ctl.so" # optional listen addresses, if no one is specified, -# ctl will listen on unixs:/tmp/ser_ctl -modparam("ctl", "binrpc", "unix:/tmp/ser_ctl") # default +# ctl will by default listen on unixs:/var/run/kamailio/kamailio_ctl. +modparam("ctl", "binrpc", "unix:/tmp/kamailio_ctl") # modparam("ctl", "binrpc", "udp:localhost:2046") modparam("ctl", "binrpc", "tcp:localhost:2046") modparam("ctl", "binrpc", "unixd:/tmp/unix_dgram") # unix datagram

7 years, 10 months

git:master:86f1b1c1: outbound Remove MI modules from example configurations in README

by Olle E. Johansson

Module: kamailio Branch: master Commit: 86f1b1c1af8f6f585ca04336bb2114008f2b99d7 URL: https://github.com/kamailio/kamailio/commit/86f1b1c1af8f6f585ca04336bb21140… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2017-01-05T21:52:35+01:00 outbound Remove MI modules from example configurations in README --- Modified: src/modules/outbound/doc/outbound_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/86f1b1c1af8f6f585ca04336bb21140… Patch: https://github.com/kamailio/kamailio/commit/86f1b1c1af8f6f585ca04336bb21140… --- diff --git a/src/modules/outbound/doc/outbound_admin.xml b/src/modules/outbound/doc/outbound_admin.xml index 19a5f42..7418cec 100644 --- a/src/modules/outbound/doc/outbound_admin.xml +++ b/src/modules/outbound/doc/outbound_admin.xml @@ -17,7 +17,7 @@ <title>Overview</title> <para>This module provides C-API functions to enable &kamailio; to be used as an outbound Edge Proxy (see &rfc5626; section 5).</para> - <para>The <emphasis>path</emphasis> and <emphasis>rr</emphasis> will + <para>The <emphasis>path</emphasis> and <emphasis>rr</emphasis> modules will bind to this module if it is loaded before they are.</para> <section> <title>Edge Proxy Keep-Alives (STUN)</title> @@ -84,17 +84,12 @@ loadmodule "maxfwd.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" -loadmodule "mi_rpc.so" -loadmodule "mi_fifo.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "stun.so" # ----------------- setting module-specific parameters --------------- -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") - # ----- tm params ----- modparam("tm", "failure_reply_mode", 3) @@ -255,8 +250,6 @@ loadmodule "maxfwd.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" -loadmodule "mi_rpc.so" -loadmodule "mi_fifo.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "usrloc.so" @@ -264,9 +257,6 @@ loadmodule "registrar.so" # ----------------- setting module-specific parameters --------------- -# ----- mi_fifo params ----- -modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo") - # ----- tm params ----- modparam("tm", "failure_reply_mode", 3)

7 years, 10 months

removing MI in examples

by Olle E. Johansson

Just browsing some README i notice a few of them has example configurations. In the outbound README the example use the mi_fifo module, which should not be there any longer. We need to go through all examples configurations and README files and check for mi examples and update. Possibly also test the actual configuration if there are other changes that needs to happen. Just a notice for all developers as well as myself :-) /O

7 years, 10 months

git:master:e03a9d96: rtpproxy: fix compiler warnings

by Victor Seva

Module: kamailio Branch: master Commit: e03a9d965a63756c3ccbdf7f4db5fe475b833dc4 URL: https://github.com/kamailio/kamailio/commit/e03a9d965a63756c3ccbdf7f4db5fe4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-05T17:37:38+01:00 rtpproxy: fix compiler warnings > rtpproxy.c: In function 'rtpproxy_rpc_list': > rtpproxy.c:627:6: warning: unused variable 'len' [-Wunused-variable] > int len; > ^~~ > rtpproxy.c:626:6: warning: unused variable 'id_len' [-Wunused-variable] > int id_len; > ^~~~~~ > rtpproxy.c:625:8: warning: variable 'string' set but not used [-Wunused-but-set-variable] > char *string, *id; > ^~~~~~ --- Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/e03a9d965a63756c3ccbdf7f4db5fe4… Patch: https://github.com/kamailio/kamailio/commit/e03a9d965a63756c3ccbdf7f4db5fe4… --- diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index 2a6ef21..61d23e6 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -622,13 +622,8 @@ static void rtpproxy_rpc_list(rpc_t* rpc, void* ctx) { struct rtpp_set *rtpp_list; struct rtpp_node *crt_rtpp; - char *string, *id; - int id_len; - int len; void *vh; - string = id = 0; - if(rtpp_set_list ==NULL) return;

7 years, 10 months

git:master:0546af13: dmq_usrloc: fix deadlock (#911)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0546af13b8e6e8e0255e1dc4ea406956913ec288 URL: https://github.com/kamailio/kamailio/commit/0546af13b8e6e8e0255e1dc4ea40695… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-05T16:32:31+01:00 dmq_usrloc: fix deadlock (#911) * dmq_usrloc: fix deadlock caused by acquiring the same lock twice using get_urecord_by_ruid and lock_udomain * dmq_usrloc: get_urecord_by_ruid returns with the lock if the record was found --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/0546af13b8e6e8e0255e1dc4ea40695… Patch: https://github.com/kamailio/kamailio/commit/0546af13b8e6e8e0255e1dc4ea40695… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 9b966d5..5a11e82 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -62,8 +62,6 @@ static int add_contact(str aor, ucontact_info_t* ci) return -1; } - dmq_ul.lock_udomain(_d, &aor); - LM_DBG("aor: %.*s\n", aor.len, aor.s); LM_DBG("ci->ruid: %.*s\n", ci->ruid.len, ci->ruid.s); LM_DBG("aorhash: %i\n", dmq_ul.get_aorhash(&aor)); @@ -81,6 +79,8 @@ static int add_contact(str aor, ucontact_info_t* ci) return 0; } } + + dmq_ul.lock_udomain(_d, &aor); res = dmq_ul.get_urecord(_d, &aor, &r); if (res < 0) { LM_ERR("failed to retrieve record from usrloc\n");

7 years, 10 months

[kamailio/kamailio] dmq_usrloc: fix deadlock (#911)

by Julien Chavanton

caused by acquiring the same lock twice using get_urecord_by_ruid and lock_udomain You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/911 -- Commit Summary -- * dmq_usrloc: fix deadlock -- File Changes -- M src/modules/dmq_usrloc/usrloc_sync.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/911.patch https://github.com/kamailio/kamailio/pull/911.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/911

7 years, 10 months

git:master:311f995f: rtpproxy: small updates to the examples

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 311f995fdf509f5f256dff60ef643ebe4c5c061f URL: https://github.com/kamailio/kamailio/commit/311f995fdf509f5f256dff60ef643eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-05T16:19:36+01:00 rtpproxy: small updates to the examples --- Modified: src/modules/rtpproxy/examples/4to6.cfg Modified: src/modules/rtpproxy/examples/alg.cfg --- Diff: https://github.com/kamailio/kamailio/commit/311f995fdf509f5f256dff60ef643eb… Patch: https://github.com/kamailio/kamailio/commit/311f995fdf509f5f256dff60ef643eb…

7 years, 10 months

git:master:0dfb7373: mqueue: fix compiler warning

by Victor Seva

Module: kamailio Branch: master Commit: 0dfb73732ec2f73bfb085bdca80ca5072c9417e0 URL: https://github.com/kamailio/kamailio/commit/0dfb73732ec2f73bfb085bdca80ca50… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-05T15:17:40+01:00 mqueue: fix compiler warning > mqueue_mod.c: In function 'mqueue_rpc_get_size': > mqueue_mod.c:280:6: warning: unused variable 'status' [-Wunused-variable] > str status = {0, 0}; > ^~~~~~ --- Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0dfb73732ec2f73bfb085bdca80ca50… Patch: https://github.com/kamailio/kamailio/commit/0dfb73732ec2f73bfb085bdca80ca50… --- diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 17e37c8..8f2c610 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -277,8 +277,6 @@ static void mqueue_rpc_get_size(rpc_t* rpc, void* ctx) str mqueue_name; int mqueue_sz = 0; - str status = {0, 0}; - if (rpc->scan(ctx, "S", &mqueue_name) < 1) { rpc->fault(ctx, 500, "No queue name"); return;

7 years, 10 months

git:master:40cc4fb4: kazoo: fix compiler warnings

by Victor Seva

Module: kamailio Branch: master Commit: 40cc4fb4c7c36039f1e6c2dc9ee940fb66f3a7bc URL: https://github.com/kamailio/kamailio/commit/40cc4fb4c7c36039f1e6c2dc9ee940f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-05T15:12:02+01:00 kazoo: fix compiler warnings > kz_amqp.c:1646:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation] > if(json_obj != NULL) > ^~ > kz_amqp.c:1649:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' > return -1; > ^~~~~~ > kz_amqp.c: In function 'maybe_add_consumer_key': > kz_amqp.c:2500:5: warning: this 'if' clause does not guard... [-Wmisleading-indentation] > if (json_obj == NULL) > ^~ > kz_amqp.c:2503:2: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' > json_object* server_id_obj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); > ^~~~~~~~~~~ > kz_amqp.c: In function 'kz_send_targeted_cmd': > kz_amqp.c:2574:4: warning: 'json_obj' may be used uninitialized in this function [-Wmaybe-uninitialized] > if(json_obj) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/40cc4fb4c7c36039f1e6c2dc9ee940f… Patch: https://github.com/kamailio/kamailio/commit/40cc4fb4c7c36039f1e6c2dc9ee940f… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 020b98e..61e3e3e 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1643,8 +1643,9 @@ int kz_amqp_subscribe(struct sip_msg* msg, char* payload) if(binding != NULL) shm_free(binding); - if(json_obj != NULL) + if(json_obj != NULL){ json_object_put(json_obj); + } return -1; @@ -2497,8 +2498,9 @@ char* maybe_add_consumer_key(int server_id, amqp_bytes_t body) { char* payload = kz_amqp_bytes_dup(body); json_obj_ptr json_obj = kz_json_parse(payload ); - if (json_obj == NULL) - return payload ; + if (json_obj == NULL) { + return payload ; + } json_object* server_id_obj = kz_json_get_object(json_obj, BLF_JSON_SERVERID); if(server_id_obj == NULL) { @@ -2522,13 +2524,14 @@ void kz_send_targeted_cmd(int server_id, amqp_bytes_t body) kz_amqp_cmd_ptr cmd = NULL; json_object* JObj = NULL; char* payload = kz_local_amqp_bytes_dup(body); + json_obj_ptr json_obj = NULL; if(payload == NULL) { LM_ERR("error allocating message payload\n"); goto error; } - json_obj_ptr json_obj = kz_json_parse(payload ); + json_obj = kz_json_parse(payload ); if (json_obj == NULL) { LM_ERR("error parsing json payload\n"); goto error;

7 years, 10 months

git:master:b9c09b8d: Merge pull request #913 from linuxmaniac/vseva/fix_82

by GitHub

Module: kamailio Branch: master Commit: b9c09b8d6bffef3c3087149e424b53803b6aed93 URL: https://github.com/kamailio/kamailio/commit/b9c09b8d6bffef3c3087149e424b538… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: GitHub <noreply(a)github.com> Date: 2017-01-05T15:09:45+01:00 Merge pull request #913 from linuxmaniac/vseva/fix_82 Rename modules interface files --- Added: src/modules/auth_ephemeral/auth_ephemeral_mod.c Added: src/modules/auth_ephemeral/auth_ephemeral_mod.h Added: src/modules/cdp/cdp_mod.c Added: src/modules/cdp/cdp_mod.h Added: src/modules/cdp_avp/cdp_avp_mod.c Added: src/modules/cdp_avp/cdp_avp_mod.h Added: src/modules/db2_ldap/db2_ldap_mod.c Added: src/modules/db2_ldap/db2_ldap_mod.h Added: src/modules/db_berkeley/db_berkeley.c Added: src/modules/db_berkeley/db_berkeley.h Added: src/modules/erlang/erlang_mod.c Added: src/modules/erlang/erlang_mod.h Added: src/modules/mohqueue/mohqueue_mod.c Added: src/modules/mohqueue/mohqueue_mod.h Modified: src/modules/auth_ephemeral/authorize.c Modified: src/modules/auth_ephemeral/checks.c Modified: src/modules/cdp_avp/macros.h Modified: src/modules/db2_ldap/ld_cfg.c Modified: src/modules/db2_ldap/ld_cmd.c Modified: src/modules/db_berkeley/bdb_mod.c Modified: src/modules/db_berkeley/km_bdb_val.c Modified: src/modules/erlang/cnode.c Modified: src/modules/erlang/epmd.c Modified: src/modules/erlang/erl_api.c Modified: src/modules/erlang/erl_helpers.c Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/handle_rpc.c Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/diameter_ro.h Modified: src/modules/ims_charging/mod.c Modified: src/modules/ims_icscf/mod.h Modified: src/modules/ims_ocs/mod.c Modified: src/modules/ims_ocs/msg_faker.c Modified: src/modules/ims_ocs/ocs_avp_helper.c Modified: src/modules/ims_qos/mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_asr.c Modified: src/modules/ims_qos/rx_avp.c Modified: src/modules/ims_qos/rx_str.c Modified: src/modules/ims_registrar_scscf/reg_mod.c Modified: src/modules/mohqueue/mohq_db.c Modified: src/modules/mohqueue/mohq_funcs.c Modified: src/modules/mohqueue/mohq_locks.c Removed: src/modules/auth_ephemeral/autheph_mod.c Removed: src/modules/auth_ephemeral/autheph_mod.h Removed: src/modules/cdp/mod.c Removed: src/modules/cdp/mod.h Removed: src/modules/cdp_avp/mod.c Removed: src/modules/cdp_avp/mod_export.h Removed: src/modules/db2_ldap/ld_mod.c Removed: src/modules/db2_ldap/ld_mod.h Removed: src/modules/db_berkeley/km_db_berkeley.c Removed: src/modules/db_berkeley/km_db_berkeley.h Removed: src/modules/erlang/mod_erlang.c Removed: src/modules/erlang/mod_erlang.h Removed: src/modules/mohqueue/mohq.c Removed: src/modules/mohqueue/mohq.h --- Diff: https://github.com/kamailio/kamailio/commit/b9c09b8d6bffef3c3087149e424b538… Patch: https://github.com/kamailio/kamailio/commit/b9c09b8d6bffef3c3087149e424b538…

7 years, 10 months

← Newer
1
...
34
35
36
37
38
39
40
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017