sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:master:5ee67473: rtpengine: new read_sdp_pv parameter
by Camille Oudot 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: 5ee6747368751c9d428314c92791314c02e601a5 URL: https://github.com/kamailio/kamailio/commit/5ee6747368751c9d428314c92791314… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-08-11T15:49:55+02:00 rtpengine: new read_sdp_pv parameter this parameter allows to specify a script var or AVP for rtpengine to get the SDP from, instead of the SIP message body. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/5ee6747368751c9d428314c92791314… Patch: https://github.com/kamailio/kamailio/commit/5ee6747368751c9d428314c92791314… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index f0029eb..de8bb63 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -286,6 +286,31 @@ modparam("rtpengine", "force_send_interface", "2001:8d8:1ff:10c0:9a90:96ff:fea8: </programlisting> </example> </section> + + <section id="rtpengine.p.read_sdp_pv"> + <title><varname>read_sdp_pv</varname> (string)</title> + <para> + If this parameter is set to a valid AVP or script var specifier, rtpengine + will take the input SDP from this pv instead of the message body. + </para> + <para> + There is no default value. + </para> + <example> + <title>Set <varname>read_sdp_pv</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "read_sdp_pv", "$var(sdp)") +... +route { + ... + $var(sdp) = $rb + "a=foo:bar\r\n"; + rtpproxy_manage(); +} +</programlisting> + </example> + </section> + <section id="rtpengine.p.write_sdp_pv"> <title><varname>write_sdp_pv</varname> (string)</title> <para> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index c67ac5a..eb25232 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -255,6 +255,9 @@ static int_str setid_avp; static str write_sdp_pvar_str = {NULL, 0}; static pv_spec_t* write_sdp_pvar = NULL; +static str read_sdp_pvar_str = {NULL, 0}; +static pv_spec_t* read_sdp_pvar = NULL; + #define RTPENGINE_SESS_LIMIT_MSG "Parallel session limit reached" #define RTPENGINE_SESS_LIMIT_MSG_LEN (sizeof(RTPENGINE_SESS_LIMIT_MSG)-1) @@ -332,6 +335,7 @@ static param_export_t params[] = { {"force_send_interface", PARAM_STRING, &force_send_ip_str }, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param }, {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str }, + {"read_sdp_pv", PARAM_STR, &read_sdp_pvar_str }, {0, 0, 0} }; @@ -1403,6 +1407,16 @@ mod_init(void) } } + if (read_sdp_pvar_str.len > 0) { + read_sdp_pvar = pv_cache_get(&read_sdp_pvar_str); + if (read_sdp_pvar == NULL + || (read_sdp_pvar->type != PVT_AVP && read_sdp_pvar->type != PVT_SCRIPTVAR) ) { + LM_ERR("read_sdp_pv: not a valid AVP or VAR definition <%.*s>\n", + read_sdp_pvar_str.len, read_sdp_pvar_str.s); + return -1; + } + } + if (rtpp_strings) pkg_free(rtpp_strings); @@ -1780,6 +1794,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ int ret, queried_nodes; struct rtpp_node *node; char *cp; + pv_value_t pv_val; /*** get & init basic stuff needed ***/ @@ -1810,7 +1825,16 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ ng_flags.replace = bencode_list(bencbuf); ng_flags.rtcp_mux = bencode_list(bencbuf); - if (extract_body(msg, &body) == -1) { + if (read_sdp_pvar!= NULL) { + if (read_sdp_pvar->getf(msg,&read_sdp_pvar->pvp, &pv_val) < 0) + { + LM_ERR("error getting pvar value <%.*s>\n", read_sdp_pvar_str.len, read_sdp_pvar_str.s); + goto error; + } else { + body = pv_val.rs; + } + + } else if (extract_body(msg, &body) == -1) { LM_ERR("can't extract body from the message\n"); goto error; }

1 0

