sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
388 discussions

git:4.3:4cabd79e: pkg/rpm: updated spec files for v4.3.5
by Daniel-Constantin Mierla 03 Mar '16

03 Mar '16

Module: kamailio Branch: 4.3 Commit: 4cabd79efc0c7b6b080e55167e07028aa1e6af16 URL: https://github.com/kamailio/kamailio/commit/4cabd79efc0c7b6b080e55167e07028… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-03T15:04:37+01:00 pkg/rpm: updated spec files for v4.3.5 --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/4cabd79efc0c7b6b080e55167e07028… Patch: https://github.com/kamailio/kamailio/commit/4cabd79efc0c7b6b080e55167e07028… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 3bdebfc..7df1aed 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.4 +%define ver 4.3.5 %define rel 0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 8e2ecd1..4712350 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.4 +%define ver 4.3.5 %define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index d292dff..d9f24a1 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.4 +%define ver 4.3.5 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 2f7151a..ad91a93 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.4 +%define ver 4.3.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index 6d597da..34748c7 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 4.3.4 +%define ver 4.3.5 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:master:c5289e6f: presence: use unsigned int for expires limits min and max
by Daniel-Constantin Mierla 03 Mar '16

03 Mar '16

Module: kamailio Branch: master Commit: c5289e6f076a9182b09d830e53fdb6ef426e0d83 URL: https://github.com/kamailio/kamailio/commit/c5289e6f076a9182b09d830e53fdb6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-03T09:42:46+01:00 presence: use unsigned int for expires limits min and max - reported by GH #521 - coherent indentation and spacing --- Modified: modules/presence/presence.c Modified: modules/presence/presence.h Modified: modules/presence/subscribe.c Modified: modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/c5289e6f076a9182b09d830e53fdb6e… Patch: https://github.com/kamailio/kamailio/commit/c5289e6f076a9182b09d830e53fdb6e…

1 0

git:4.3:b3e12de6: pkg/kamailio/deb: update version to 4.3.5
by Victor Seva 03 Mar '16

03 Mar '16

Module: kamailio Branch: 4.3 Commit: b3e12de6e354733b4d872dd739ba3cd97be402f9 URL: https://github.com/kamailio/kamailio/commit/b3e12de6e354733b4d872dd739ba3cd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-03-03T09:40:11+01:00 pkg/kamailio/deb: update version to 4.3.5 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/b3e12de6e354733b4d872dd739ba3cd… Patch: https://github.com/kamailio/kamailio/commit/b3e12de6e354733b4d872dd739ba3cd… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 4da8bb6..7a59042 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,4 +1,10 @@ -kamailio (4.3.4) UNRELEASED; urgency=medium +kamailio (4.3.5) unstable; urgency=medium + + * update version to 4.3.5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 03 Mar 2016 09:39:12 +0100 + +kamailio (4.3.4) unstable; urgency=medium * update version to 4.3.4 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 4da8bb6..7a59042 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,4 +1,10 @@ -kamailio (4.3.4) UNRELEASED; urgency=medium +kamailio (4.3.5) unstable; urgency=medium + + * update version to 4.3.5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 03 Mar 2016 09:39:12 +0100 + +kamailio (4.3.4) unstable; urgency=medium * update version to 4.3.4 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 4da8bb6..7a59042 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,4 +1,10 @@ -kamailio (4.3.4) UNRELEASED; urgency=medium +kamailio (4.3.5) unstable; urgency=medium + + * update version to 4.3.5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 03 Mar 2016 09:39:12 +0100 + +kamailio (4.3.4) unstable; urgency=medium * update version to 4.3.4 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 4da8bb6..7a59042 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,4 +1,10 @@ -kamailio (4.3.4) UNRELEASED; urgency=medium +kamailio (4.3.5) unstable; urgency=medium + + * update version to 4.3.5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 03 Mar 2016 09:39:12 +0100 + +kamailio (4.3.4) unstable; urgency=medium * update version to 4.3.4 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 4da8bb6..7a59042 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,4 +1,10 @@ -kamailio (4.3.4) UNRELEASED; urgency=medium +kamailio (4.3.5) unstable; urgency=medium + + * update version to 4.3.5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 03 Mar 2016 09:39:12 +0100 + +kamailio (4.3.4) unstable; urgency=medium * update version to 4.3.4 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 4da8bb6..7a59042 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,4 +1,10 @@ -kamailio (4.3.4) UNRELEASED; urgency=medium +kamailio (4.3.5) unstable; urgency=medium + + * update version to 4.3.5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Thu, 03 Mar 2016 09:39:12 +0100 + +kamailio (4.3.4) unstable; urgency=medium * update version to 4.3.4

