sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.3:9e7106f5: pkg/rpm: updated spec files for v4.3.2
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 9e7106f55019011defe438fa6fb1f9d0aa6567c0 URL: https://github.com/kamailio/kamailio/commit/9e7106f55019011defe438fa6fb1f9d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T14:01:11+02:00 pkg/rpm: updated spec files for v4.3.2 --- 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/9e7106f55019011defe438fa6fb1f9d… Patch: https://github.com/kamailio/kamailio/commit/9e7106f55019011defe438fa6fb1f9d… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index 85acc45..fe5c4a4 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.1 +%define ver 4.3.2 %define rel 0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index a776215..a8baca3 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.1 +%define ver 4.3.2 %define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 1ae56f4..c7170e6 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.1 +%define ver 4.3.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 25257e9..c2be610 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.1 +%define ver 4.3.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 ea3cc52..d0861f3 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.1 +%define ver 4.3.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.3:648834a6: rls: proper detection of initial subscribe to send notify with full state
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 648834a64d63aed64076dacf85ec5af1a5702333 URL: https://github.com/kamailio/kamailio/commit/648834a64d63aed64076dacf85ec5af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T13:59:16+02:00 rls: proper detection of initial subscribe to send notify with full state - use to-tag conditions, previously was sending only based on db mode - reported by GH#276 (cherry picked from commit b99e9e96592a5d708ff565343f3c810b2d264577) --- Modified: modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/648834a64d63aed64076dacf85ec5af… Patch: https://github.com/kamailio/kamailio/commit/648834a64d63aed64076dacf85ec5af… --- diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index a4735b2..9c24ac7 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -781,9 +781,9 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma } } - if (dbmode != RLS_DB_ONLY) + if (get_to(msg)->tag_value.s==NULL || get_to(msg)->tag_value.len==0) { - /* sending notify with full state */ + /* initial subscriber - sending notify with full state */ if(send_full_notify(&subs, service_node, &subs.pres_uri, hash_code)<0) { LM_ERR("failed sending full state notify\n");

1 0

git:4.3:8487422d: evapi: increased the static buffer size used for reading evapi responses
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 8487422d35ab8af7511e2abf3a38afb1328f4851 URL: https://github.com/kamailio/kamailio/commit/8487422d35ab8af7511e2abf3a38afb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T13:59:16+02:00 evapi: increased the static buffer size used for reading evapi responses - 32k instead of 4k (cherry picked from commit c4fd9188263414d825815cfbd745ce5b1351e62e) --- Modified: modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8487422d35ab8af7511e2abf3a38afb… Patch: https://github.com/kamailio/kamailio/commit/8487422d35ab8af7511e2abf3a38afb… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 0d76c9f..3731be7 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -225,7 +225,7 @@ int evapi_dispatch_notify(char *obuf, int olen) */ void evapi_recv_client(struct ev_loop *loop, struct ev_io *watcher, int revents) { -#define CLIENT_BUFFER_SIZE 4096 +#define CLIENT_BUFFER_SIZE 32768 char rbuffer[CLIENT_BUFFER_SIZE]; ssize_t rlen; int i, k;

1 0

git:4.3:9bb179f7: cnxcc: fixed include guard
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 9bb179f72f7e4321a8f3a6e89685ee586d6cfa74 URL: https://github.com/kamailio/kamailio/commit/9bb179f72f7e4321a8f3a6e89685ee5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T13:59:16+02:00 cnxcc: fixed include guard - reported by GH#323 (cherry picked from commit 3137d2ab8ec539c2059e59e0849ef7bdd7aa509b) --- Modified: modules/cnxcc/cnxcc_redis.h --- Diff: https://github.com/kamailio/kamailio/commit/9bb179f72f7e4321a8f3a6e89685ee5… Patch: https://github.com/kamailio/kamailio/commit/9bb179f72f7e4321a8f3a6e89685ee5… --- diff --git a/modules/cnxcc/cnxcc_redis.h b/modules/cnxcc/cnxcc_redis.h index 7dade38..af24c7a 100644 --- a/modules/cnxcc/cnxcc_redis.h +++ b/modules/cnxcc/cnxcc_redis.h @@ -22,7 +22,7 @@ * */ -#ifndef CNXCC_STORAGE_H_ +#ifndef CNXCC_REDIS_H_ #define CNXCC_REDIS_H_ #include <hiredis/hiredis.h>

1 0