[kamailio] rtpengine: new read_sdp_pv parameter (#283)
by Camille Oudot 02 Oct '15

02 Oct '15

this parameter allows to specify a script var or AVP for rtpengine to get the SDP from, instead of the SIP message body. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/283 -- Commit Summary -- * rtpengine: new read_sdp_pv parameter -- File Changes -- M modules/rtpengine/doc/rtpengine_admin.xml (25) M modules/rtpengine/rtpengine.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/283.patch https://github.com/kamailio/kamailio/pull/283.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/283

3 2

Kamailio v4.3.3 Released
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Hello, Kamailio SIP Server v4.3.3 stable release is out. This is a maintenance release of the latest stable branch, 4.3, that includes fixes since release of v4.3.2. There is no change to database schema or configuration language structure that you have to do on previous installations of v4.3.x. Deployments running previous v4.x.x versions are strongly recommended to be upgraded to v4.3.3. For more details about version 4.3.3 (including links and guidelines to download the tarball or from GIT repository), visit: * http://www.kamailio.org/w/2015/10/kamailio-v4-3-3-released/ RPM, Debian/Ubuntu packages will be available soon as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

1 0

git:4.3:e275bc0e: ChangeLog: content updated for v4.3.3
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: 4.3 Commit: e275bc0ecf12f3e165c6481d2a4a4d0acb8fb28e URL: https://github.com/kamailio/kamailio/commit/e275bc0ecf12f3e165c6481d2a4a4d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T14:31:06+02:00 ChangeLog: content updated for v4.3.3 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e275bc0ecf12f3e165c6481d2a4a4d0… Patch: https://github.com/kamailio/kamailio/commit/e275bc0ecf12f3e165c6481d2a4a4d0…

1 0

git:4.3:51e15819: Makefile.defs: version set to 4.3.3
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: 4.3 Commit: 51e15819d31a1387837e1872d4cb80f94956cad1 URL: https://github.com/kamailio/kamailio/commit/51e15819d31a1387837e1872d4cb80f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T14:29:11+02:00 Makefile.defs: version set to 4.3.3 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/51e15819d31a1387837e1872d4cb80f… Patch: https://github.com/kamailio/kamailio/commit/51e15819d31a1387837e1872d4cb80f… --- diff --git a/Makefile.defs b/Makefile.defs index 8205bcd..f7bbc16 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -96,7 +96,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 4 PATCHLEVEL = 3 -SUBLEVEL = 2 +SUBLEVEL = 3 EXTRAVERSION = # memory manager switcher

1 0

git:4.3:ecf289cf: pkg/rpm: updated spec files for v4.3.3
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: 4.3 Commit: ecf289cfcdb7ee5678d86f03ccf4a5138c102a34 URL: https://github.com/kamailio/kamailio/commit/ecf289cfcdb7ee5678d86f03ccf4a51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T14:27:36+02:00 pkg/rpm: updated spec files for v4.3.3 --- 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/ecf289cfcdb7ee5678d86f03ccf4a51… Patch: https://github.com/kamailio/kamailio/commit/ecf289cfcdb7ee5678d86f03ccf4a51… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index fe5c4a4..0ae8960 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.2 +%define ver 4.3.3 %define rel 0.0%{dist} diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index a8baca3..e71b1b1 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.2 +%define ver 4.3.3 %define rel 0%{dist} diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index c7170e6..b2bfa21 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.2 +%define ver 4.3.3 %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 c2be610..ca7017d 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.2 +%define ver 4.3.3 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index d0861f3..c181112 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.2 +%define ver 4.3.3 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:master:1cb06867: pkg/kamailio/deb: update version to 4.4.0~dev5
by Victor Seva 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: 1cb0686778a1d9788c9df1a02b38309bba76f903 URL: https://github.com/kamailio/kamailio/commit/1cb0686778a1d9788c9df1a02b38309… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-10-02T14:17:09+02:00 pkg/kamailio/deb: update version to 4.4.0~dev5 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/1cb0686778a1d9788c9df1a02b38309… Patch: https://github.com/kamailio/kamailio/commit/1cb0686778a1d9788c9df1a02b38309… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index a1b6ced..48dabaf 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~dev5) unstable; urgency=medium + + * update version to 4.4.0~dev5 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Fri, 02 Oct 2015 14:15:56 +0200 + kamailio (4.4.0~dev3) unstable; urgency=medium * update version to 4.4.0~dev3

1 0

git:4.3:3181001e: dialog: fix race due to deep copy of dlg hash table slot when saving to db
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: 4.3 Commit: 3181001ebae49847ed210428946fde96e89e9c4f URL: https://github.com/kamailio/kamailio/commit/3181001ebae49847ed210428946fde9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T14:11:05+02:00 dialog: fix race due to deep copy of dlg hash table slot when saving to db (cherry picked from commit 2d9c7f9658fe78979df69c81f56b36366b80a262) --- Modified: modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/3181001ebae49847ed210428946fde9… Patch: https://github.com/kamailio/kamailio/commit/3181001ebae49847ed210428946fde9… --- diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index 5dddd63..aed40e7 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -862,43 +862,31 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int update_dialog_dbinfo(struct dlg_cell * cell) { - struct dlg_entry entry; /* lock the entry */ - entry = (d_table->entries)[cell->h_entry]; - dlg_lock( d_table, &entry); + dlg_lock(d_table, &d_table->entries[cell->h_entry]); if (update_dialog_dbinfo_unsafe(cell) != 0) { - dlg_unlock( d_table, &entry); + dlg_unlock(d_table, &d_table->entries[cell->h_entry]); return -1; } - dlg_unlock( d_table, &entry); + dlg_unlock(d_table, &d_table->entries[cell->h_entry]); return 0; } void dialog_update_db(unsigned int ticks, void * param) { - int index; - struct dlg_entry entry; - struct dlg_cell * cell; + int i; + struct dlg_cell *cell; LM_DBG("saving current_info \n"); - - for(index = 0; index< d_table->size; index++){ - /* lock the whole entry */ - entry = (d_table->entries)[index]; - dlg_lock( d_table, &entry); - - for(cell = entry.first; cell != NULL; cell = cell->next){ - if (update_dialog_dbinfo_unsafe(cell) != 0) { - dlg_unlock( d_table, &entry); - goto error; - } - } - dlg_unlock( d_table, &entry); + for(i = 0; i < d_table->size; i++){ + /* lock the slot */ + dlg_lock(d_table, &d_table->entries[i]); + for(cell = d_table->entries[i].first; cell != NULL; cell = cell->next){ + /* if update fails for one dlg, still do it for the next ones */ + update_dialog_dbinfo_unsafe(cell); + } + dlg_unlock(d_table, &d_table->entries[i]); } - return; - -error: - dlg_unlock( d_table, &entry); }

1 0

git:master:47853d6f: Makefile.defs: version set to 4.4.0-dev5
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: 47853d6f2f27cb25363c1932f6881bbd1ae09c69 URL: https://github.com/kamailio/kamailio/commit/47853d6f2f27cb25363c1932f6881bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T14:10:08+02:00 Makefile.defs: version set to 4.4.0-dev5 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/47853d6f2f27cb25363c1932f6881bb… Patch: https://github.com/kamailio/kamailio/commit/47853d6f2f27cb25363c1932f6881bb… --- diff --git a/Makefile.defs b/Makefile.defs index 0938289..8b667a9 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:2d9c7f96: dialog: fix race due to deep copy of dlg hash table slot when saving to db
by Daniel-Constantin Mierla 02 Oct '15

02 Oct '15

Module: kamailio Branch: master Commit: 2d9c7f9658fe78979df69c81f56b36366b80a262 URL: https://github.com/kamailio/kamailio/commit/2d9c7f9658fe78979df69c81f56b363… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-02T14:10:08+02:00 dialog: fix race due to deep copy of dlg hash table slot when saving to db --- Modified: modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/2d9c7f9658fe78979df69c81f56b363… Patch: https://github.com/kamailio/kamailio/commit/2d9c7f9658fe78979df69c81f56b363… --- diff --git a/modules/dialog/dlg_db_handler.c b/modules/dialog/dlg_db_handler.c index e3b66df..dcb5ebc 100644 --- a/modules/dialog/dlg_db_handler.c +++ b/modules/dialog/dlg_db_handler.c @@ -867,43 +867,31 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell * cell) int update_dialog_dbinfo(struct dlg_cell * cell) { - struct dlg_entry entry; /* lock the entry */ - entry = (d_table->entries)[cell->h_entry]; - dlg_lock( d_table, &entry); + dlg_lock(d_table, &d_table->entries[cell->h_entry]); if (update_dialog_dbinfo_unsafe(cell) != 0) { - dlg_unlock( d_table, &entry); + dlg_unlock(d_table, &d_table->entries[cell->h_entry]); return -1; } - dlg_unlock( d_table, &entry); + dlg_unlock(d_table, &d_table->entries[cell->h_entry]); return 0; } void dialog_update_db(unsigned int ticks, void * param) { - int index; - struct dlg_entry entry; - struct dlg_cell * cell; + int i; + struct dlg_cell *cell; LM_DBG("saving current_info \n"); - - for(index = 0; index< d_table->size; index++){ - /* lock the whole entry */ - entry = (d_table->entries)[index]; - dlg_lock( d_table, &entry); - - for(cell = entry.first; cell != NULL; cell = cell->next){ - if (update_dialog_dbinfo_unsafe(cell) != 0) { - dlg_unlock( d_table, &entry); - goto error; - } - } - dlg_unlock( d_table, &entry); + for(i = 0; i < d_table->size; i++){ + /* lock the slot */ + dlg_lock(d_table, &d_table->entries[i]); + for(cell = d_table->entries[i].first; cell != NULL; cell = cell->next){ + /* if update fails for one dlg, still do it for the next ones */ + update_dialog_dbinfo_unsafe(cell); + } + dlg_unlock(d_table, &d_table->entries[i]); } - return; - -error: - dlg_unlock( d_table, &entry); }

1 0

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015