1 0

git:4.3:04c9083b: pkg/kamailio/deb: fix typo at erlang short description
by Victor Seva 03 Mar '16

03 Mar '16

Module: kamailio Branch: 4.3 Commit: 04c9083bc11a8e74884cc9f1c030e33fc5cbd5f8 URL: https://github.com/kamailio/kamailio/commit/04c9083bc11a8e74884cc9f1c030e33… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-03-03T09:37:34+01:00 pkg/kamailio/deb: fix typo at erlang short description --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control --- Diff: https://github.com/kamailio/kamailio/commit/04c9083bc11a8e74884cc9f1c030e33… Patch: https://github.com/kamailio/kamailio/commit/04c9083bc11a8e74884cc9f1c030e33… --- diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index cd862d4..da7c669 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -630,7 +630,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: earlang modules for Kamailio +Description: erlang modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index 2e157ab..065bcc0 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -629,7 +629,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: earlang modules for Kamailio +Description: erlang modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 736c66d..1a4f658 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -585,7 +585,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: earlang modules for Kamailio +Description: erlang modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index 7eb60db..43c8a8c 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -476,7 +476,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: earlang modules for Kamailio +Description: erlang modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 2e157ab..065bcc0 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -629,7 +629,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: earlang modules for Kamailio +Description: erlang modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware. diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index b2d2d7b..c9f61f2 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -569,7 +569,7 @@ Pre-Depends: ${misc:Pre-Depends} Depends: kamailio (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: earlang modules for Kamailio +Description: erlang modules for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls per second even on low-budget hardware.

1 0

git:master:bbec8025: pkg/kamailio/deb: fix typo at erlang short description
by Victor Seva 03 Mar '16

03 Mar '16

Module: kamailio Branch: master Commit: bbec80253b887a275130796df52beb00c4526359 URL: https://github.com/kamailio/kamailio/commit/bbec80253b887a275130796df52beb0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-03-03T09:36:24+01:00 pkg/kamailio/deb: fix typo at erlang short description --- Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/squeeze/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control --- Diff: https://github.com/kamailio/kamailio/commit/bbec80253b887a275130796df52beb0… Patch: https://github.com/kamailio/kamailio/commit/bbec80253b887a275130796df52beb0…

1 0

git:4.3:1bf1deba: siptrace: Use the trace_local_ip setting in sip_trace()
by Daniel-Constantin Mierla 03 Mar '16

03 Mar '16

Module: kamailio Branch: 4.3 Commit: 1bf1deba22242c3a578b39e5569fc2eb9e0d9816 URL: https://github.com/kamailio/kamailio/commit/1bf1deba22242c3a578b39e5569fc2e… Author: Erik Davidson <erik.davidson(a)corvisa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-03T09:14:14+01:00 siptrace: Use the trace_local_ip setting in sip_trace() (cherry picked from commit 93dcc5dca539803ad7ae94dc86829d10d3d3412c) --- Modified: modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/1bf1deba22242c3a578b39e5569fc2e… Patch: https://github.com/kamailio/kamailio/commit/1bf1deba22242c3a578b39e5569fc2e… --- diff --git a/modules/siptrace/siptrace.c b/modules/siptrace/siptrace.c index df6ceff..8e69f0e 100644 --- a/modules/siptrace/siptrace.c +++ b/modules/siptrace/siptrace.c @@ -1013,29 +1013,41 @@ static int sip_trace(struct sip_msg *msg, struct dest_info * dst, char *dir) sto.body.s = msg->buf; sto.body.len = msg->len; - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff,":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.dir = (dir)?dir:"in"; - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff,":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + if (trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "out", 3) == 0) { + sto.fromip = trace_local_ip; + } else { + siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); + strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); + strcat(sto.fromip_buff,":"); + strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + } - sto.dir = (dir)?dir:"in"; + if (trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "in", 2) == 0) { + sto.toip = trace_local_ip; + } else { + siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); + strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); + strcat(sto.toip_buff,":"); + strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); + sto.toip.s = sto.toip_buff; + sto.toip.len = strlen(sto.toip_buff); + } } else { sto.body.s = snd_inf->buf; sto.body.len = snd_inf->len; - strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, - snd_inf->send_sock->sock_str.len); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + if (trace_local_ip.s && trace_local_ip.len > 0) { + sto.fromip = trace_local_ip; + } else { + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = strlen(sto.fromip_buff); + } siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to)));

