sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
531 discussions

git:4.2:0dbf946a: htable: revert usage of dmq nodes
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: 0dbf946ac54611b0ea359799f8e007b1851f3122 URL: https://github.com/kamailio/kamailio/commit/0dbf946ac54611b0ea359799f8e007b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T18:02:30+01:00 htable: revert usage of dmq nodes - back to v4.2.1 state --- Modified: modules/htable/ht_dmq.c Modified: modules/htable/ht_dmq.h --- Diff: https://github.com/kamailio/kamailio/commit/0dbf946ac54611b0ea359799f8e007b… Patch: https://github.com/kamailio/kamailio/commit/0dbf946ac54611b0ea359799f8e007b… --- diff --git a/modules/htable/ht_dmq.c b/modules/htable/ht_dmq.c index 7fa2959..284c3dc 100644 --- a/modules/htable/ht_dmq.c +++ b/modules/htable/ht_dmq.c @@ -59,7 +59,6 @@ int ht_dmq_initialize() } not_peer.callback = ht_dmq_handle_msg; - not_peer.init_callback = NULL; not_peer.description.s = "htable"; not_peer.description.len = 6; not_peer.peer_id.s = "htable"; @@ -89,7 +88,7 @@ int ht_dmq_broadcast(str* body) { /** * @brief ht dmq callback */ -int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node) +int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) { int content_length; str body; diff --git a/modules/htable/ht_dmq.h b/modules/htable/ht_dmq.h index e9189ec..7a0ca88 100644 --- a/modules/htable/ht_dmq.h +++ b/modules/htable/ht_dmq.h @@ -40,7 +40,7 @@ typedef enum { } ht_dmq_action_t; int ht_dmq_initialize(); -int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq_node); +int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp); int ht_dmq_replicate_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode); int ht_dmq_replay_action(ht_dmq_action_t action, str* htname, str* cname, int type, int_str* val, int mode); int ht_dmq_resp_callback_f(struct sip_msg* msg, int code, dmq_node_t* node, void* param);

1 0

git:4.2:486bfe7f: Makefile.defs: version set to 4.2.2
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: 486bfe7f037ea27dc8705b3e81c39ba79c54a6dd URL: https://github.com/kamailio/kamailio/commit/486bfe7f037ea27dc8705b3e81c39ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T17:54:56+01:00 Makefile.defs: version set to 4.2.2 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/486bfe7f037ea27dc8705b3e81c39ba… Patch: https://github.com/kamailio/kamailio/commit/486bfe7f037ea27dc8705b3e81c39ba… --- diff --git a/Makefile.defs b/Makefile.defs index 32b400a..78887e9 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -164,7 +164,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 2 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:4.2:d97a2f69: dmq: more initialization of pointers at declaration of vars
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: d97a2f6936fd84459e167143fc5c3a2571712e89 URL: https://github.com/kamailio/kamailio/commit/d97a2f6936fd84459e167143fc5c3a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T17:16:12+01:00 dmq: more initialization of pointers at declaration of vars (cherry picked from commit 4d52cc0556d2e9cf334aca89325589f1c86b4dc7) --- Modified: modules/dmq/dmq.c Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/d97a2f6936fd84459e167143fc5c3a2… Patch: https://github.com/kamailio/kamailio/commit/d97a2f6936fd84459e167143fc5c3a2… --- diff --git a/modules/dmq/dmq.c b/modules/dmq/dmq.c index 9b0df41..d8e7733 100644 --- a/modules/dmq/dmq.c +++ b/modules/dmq/dmq.c @@ -75,12 +75,12 @@ sl_api_t slb; /** module variables */ str dmq_request_method = str_init("KDMQ"); -dmq_worker_t* workers; +dmq_worker_t* workers = NULL; dmq_peer_list_t* peer_list = 0; /* the list of dmq servers */ -dmq_node_list_t* node_list; +dmq_node_list_t* node_list = NULL; // the dmq module is a peer itself for receiving notifications regarding nodes -dmq_peer_t* dmq_notification_peer; +dmq_peer_t* dmq_notification_peer = NULL; /** module functions */ static int mod_init(void); diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 2e87c77..ae92e82 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -38,6 +38,8 @@ int *dmq_init_callback_done = 0; int add_notification_peer() { dmq_peer_t not_peer; + + memset(&not_peer, 0, sizeof(dmq_peer_t)); not_peer.callback = dmq_notification_callback; not_peer.init_callback = NULL; not_peer.description.s = "notification_peer";

1 0