git:4.3:a58c136c: dialog: safety check not to store dialog vars and data when state initial
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: a58c136c3abad48b2d01a4b54b1e56e0901b8246 URL: https://github.com/kamailio/kamailio/commit/a58c136c3abad48b2d01a4b54b1e56e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T13:59:16+02:00 dialog: safety check not to store dialog vars and data when state initial - acc callbacks for cdrs can trigger setting dialog vars in initial state, which then try to save in db, however, initial state might not have all required fields for a proper db reload, storing being desinged to be done when all mandatory fields are set (cherry picked from commit cecdd0817052046e634152d6e512165451b5f6d4) --- Modified: modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/a58c136c3abad48b2d01a4b54b1e56e… Patch: https://github.com/kamailio/kamailio/commit/a58c136c3abad48b2d01a4b54b1e56e… --- diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index 117db20..aaa8ff4 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -711,6 +711,11 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) &sflags_column, &toroute_name_column, &req_uri_column, &xdata_column, &iflags_column }; + if(cell->state<DLG_STATE_EARLY) { + LM_DBG("not storing dlg in db during initial state\n"); + return 0; + } + i = 0; if( (cell->dflags & DLG_FLAG_NEW) != 0 || (cell->dflags & DLG_FLAG_CHANGED_VARS) != 0) {

1 0

git:4.3:061195f6: dialog: lock the slot if old dialog found in state deleted
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 061195f6d553bad5edfc30db5c8da28d74421519 URL: https://github.com/kamailio/kamailio/commit/061195f6d553bad5edfc30db5c8da28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T13:59:16+02:00 dialog: lock the slot if old dialog found in state deleted - no longer a spiral condition and new dialog will be created (cherry picked from commit 7f9194c416e171c2b723430eb98a55a52b7b5e38) --- Modified: modules/dialog/dlg_handlers.c Modified: modules/dialog/dlg_hash.c Modified: modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/061195f6d553bad5edfc30db5c8da28… Patch: https://github.com/kamailio/kamailio/commit/061195f6d553bad5edfc30db5c8da28… --- diff --git a/modules/dialog/dlg_handlers.c b/modules/dialog/dlg_handlers.c index 248d985..ad88faa 100644 --- a/modules/dialog/dlg_handlers.c +++ b/modules/dialog/dlg_handlers.c @@ -820,7 +820,9 @@ int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) return 0; } dlg_release(dlg); - } + } + /* lock the slot - dlg found, but in dlg_state_deleted, do a new one */ + dlg_hash_lock(&callid); } spiral_detected = 0; diff --git a/modules/dialog/dlg_hash.c b/modules/dialog/dlg_hash.c index 420caea..b1639f1 100644 --- a/modules/dialog/dlg_hash.c +++ b/modules/dialog/dlg_hash.c @@ -750,6 +750,21 @@ dlg_cell_t* search_dlg( str *callid, str *ftag, str *ttag, unsigned int *dir) /*! + * \brief Lock hash table slot by call-id + * \param callid call-id value + */ +void dlg_hash_lock(str *callid) +{ + unsigned int he; + struct dlg_entry *d_entry; + + he = core_hash(callid, 0, d_table->size); + d_entry = &(d_table->entries[he]); + dlg_lock(d_table, d_entry); +} + + +/*! * \brief Release hash table slot by call-id * \param callid call-id value */ @@ -764,7 +779,6 @@ void dlg_hash_release(str *callid) } - /*! * \brief Link a dialog structure * \param dlg dialog diff --git a/modules/dialog/dlg_hash.h b/modules/dialog/dlg_hash.h index b09fe38..bacc21a 100644 --- a/modules/dialog/dlg_hash.h +++ b/modules/dialog/dlg_hash.h @@ -347,6 +347,13 @@ dlg_cell_t* search_dlg(str *callid, str *ftag, str *ttag, unsigned int *dir); /*! + * \brief Lock hash table slot by call-id + * \param callid call-id value + */ +void dlg_hash_lock(str *callid); + + +/*! * \brief Release hash table slot by call-id * \param callid call-id value */

1 0

git:4.3:3fc2d2ce: dmq_usrloc: check existence of usrloc domain before continuing.
by Charles Chance 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 3fc2d2ceafa33153e9c046f192dc41baae14f3ec URL: https://github.com/kamailio/kamailio/commit/3fc2d2ceafa33153e9c046f192dc41b… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-09-10T12:50:04+01:00 dmq_usrloc: check existence of usrloc domain before continuing. --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/3fc2d2ceafa33153e9c046f192dc41b… Patch: https://github.com/kamailio/kamailio/commit/3fc2d2ceafa33153e9c046f192dc41b… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index e4a9ed7..40e89d3 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -101,7 +101,10 @@ static int delete_contact(str aor, ucontact_info_t* ci) urecord_t* r; ucontact_t* c; - dmq_ul.get_udomain("location", &_d); + if (dmq_ul.get_udomain("location", &_d) < 0) { + LM_ERR("Failed to get domain\n"); + return -1; + } if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), &ci->ruid, &r, &c) != 0) {