1 0

Releasing Kamailio v4.3.5
by Daniel-Constantin Mierla 03 Mar '16

03 Mar '16

Hello, it's been a while since the release of v4.3.4, therefore I am considering to release a new minor version from branch 4.3 next week, most probably on Thursday, March 3, 2016. As usual, if there you are aware of issues not reported to the tracker [1], do it as soon as possible to get a chance to be fixed before the release date. Cheers, Daniel [1] https://github.com/kamailio/kamailio/issues -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, March 7-9, 2016 - http://www.asipto.com

1 2

git:4.3:5f2c257b: cnxcc: change some log levels from INFO to DBG
by Federico Cabiddu 02 Mar '16

02 Mar '16

Module: kamailio Branch: 4.3 Commit: 5f2c257b47ecc4f074cd840a944538d0a4affd27 URL: https://github.com/kamailio/kamailio/commit/5f2c257b47ecc4f074cd840a944538d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2016-03-02T13:13:41+01:00 cnxcc: change some log levels from INFO to DBG (cherry picked from commit f604bc4baf7b3332e661dba1c935a259112a4e72) --- Modified: modules/cnxcc/cnxcc_check.c Modified: modules/cnxcc/cnxcc_redis.c Modified: modules/cnxcc/cnxcc_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/5f2c257b47ecc4f074cd840a944538d… Patch: https://github.com/kamailio/kamailio/commit/5f2c257b47ecc4f074cd840a944538d… --- diff --git a/modules/cnxcc/cnxcc_check.c b/modules/cnxcc/cnxcc_check.c index 4a534ed..e2ca54c 100644 --- a/modules/cnxcc/cnxcc_check.c +++ b/modules/cnxcc/cnxcc_check.c @@ -90,7 +90,7 @@ void check_calls_by_money(unsigned int ticks, void *param) { } if (_data.redis) { - LM_INFO("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount); + LM_DBG("ec=%f, ca=%f, ca2=%f", credit_data->ended_calls_consumed_amount, total_consumed_money, credit_data->consumed_amount); consumption_diff = credit_data->ended_calls_consumed_amount + total_consumed_money - credit_data->consumed_amount; if (consumption_diff > 0) diff --git a/modules/cnxcc/cnxcc_redis.c b/modules/cnxcc/cnxcc_redis.c index e5ea991..cb074af 100644 --- a/modules/cnxcc/cnxcc_redis.c +++ b/modules/cnxcc/cnxcc_redis.c @@ -65,11 +65,11 @@ int redis_get_or_create_credit_data(credit_data_t *credit_data) { goto error; if (!exists) { // doesn't exist - LM_INFO("credit_data with ID=[%s] DOES NOT exist in the cluster, creating it...\n", credit_data->str_id); + LM_DBG("credit_data with ID=[%s] DOES NOT exist in the cluster, creating it...\n", credit_data->str_id); return redis_insert_credit_data(credit_data); } - LM_INFO("credit_data with ID=[%s] DOES exist in the cluster, retrieving it...\n", credit_data->str_id); + LM_DBG("credit_data with ID=[%s] DOES exist in the cluster, retrieving it...\n", credit_data->str_id); if (redis_get_double(credit_data, "HGET", "consumed_amount", &credit_data->consumed_amount) < 0) goto error; @@ -332,7 +332,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, const cha } if (rpl->type == REDIS_REPLY_NIL) { - LM_INFO("Value of %s is (nil)\n", key); + LM_DBG("Value of %s is (nil)\n", key); goto done; } @@ -348,7 +348,7 @@ int redis_get_str(credit_data_t *credit_data, const char *instruction, const cha done: freeReplyObject(rpl); - LM_INFO("Got STRING value: %s=[%.*s]\n", key, value->len, value->s); + LM_DBG("Got STRING value: %s=[%.*s]\n", key, value->len, value->s); return 1; } diff --git a/modules/cnxcc/cnxcc_rpc.c b/modules/cnxcc/cnxcc_rpc.c index 49de2c2..e0f3887 100644 --- a/modules/cnxcc/cnxcc_rpc.c +++ b/modules/cnxcc/cnxcc_rpc.c @@ -90,7 +90,7 @@ void rpc_check_client_stats(rpc_t* rpc, void* ctx) { if (credit_data->number_of_calls <= 0) { cnxcc_unlock(credit_data->lock); - LM_INFO("No calls for current client\n"); + LM_DBG("No calls for current client\n"); return; }