git:4.2:4acf9930: pkg/rpm: set version 4.2.2 in spec files
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: 4acf9930fbeed2764a74c0f2ccb6348bee9716d7 URL: https://github.com/kamailio/kamailio/commit/4acf9930fbeed2764a74c0f2ccb6348… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T16:23:51+01:00 pkg/rpm: set version 4.2.2 in spec files --- 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/4acf9930fbeed2764a74c0f2ccb6348… Patch: https://github.com/kamailio/kamailio/commit/4acf9930fbeed2764a74c0f2ccb6348… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 6e5ad2e..1b4fe03 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.2.1 +%define ver 4.2.2 %define rel 0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index b4f9afd..8c6c75d 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.2.1 +%define ver 4.2.2 %define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 3dbd4b7..00a93a4 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.2.1 +%define ver 4.2.2 %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 8f0d337..7a4a1de 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.2.1 +%define ver 4.2.2 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index c4559c2..c2db965 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.2.1 +%define ver 4.2.2 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:4.2:e2b91d68: dmq: initialize peer_list to NULL by default
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: e2b91d68d1fe411621587a552c15b4b705ae17eb URL: https://github.com/kamailio/kamailio/commit/e2b91d68d1fe411621587a552c15b4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T16:11:18+01:00 dmq: initialize peer_list to NULL by default - credits to Olle E. Jonansson for testing and reports (cherry picked from commit b27c38b71c09e6763e8412b7e33aab77af3dfc76) --- Modified: modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b91d68d1fe411621587a552c15b4b… Patch: https://github.com/kamailio/kamailio/commit/e2b91d68d1fe411621587a552c15b4b… --- diff --git a/modules/dmq/dmq.c b/modules/dmq/dmq.c index 3d84872..9b0df41 100644 --- a/modules/dmq/dmq.c +++ b/modules/dmq/dmq.c @@ -76,7 +76,7 @@ sl_api_t slb; /** module variables */ str dmq_request_method = str_init("KDMQ"); dmq_worker_t* workers; -dmq_peer_list_t* peer_list; +dmq_peer_list_t* peer_list = 0; /* the list of dmq servers */ dmq_node_list_t* node_list; // the dmq module is a peer itself for receiving notifications regarding nodes

1 0

git:4.2:ca017155: pkg/deb: version set to 4.2.2 in spec files
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: ca0171557021a5138f52fed9ea492e1d498b881d URL: https://github.com/kamailio/kamailio/commit/ca0171557021a5138f52fed9ea492e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T15:19:57+01:00 pkg/deb: version set to 4.2.2 in spec files --- 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/ca0171557021a5138f52fed9ea492e1… Patch: https://github.com/kamailio/kamailio/commit/ca0171557021a5138f52fed9ea492e1… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index dcf2829..0111f8a 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.2) unstable; urgency=medium + + * update versionto 4.2.2 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 08 Jan 2015 14:25:40 +0100 + kamailio (4.2.1) unstable; urgency=medium * update versionto 4.2.1 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index dcf2829..0111f8a 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.2) unstable; urgency=medium + + * update versionto 4.2.2 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 08 Jan 2015 14:25:40 +0100 + kamailio (4.2.1) unstable; urgency=medium * update versionto 4.2.1 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index dcf2829..0111f8a 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.2) unstable; urgency=medium + + * update versionto 4.2.2 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 08 Jan 2015 14:25:40 +0100 + kamailio (4.2.1) unstable; urgency=medium * update versionto 4.2.1 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index dcf2829..0111f8a 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.2) unstable; urgency=medium + + * update versionto 4.2.2 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 08 Jan 2015 14:25:40 +0100 + kamailio (4.2.1) unstable; urgency=medium * update versionto 4.2.1 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index dcf2829..0111f8a 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.2) unstable; urgency=medium + + * update versionto 4.2.2 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 08 Jan 2015 14:25:40 +0100 + kamailio (4.2.1) unstable; urgency=medium * update versionto 4.2.1 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index dcf2829..0111f8a 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.2) unstable; urgency=medium + + * update versionto 4.2.2 + + -- Daniel-Constantin Mierla <miconda(a)gmail.com> Thu, 08 Jan 2015 14:25:40 +0100 + kamailio (4.2.1) unstable; urgency=medium * update versionto 4.2.1

1 0