1 0

git:4.3:24b347a5: dmq_usrloc: implement deleted contact replication
by Charles Chance 10 Sep '15

10 Sep '15

Module: kamailio Branch: 4.3 Commit: 24b347a5fca61d13a0765dbf1b3c8207caf3b45d URL: https://github.com/kamailio/kamailio/commit/24b347a5fca61d13a0765dbf1b3c820… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-09-10T12:46:53+01:00 dmq_usrloc: implement deleted contact replication (cherry picked from commit edc25d7373f9560d09a35640ab19741f19b97040) --- Modified: modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/24b347a5fca61d13a0765dbf1b3c820… Patch: https://github.com/kamailio/kamailio/commit/24b347a5fca61d13a0765dbf1b3c820… --- diff --git a/modules/dmq_usrloc/usrloc_sync.c b/modules/dmq_usrloc/usrloc_sync.c index f5ef20f..e4a9ed7 100644 --- a/modules/dmq_usrloc/usrloc_sync.c +++ b/modules/dmq_usrloc/usrloc_sync.c @@ -95,6 +95,30 @@ static int add_contact(str aor, ucontact_info_t* ci) return -1; } +static int delete_contact(str aor, ucontact_info_t* ci) +{ + udomain_t* _d; + urecord_t* r; + ucontact_t* c; + + dmq_ul.get_udomain("location", &_d); + + if (dmq_ul.get_urecord_by_ruid(_d, dmq_ul.get_aorhash(&aor), + &ci->ruid, &r, &c) != 0) { + LM_WARN("AOR/Contact not found\n"); + return -1; + } + if (dmq_ul.delete_ucontact(r, c) != 0) { + dmq_ul.unlock_udomain(_d, &aor); + LM_WARN("could not delete contact\n"); + return -1; + } + dmq_ul.release_urecord(r); + dmq_ul.unlock_udomain(_d, &aor); + + return 0; +} + void usrloc_get_all_ucontact(dmq_node_t* node) { int rval, len=0; @@ -364,6 +388,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* break; case DMQ_RM: LM_DBG("Received DMQ_RM. Delete contact info...\n"); + delete_contact(aor, &ci); break; case DMQ_SYNC: LM_DBG("Received DMQ_SYNC. Sending all contacts...\n"); @@ -517,8 +542,7 @@ void dmq_ul_cb_contact(ucontact_t* ptr, int type, void* param) usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0); break; case UL_CONTACT_DELETE: - //usrloc_dmq_send_contact(ptr, aor, DMQ_RM); - LM_DBG("Contact <%.*s> deleted\n", aor.len, aor.s); + usrloc_dmq_send_contact(ptr, aor, DMQ_RM, 0); break; case UL_CONTACT_EXPIRE: //usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE);

1 0

Releasing Kamailio v4.3.2
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Hello, I am considering to release a new version from branch 4.3 later this week, on Thursday, September 10. If there are issues not yet reported, then use github tracker to do it: - https://github.com/kamailio/kamailio/issues Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Book: SIP Routing With Kamailio - http://www.asipto.com Kamailio Advanced Training, Sep 28-30, 2015, in Berlin - http://asipto.com/u/kat

2 7

git:master:b99e9e96: rls: proper detection of initial subscribe to send notify with full state
by Daniel-Constantin Mierla 10 Sep '15

10 Sep '15

Module: kamailio Branch: master Commit: b99e9e96592a5d708ff565343f3c810b2d264577 URL: https://github.com/kamailio/kamailio/commit/b99e9e96592a5d708ff565343f3c810… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-10T12:24:07+02:00 rls: proper detection of initial subscribe to send notify with full state - use to-tag conditions, previously was sending only based on db mode - reported by GH#276 --- Modified: modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/b99e9e96592a5d708ff565343f3c810… Patch: https://github.com/kamailio/kamailio/commit/b99e9e96592a5d708ff565343f3c810… --- diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index a4735b2..9c24ac7 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -781,9 +781,9 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma } } - if (dbmode != RLS_DB_ONLY) + if (get_to(msg)->tag_value.s==NULL || get_to(msg)->tag_value.len==0) { - /* sending notify with full state */ + /* initial subscriber - sending notify with full state */ if(send_full_notify(&subs, service_node, &subs.pres_uri, hash_code)<0) { LM_ERR("failed sending full state notify\n");

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
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 September 2015