1 0

git:4.3:0be07fc1: tsilo: don't execute tm callback for TMCB_DESTROY if server shutdowns
by Daniel-Constantin Mierla 02 Mar '16

02 Mar '16

Module: kamailio Branch: 4.3 Commit: 0be07fc1dfaf1ee54ed8ff4820a11523e3f94376 URL: https://github.com/kamailio/kamailio/commit/0be07fc1dfaf1ee54ed8ff4820a1152… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-02T13:01:53+01:00 tsilo: don't execute tm callback for TMCB_DESTROY if server shutdowns - tsilo mod_destroy will clean up, otherwise may end up in deadlock at shutdown, when a slot lock is already aquired and the callback will try to aquire again (cherry picked from commit 81ec422227299b4cbd7aecbb58b862fc67208b30) --- Modified: modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/0be07fc1dfaf1ee54ed8ff4820a1152… Patch: https://github.com/kamailio/kamailio/commit/0be07fc1dfaf1ee54ed8ff4820a1152… --- diff --git a/modules/tsilo/ts_handlers.c b/modules/tsilo/ts_handlers.c index c04ec36..aab9d74 100644 --- a/modules/tsilo/ts_handlers.c +++ b/modules/tsilo/ts_handlers.c @@ -21,6 +21,8 @@ #include <string.h> +#include "../../sr_module.h" + #include "ts_hash.h" #include "ts_handlers.h" @@ -61,6 +63,9 @@ void ts_onreply(struct cell* t, int type, struct tmcb_params *param) ts_entry_t* _e; ts_transaction_t *cb_ptr, *ptr; + if(t_table==0) return; + if((type & (TMCB_DESTROY)) && destroy_modules_phase()) return; + cb_ptr = (ts_transaction_t*)(*param->param); if (cb_ptr == NULL) { LM_DBG("NULL param for type %d\n", type);

1 0

git:4.3:53d36500: core: option to check if server is in destroy modules phase
by Daniel-Constantin Mierla 02 Mar '16

02 Mar '16

Module: kamailio Branch: 4.3 Commit: 53d36500faa78270096a13b06466fdbc96a00760 URL: https://github.com/kamailio/kamailio/commit/53d36500faa78270096a13b06466fdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-02T13:00:59+01:00 core: option to check if server is in destroy modules phase (cherry picked from commit 87027c654d9381f79c305b18f33919b8c9a86b89) --- Modified: sr_module.c Modified: sr_module.h --- Diff: https://github.com/kamailio/kamailio/commit/53d36500faa78270096a13b06466fdb… Patch: https://github.com/kamailio/kamailio/commit/53d36500faa78270096a13b06466fdb… --- diff --git a/sr_module.c b/sr_module.c index 057bf02..d2d22ca 100644 --- a/sr_module.c +++ b/sr_module.c @@ -109,6 +109,17 @@ unsigned int set_modinit_delay(unsigned int v) return r; } +/* keep state if server is in destroy modules phase */ +static int _sr_destroy_modules_phase = 0; + +/** + * return destroy modules phase state + */ +int destroy_modules_phase(void) +{ + return _sr_destroy_modules_phase; +} + /** * if bit 1 set, SIP worker processes handle RPC commands as well * if bit 2 set, RPC worker processes handle SIP commands as well @@ -797,6 +808,7 @@ void destroy_modules() { struct sr_module* t, *foo; + _sr_destroy_modules_phase = 1; /* call first destroy function from each module */ t=modules; while(t) { diff --git a/sr_module.h b/sr_module.h index b20cd63..6eb42fb 100644 --- a/sr_module.h +++ b/sr_module.h @@ -654,5 +654,6 @@ int is_sip_worker(int rank); int is_rpc_worker(int rank); unsigned int set_modinit_delay(unsigned int v); +int destroy_modules_phase(void); #endif /* sr_module_h */

1 0

← Newer
1
...
32
33
34
35
36
37
38
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016