git:4.2:2556a840: dmq: safety check for peer_list when calling the callbacks
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: 4.2 Commit: 2556a840208f4d16973772547af8258f314cef8c URL: https://github.com/kamailio/kamailio/commit/2556a840208f4d16973772547af8258… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T14:25:13+01:00 dmq: safety check for peer_list when calling the callbacks - can result in crashing if it is not set - reported by Olle E. Johansson (cherry picked from commit cc5f96f9c847d285085b0b9809ff0db76ea0a835) --- Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/2556a840208f4d16973772547af8258… Patch: https://github.com/kamailio/kamailio/commit/2556a840208f4d16973772547af8258… --- diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 1d804bd..b493717 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -173,6 +173,10 @@ int extract_node_list(dmq_node_list_t* update_list, struct sip_msg* msg) int run_init_callbacks() { dmq_peer_t* crt; + if(peer_list==0) { + LM_WARN("peer list is null\n"); + return 0; + } crt = peer_list->peers; while(crt) { if (crt->init_callback) {

1 0

git:master:4d52cc05: dmq: more initialization of pointers at declaration of vars
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: master Commit: 4d52cc0556d2e9cf334aca89325589f1c86b4dc7 URL: https://github.com/kamailio/kamailio/commit/4d52cc0556d2e9cf334aca89325589f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T17:15:19+01:00 dmq: more initialization of pointers at declaration of vars --- Modified: modules/dmq/dmq.c Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/4d52cc0556d2e9cf334aca89325589f… Patch: https://github.com/kamailio/kamailio/commit/4d52cc0556d2e9cf334aca89325589f… --- diff --git a/modules/dmq/dmq.c b/modules/dmq/dmq.c index c17607a..7df28a3 100644 --- a/modules/dmq/dmq.c +++ b/modules/dmq/dmq.c @@ -75,12 +75,12 @@ sl_api_t slb; /** module variables */ str dmq_request_method = str_init("KDMQ"); -dmq_worker_t* workers; +dmq_worker_t* workers = NULL; dmq_peer_list_t* peer_list = 0; /* the list of dmq servers */ -dmq_node_list_t* node_list; +dmq_node_list_t* node_list = NULL; // the dmq module is a peer itself for receiving notifications regarding nodes -dmq_peer_t* dmq_notification_peer; +dmq_peer_t* dmq_notification_peer = NULL; /** module functions */ static int mod_init(void); diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 2e87c77..ae92e82 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -38,6 +38,8 @@ int *dmq_init_callback_done = 0; int add_notification_peer() { dmq_peer_t not_peer; + + memset(&not_peer, 0, sizeof(dmq_peer_t)); not_peer.callback = dmq_notification_callback; not_peer.init_callback = NULL; not_peer.description.s = "notification_peer";

1 0

git:master:cc5f96f9: dmq: safety check for peer_list when calling the callbacks
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: master Commit: cc5f96f9c847d285085b0b9809ff0db76ea0a835 URL: https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T14:20:58+01:00 dmq: safety check for peer_list when calling the callbacks - can result in crashing if it is not set - reported by Olle E. Johansson --- Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db… Patch: https://github.com/kamailio/kamailio/commit/cc5f96f9c847d285085b0b9809ff0db… --- diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 1d804bd..b493717 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -173,6 +173,10 @@ int extract_node_list(dmq_node_list_t* update_list, struct sip_msg* msg) int run_init_callbacks() { dmq_peer_t* crt; + if(peer_list==0) { + LM_WARN("peer list is null\n"); + return 0; + } crt = peer_list->peers; while(crt) { if (crt->init_callback) {

2 3

git:master:b27c38b7: dmq: initialize peer_list to NULL by default
by Daniel-Constantin Mierla 08 Jan '15

08 Jan '15

Module: kamailio Branch: master Commit: b27c38b71c09e6763e8412b7e33aab77af3dfc76 URL: https://github.com/kamailio/kamailio/commit/b27c38b71c09e6763e8412b7e33aab7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-08T16:10:00+01:00 dmq: initialize peer_list to NULL by default - credits to Olle E. Jonansson for testing and reports --- Modified: modules/dmq/dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/b27c38b71c09e6763e8412b7e33aab7… Patch: https://github.com/kamailio/kamailio/commit/b27c38b71c09e6763e8412b7e33aab7… --- diff --git a/modules/dmq/dmq.c b/modules/dmq/dmq.c index 6d53baf..c17607a 100644 --- a/modules/dmq/dmq.c +++ b/modules/dmq/dmq.c @@ -76,7 +76,7 @@ sl_api_t slb; /** module variables */ str dmq_request_method = str_init("KDMQ"); dmq_worker_t* workers; -dmq_peer_list_t* peer_list; +dmq_peer_list_t* peer_list = 0; /* the list of dmq servers */ dmq_node_list_t* node_list; // the dmq module is a peer itself for receiving notifications regarding nodes

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015