sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
365 discussions

git:master:9f402acf: Added new modules
by Victor Seva 04 Feb '17

04 Feb '17

Module: kamailio Branch: master Commit: 9f402acf191780897427598d2e232d11c5360c3c URL: https://github.com/kamailio/kamailio/commit/9f402acf191780897427598d2e232d1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-04T10:55:15+01:00 Added new modules --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/9f402acf191780897427598d2e232d1… Patch: https://github.com/kamailio/kamailio/commit/9f402acf191780897427598d2e232d1… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index feee1ec..27b86a4 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -584,6 +584,7 @@ fi %dir %{_docdir}/kamailio/modules %doc %{_docdir}/kamailio/modules/README.acc %doc %{_docdir}/kamailio/modules/README.alias_db +%doc %{_docdir}/kamailio/modules/README.app_jsdt %doc %{_docdir}/kamailio/modules/README.async %doc %{_docdir}/kamailio/modules/README.auth %doc %{_docdir}/kamailio/modules/README.auth_db @@ -616,6 +617,7 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -641,6 +643,7 @@ fi %doc %{_docdir}/kamailio/modules/README.print %doc %{_docdir}/kamailio/modules/README.print_lib %doc %{_docdir}/kamailio/modules/README.pv +%doc %{_docdir}/kamailio/modules/README.pua_rpc %doc %{_docdir}/kamailio/modules/README.qos %doc %{_docdir}/kamailio/modules/README.ratelimit %doc %{_docdir}/kamailio/modules/README.registrar @@ -660,6 +663,7 @@ fi %doc %{_docdir}/kamailio/modules/README.sms %doc %{_docdir}/kamailio/modules/README.speeddial %doc %{_docdir}/kamailio/modules/README.sqlops +%doc %{_docdir}/kamailio/modules/README.ss7ops %doc %{_docdir}/kamailio/modules/README.sst %doc %{_docdir}/kamailio/modules/README.statistics %doc %{_docdir}/kamailio/modules/README.stun @@ -714,6 +718,7 @@ fi %dir %{_libdir}/kamailio/modules %{_libdir}/kamailio/modules/acc.so %{_libdir}/kamailio/modules/alias_db.so +%{_libdir}/kamailio/modules/app_jsdt.so %{_libdir}/kamailio/modules/async.so %{_libdir}/kamailio/modules/auth.so %{_libdir}/kamailio/modules/auth_db.so @@ -746,6 +751,7 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -770,6 +776,7 @@ fi %{_libdir}/kamailio/modules/prefix_route.so %{_libdir}/kamailio/modules/print.so %{_libdir}/kamailio/modules/print_lib.so +%{_libdir}/kamailio/modules/pua_rpc.so %{_libdir}/kamailio/modules/pv.so %{_libdir}/kamailio/modules/qos.so %{_libdir}/kamailio/modules/ratelimit.so @@ -790,6 +797,7 @@ fi %{_libdir}/kamailio/modules/sms.so %{_libdir}/kamailio/modules/speeddial.so %{_libdir}/kamailio/modules/sqlops.so +%{_libdir}/kamailio/modules/ss7ops.so %{_libdir}/kamailio/modules/sst.so %{_libdir}/kamailio/modules/statistics.so %{_libdir}/kamailio/modules/stun.so

1 0

git:master:cae5518c: Renamed modules
by Victor Seva 04 Feb '17

04 Feb '17

Module: kamailio Branch: master Commit: cae5518c1872a053a77bc028516f21bb97585a0f URL: https://github.com/kamailio/kamailio/commit/cae5518c1872a053a77bc028516f21b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-04T10:55:15+01:00 Renamed modules --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cae5518c1872a053a77bc028516f21b… Patch: https://github.com/kamailio/kamailio/commit/cae5518c1872a053a77bc028516f21b… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 95dfd7d..feee1ec 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -519,7 +519,7 @@ make make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ jabber ndb_cassandra osp" \ group_include="kstandard kautheph kberkeley kcarrierroute kcnxcc kcpl \ - kdnssec kgeoip kgzcompress kims kjson kldap klua kmemcached \ + kdnssec kgeoip kgzcompress kims kjson kjsonrpcs kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp" @@ -535,7 +535,7 @@ make install make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ iptrtpproxy jabber osp" \ group_include="kstandard kautheph kberkeley kcarrierroute kcnxcc kcpl \ - kdnssec kgeoip kgzcompress kims kjson kldap klua kmemcached \ + kdnssec kgeoip kgzcompress kims kjson kjsonrpcs kldap klua kmemcached \ kmi_xmlrpc kmysql koutbound kperl kpostgres kpresence kpython \ kradius kredis ksctp ksnmpstats ksqlite ktls kunixodbc kutils \ kwebsocket kxml kxmpp" @@ -684,7 +684,7 @@ fi %doc %{_docdir}/kamailio/modules/README.xhttp_rpc %doc %{_docdir}/kamailio/modules/README.xlog %doc %{_docdir}/kamailio/modules/README.xprint -%doc %{_docdir}/kamailio/modules/README.jsonrpc-s +%doc %{_docdir}/kamailio/modules/README.jsonrpcs %doc %{_docdir}/kamailio/modules/README.nosip %doc %{_docdir}/kamailio/modules/README.tsilo @@ -814,7 +814,7 @@ fi %{_libdir}/kamailio/modules/xhttp_rpc.so %{_libdir}/kamailio/modules/xlog.so %{_libdir}/kamailio/modules/xprint.so -%{_libdir}/kamailio/modules/jsonrpc-s.so +%{_libdir}/kamailio/modules/jsonrpcs.so %{_libdir}/kamailio/modules/nosip.so %{_libdir}/kamailio/modules/tsilo.so @@ -828,7 +828,7 @@ fi %{_libdir}/kamailio/kamctl/kamctl.base %{_libdir}/kamailio/kamctl/kamctl.ctlbase %{_libdir}/kamailio/kamctl/kamctl.dbtext -%{_libdir}/kamailio/kamctl/kamctl.fifo +%{_libdir}/kamailio/kamctl/kamctl.rpcfifo %{_libdir}/kamailio/kamctl/kamctl.ser %{_libdir}/kamailio/kamctl/kamctl.sqlbase %{_libdir}/kamailio/kamctl/kamdbctl.base @@ -884,8 +884,8 @@ fi %files cpl %defattr(-,root,root) -%{_docdir}/kamailio/modules/README.cpl-c -%{_libdir}/kamailio/modules/cpl-c.so +%{_docdir}/kamailio/modules/README.cplc +%{_libdir}/kamailio/modules/cplc.so %files dialplan @@ -967,9 +967,9 @@ fi %files json %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.json -%doc %{_docdir}/kamailio/modules/README.jsonrpc-c +%doc %{_docdir}/kamailio/modules/README.jsonrpcc %{_libdir}/kamailio/modules/json.so -%{_libdir}/kamailio/modules/jsonrpc-c.so +%{_libdir}/kamailio/modules/jsonrpcc.so %files lcr

1 0

git:master:5368c797: Has been removed non existent modules
by Victor Seva 04 Feb '17

04 Feb '17

Module: kamailio Branch: master Commit: 5368c7973f72b184af9916098c27e82227a6b2d5 URL: https://github.com/kamailio/kamailio/commit/5368c7973f72b184af9916098c27e82… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-04T10:55:15+01:00 Has been removed non existent modules --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5368c7973f72b184af9916098c27e82… Patch: https://github.com/kamailio/kamailio/commit/5368c7973f72b184af9916098c27e82…

1 0

git:master:ee6bbb43: Removed epel-release dependency. Updated package version.
by Victor Seva 04 Feb '17

04 Feb '17

Module: kamailio Branch: master Commit: ee6bbb430148cd2d43542bee39e2c900d18412a4 URL: https://github.com/kamailio/kamailio/commit/ee6bbb430148cd2d43542bee39e2c90… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-04T10:55:15+01:00 Removed epel-release dependency. Updated package version. --- Modified: pkg/kamailio/centos/7/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ee6bbb430148cd2d43542bee39e2c90… Patch: https://github.com/kamailio/kamailio/commit/ee6bbb430148cd2d43542bee39e2c90… --- diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index c3563fb..49dd5af 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -79,8 +79,8 @@ Berkeley database connectivity for Kamailio. %package carrierroute Summary: The carrierroute module for Kamailio. Group: System Environment/Daemons -Requires: epel-release, libconfuse, kamailio = %ver -BuildRequires: epel-release, libconfuse-devel +Requires: libconfuse, kamailio = %ver +BuildRequires: libconfuse-devel %description carrierroute The carrierroute module for Kamailio. @@ -118,7 +118,7 @@ CPL (Call Processing Language) interpreter for Kamailio. %package crypto Summary: Module to support cryptographic extensions for use in the Kamailio configuration. Group: System Environment/Daemons -Requires: epel-release, libcrypto +Requires: libcrypto %description crypto This module provides various cryptography tools for use in Kamailio configuration file. It relies on OpenSSL libraries for cryptographic operations (libssl, libcrypto). @@ -146,8 +146,8 @@ User location (usrloc) records replication between multiple servers via DMQ modu %package dnssec Summary: DNSSEC support for Kamailio. Group: System Environment/Daemons -Requires: epel-release, dnssec-tools-libs, kamailio = %ver -BuildRequires: epel-release, dnssec-tools-libs-devel +Requires: dnssec-tools-libs, kamailio = %ver +BuildRequires: dnssec-tools-libs-devel %description dnssec DNSSEC support for Kamailio. @@ -156,8 +156,8 @@ DNSSEC support for Kamailio. %package geoip Summary: MaxMind GeoIP support for Kamailio. Group: System Environment/Daemons -Requires: epel-release, GeoIP, kamailio = %ver -BuildRequires: epel-release, GeoIP-devel +Requires: GeoIP, kamailio = %ver +BuildRequires: GeoIP-devel %description geoip MaxMind GeoIP support for Kamailio. @@ -176,7 +176,7 @@ Compressed body (SIP and HTTP) handling for kamailio. %package http_client Summary: HTTP client module for Kamailio. Group: System Environment/Daemons -Requires: epel-release, libcrypto +Requires: libcrypto %description http_client This module implements protocol functions that use the libcurl to communicate with HTTP servers. @@ -195,8 +195,8 @@ IMS modules and extensions module for Kamailio. %package json Summary: json string handling and RPC modules for Kamailio. Group: System Environment/Daemons -Requires: epel-release, json-c, libevent, kamailio = %ver -BuildRequires: epel-release, json-c-devel, libevent-devel +Requires: json-c, libevent, kamailio = %ver +BuildRequires: json-c-devel, libevent-devel %description json json string handling and RPC modules for Kamailio. @@ -326,8 +326,8 @@ Python extensions for Kamailio. %package radius Summary: RADIUS modules for Kamailio. Group: System Environment/Daemons -Requires: epel-release, radiusclient-ng, kamailio = %ver -BuildRequires: epel-release, radiusclient-ng-devel +Requires: radiusclient-ng, kamailio = %ver +BuildRequires: radiusclient-ng-devel %description radius RADIUS modules for Kamailio. @@ -336,8 +336,8 @@ RADIUS modules for Kamailio. %package redis Summary: Redis configuration file support for Kamailio. Group: System Environment/Daemons -Requires: epel-release, hiredis, kamailio = %ver -BuildRequires: epel-release, hiredis-devel +Requires: hiredis, kamailio = %ver +BuildRequires: hiredis-devel %description redis Redis configuration file support for Kamailio.

1 0

git:4.4:6c6f25b5: http_async_client: handle 100 Continue from server
by grumvalski 02 Feb '17

02 Feb '17

Module: kamailio Branch: 4.4 Commit: 6c6f25b581e083068e9b3832e8f0235a24a88021 URL: https://github.com/kamailio/kamailio/commit/6c6f25b581e083068e9b3832e8f0235… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-02-02T15:28:16+01:00 http_async_client: handle 100 Continue from server (cherry-picked from commit de1c5397847a3660182832a040d9e9c2e737e654) --- Modified: modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/6c6f25b581e083068e9b3832e8f0235… Patch: https://github.com/kamailio/kamailio/commit/6c6f25b581e083068e9b3832e8f0235… --- diff --git a/modules/http_async_client/async_http.c b/modules/http_async_client/async_http.c index 24dc8ba..4b6c33c 100644 --- a/modules/http_async_client/async_http.c +++ b/modules/http_async_client/async_http.c @@ -45,7 +45,7 @@ #include "../../dprint.h" #include "../../ut.h" #include "../../cfg/cfg_struct.h" -#include "../../lib/kcore/faked_msg.h" +#include "../../fmsg.h" #include "../../modules/tm/tm_load.h" #include "async_http.h" @@ -122,6 +122,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) unsigned int tlabel; struct cell *t = NULL; char *p; + str newbuf = {0, 0}; sip_msg_t *fmsg; if (reply->result != NULL) { @@ -140,7 +141,6 @@ void async_http_cb(struct http_m_reply *reply, void *param) ah_error.len = strlen(ah_error.s); } else { /* success */ - /* check for HTTP Via header * - HTTP Via format is different that SIP Via * - workaround: replace with Hia to be ignored by SIP parser @@ -158,7 +158,28 @@ void async_http_cb(struct http_m_reply *reply, void *param) if (parse_msg(reply->result->s, reply->result->len, ah_reply) != 0) { LM_DBG("failed to parse the http_reply\n"); } else { - LM_DBG("successfully parsed http reply %p\n", ah_reply); + if (ah_reply->first_line.u.reply.statuscode == 100) { + newbuf.s = get_body( ah_reply ); + newbuf.len = reply->result->s + reply->result->len - newbuf.s; + + if (!(newbuf.len < 0)) { + memset(ah_reply, 0, sizeof(struct sip_msg)); + ah_reply->buf = newbuf.s; + ah_reply->len = newbuf.len; + + if (parse_msg(ah_reply->buf, ah_reply->len, ah_reply) != 0) { + LM_DBG("failed to parse the http_reply\n"); + } else { + LM_DBG("successfully parsed http reply %p\n", ah_reply); + } + } else { + /* this should not happen! */ + LM_WARN("something got wrong parsing the 100 Continue: got %d len\n", newbuf.len); + } + + } else { + LM_DBG("successfully parsed http reply %p\n", ah_reply); + } } }

1 0

git:master:de1c5397: http_async_client: handle 100 Continue from server
by grumvalski 02 Feb '17

02 Feb '17

Module: kamailio Branch: master Commit: de1c5397847a3660182832a040d9e9c2e737e654 URL: https://github.com/kamailio/kamailio/commit/de1c5397847a3660182832a040d9e9c… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-02-02T15:03:39+01:00 http_async_client: handle 100 Continue from server --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/de1c5397847a3660182832a040d9e9c… Patch: https://github.com/kamailio/kamailio/commit/de1c5397847a3660182832a040d9e9c… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 57d203a..5c1d249 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -124,6 +124,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) unsigned int tlabel; struct cell *t = NULL; char *p; + str newbuf = {0, 0}; sip_msg_t *fmsg; if (reply->result != NULL) { @@ -142,7 +143,6 @@ void async_http_cb(struct http_m_reply *reply, void *param) ah_error.len = strlen(ah_error.s); } else { /* success */ - /* check for HTTP Via header * - HTTP Via format is different that SIP Via * - workaround: replace with Hia to be ignored by SIP parser @@ -160,7 +160,28 @@ void async_http_cb(struct http_m_reply *reply, void *param) if (parse_msg(reply->result->s, reply->result->len, ah_reply) != 0) { LM_DBG("failed to parse the http_reply\n"); } else { - LM_DBG("successfully parsed http reply %p\n", ah_reply); + if (ah_reply->first_line.u.reply.statuscode == 100) { + newbuf.s = get_body( ah_reply ); + newbuf.len = reply->result->s + reply->result->len - newbuf.s; + + if (!(newbuf.len < 0)) { + memset(ah_reply, 0, sizeof(struct sip_msg)); + ah_reply->buf = newbuf.s; + ah_reply->len = newbuf.len; + + if (parse_msg(ah_reply->buf, ah_reply->len, ah_reply) != 0) { + LM_DBG("failed to parse the http_reply\n"); + } else { + LM_DBG("successfully parsed http reply %p\n", ah_reply); + } + } else { + /* this should not happen! */ + LM_WARN("something got wrong parsing the 100 Continue: got %d len\n", newbuf.len); + } + + } else { + LM_DBG("successfully parsed http reply %p\n", ah_reply); + } } }

1 0

git:master:6d157a4a: presence: remove transaction creation from publ_notify_notifier() and mark_presentity_for_delete()
by Victor Seva 02 Feb '17

02 Feb '17

Module: kamailio Branch: master Commit: 6d157a4af708108b90a338614869de0ceeb94b68 URL: https://github.com/kamailio/kamailio/commit/6d157a4af708108b90a338614869de0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-02T12:43:53+01:00 presence: remove transaction creation from publ_notify_notifier() and mark_presentity_for_delete() * publ_notify_notifier() and mark_presentity_for_delete() are called inside a already created transaction * adding transaction handle for msg_presentity_clean() fix #960 --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/6d157a4af708108b90a338614869de0… Patch: https://github.com/kamailio/kamailio/commit/6d157a4af708108b90a338614869de0… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index caf5a3d..e5cd1cd 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1363,15 +1363,6 @@ int publ_notify_notifier(str pres_uri, pres_ev_t *event) result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col; - if (pa_dbf.start_transaction) - { - if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) - { - LM_ERR("in start_transaction\n"); - goto error; - } - } - if(query_fn(pa_db, query_cols, 0, query_vals, result_cols, n_query_cols, n_result_cols, 0, &result )< 0) { @@ -1400,26 +1391,11 @@ int publ_notify_notifier(str pres_uri, pres_ev_t *event) set_updated(&subs); } - if (pa_dbf.end_transaction) - { - if (pa_dbf.end_transaction(pa_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } - ret = RES_ROW_N(result); error: if (result) pa_dbf.free_result(pa_db, result); - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return ret; } diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 87d1ac7..9755c4f 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1568,15 +1568,6 @@ int mark_presentity_for_delete(presentity_t *pres) result_cols[0] = &str_body_col; - if (pa_dbf.start_transaction) - { - if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) - { - LM_ERR("in start_transaction\n"); - goto error; - } - } - if (query_fn(pa_db, query_cols, 0, query_vals, result_cols, n_query_cols, 1, 0, &result) < 0) { @@ -1657,15 +1648,6 @@ int mark_presentity_for_delete(presentity_t *pres) goto error; } - if (pa_dbf.end_transaction) - { - if (pa_dbf.end_transaction(pa_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } - if (pa_dbf.affected_rows) ret = pa_dbf.affected_rows(pa_db); else @@ -1677,12 +1659,6 @@ int mark_presentity_for_delete(presentity_t *pres) if (cur_body) pkg_free(cur_body); if (result) pa_dbf.free_result(pa_db, result); - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return ret; } diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index b2186cd..65e5154 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -164,9 +164,22 @@ void msg_presentity_clean(unsigned int ticks,void *param) } else if (pres_notifier_processes > 0) { + if (pa_dbf.start_transaction) + { + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } if ((num_watchers = publ_notify_notifier(uri, pres.event)) < 0) { LM_ERR("Updating watcher records\n"); + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + LM_ERR("in abort_transaction\n"); + } goto error; } @@ -175,6 +188,11 @@ void msg_presentity_clean(unsigned int ticks,void *param) if (mark_presentity_for_delete(&pres) < 0) { LM_ERR("Marking presentity\n"); + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + LM_ERR("in abort_transaction\n"); + } goto error; } } @@ -186,6 +204,14 @@ void msg_presentity_clean(unsigned int ticks,void *param) goto error; } } + if (pa_dbf.end_transaction) + { + if (pa_dbf.end_transaction(pa_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } } else {

1 0

[kamailio/kamailio] presence: error "transaction already started" when updating watcher records on db-only mode (#960)
by Victor Seva 02 Feb '17

02 Feb '17

We do have this ``presence`` module parameters: ``` modparam("presence", "subs_db_mode", 3) modparam("presence", "publ_cache", 0) modparam("presence", "db_table_lock_type", 0) modparam("presence", "notifier_processes", 3) modparam("presence", "send_fast_notify", 0) ``` And we are getting this errors several times per second ``` proxy[9056]: ERROR: db_mysql [km_dbase.c:602]: db_mysql_start_transaction(): transaction already started proxy[9056]: ERROR: presence [notify.c:1365]: publ_notify_notifier(): in start_transaction proxy[9056]: ERROR: presence [presentity.c:1132]: update_presentity(): updating watcher records proxy[9056]: ERROR: presence [publish.c:462]: handle_publish(): when updating presentity ``` This logs are from kamailio 4.4.4 but I think the problem is in master too. I do see that publ_notify_notifier() has a call to start_transaction() https://github.com/kamailio/kamailio/blob/master/src/modules/presence/notif… but we are already inside a transaction either at https://github.com/kamailio/kamailio/blob/master/src/modules/presence/prese… or https://github.com/kamailio/kamailio/blob/master/src/modules/presence/prese… -- 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/issues/960

1 2

[kamailio/kamailio] presence: remove transaction creation from publ_notify_notifier() and mark_presentity_for_delete() (#961)
by Victor Seva 02 Feb '17

02 Feb '17

* publ_notify_notifier() and mark_presentity_for_delete() are called inside a already created transaction * adding transaction handle for msg_presentity_clean() You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/961 -- Commit Summary -- * presence: remove transaction creation from publ_notify_notifier() and mark_presentity_for_delete() -- File Changes -- M src/modules/presence/notify.c (24) M src/modules/presence/presentity.c (24) M src/modules/presence/publish.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/961.patch https://github.com/kamailio/kamailio/pull/961.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/961

2 2

git:master:83cf4371: core: tsend - updated log macros
by Daniel-Constantin Mierla 02 Feb '17

02 Feb '17

Module: kamailio Branch: master Commit: 83cf43715bf3727b8b618f8239b896ecd83e859a URL: https://github.com/kamailio/kamailio/commit/83cf43715bf3727b8b618f8239b896e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-02-02T11:14:19+01:00 core: tsend - updated log macros --- Modified: src/core/tsend.c Modified: src/core/tsend.h --- Diff: https://github.com/kamailio/kamailio/commit/83cf43715bf3727b8b618f8239b896e… Patch: https://github.com/kamailio/kamailio/commit/83cf43715bf3727b8b618f8239b896e… --- diff --git a/src/core/tsend.c b/src/core/tsend.c index f6f39f4..97463fc 100644 --- a/src/core/tsend.c +++ b/src/core/tsend.c @@ -55,45 +55,45 @@ poll_loop: \ else{ \ diff=expire-get_ticks_raw(); \ if (diff<=0){ \ - LOG(L_ERR, "ERROR: " f_name ": send timeout (%d)\n", timeout);\ + LM_ERR(" - " f_name ": send timeout (%d)\n", timeout);\ goto error; \ } \ n=poll(&pf, 1, TICKS_TO_MS((ticks_t)diff)); \ } \ if (n<0){ \ if (errno==EINTR) continue; /* signal, ignore */ \ - LOG(L_ERR, "ERROR: " f_name ": poll failed: %s [%d]\n", \ + LM_ERR(" - " f_name ": poll failed: %s [%d]\n", \ strerror(errno), errno); \ goto error; \ }else if (n==0){ \ /* timeout */ \ - LOG(L_ERR, "ERROR: " f_name ": send timeout (p %d)\n", timeout); \ + LM_ERR(" - " f_name ": send timeout (p %d)\n", timeout); \ goto error; \ } \ if (pf.revents&POLLOUT){ \ /* we can write again */ \ goto again; \ }else if (pf.revents&(POLLERR|POLLHUP|POLLNVAL)){ \ - LOG(L_ERR, "ERROR: " f_name ": bad poll flags %x\n", \ + LM_ERR(" - " f_name ": bad poll flags %x\n", \ pf.revents); \ goto error; \ } \ /* if POLLIN or POLLPRI or other non-harmful events happened, \ * continue ( although poll should never signal them since we're \ * not interested in them => we should never reach this point) */ \ - } + } #define TSEND_ERR_CHECK(f_name)\ if (n<0){ \ if (errno==EINTR) goto again; \ else if (errno!=EAGAIN && errno!=EWOULDBLOCK){ \ - LOG(L_ERR, "ERROR: " f_name ": failed to send: (%d) %s\n", \ + LM_ERR(" - " f_name ": failed to send: (%d) %s\n", \ errno, strerror(errno)); \ goto error; \ }else goto poll_loop; \ } - + /* sends on fd (which must be O_NONBLOCK if you want a finite timeout); if it @@ -108,7 +108,7 @@ int tsend_stream(int fd, const char* buf, unsigned int len, int timeout) { int written; TSEND_INIT; - + written=0; again: n=send(fd, buf, len, @@ -119,13 +119,13 @@ int tsend_stream(int fd, const char* buf, unsigned int len, int timeout) #endif ); TSEND_ERR_CHECK("tsend_stream"); - written+=n; - if (n<(int)len){ - /* partial write */ - buf+=n; - len-=n; - }else{ - /* successful full write */ + written+=n; + if (n<(int)len){ + /* partial write */ + buf+=n; + len-=n; + }else{ + /* successful full write */ return written; } TSEND_POLL("tsend_stream"); @@ -141,14 +141,14 @@ int tsend_stream(int fd, const char* buf, unsigned int len, int timeout) * (if less than len => couldn't send all) * bugs: signals will reset the timer */ -int tsend_dgram(int fd, const char* buf, unsigned int len, +int tsend_dgram(int fd, const char* buf, unsigned int len, const struct sockaddr* to, socklen_t tolen, int timeout) { TSEND_INIT; again: n=sendto(fd, buf, len, 0, to, tolen); TSEND_ERR_CHECK("tsend_dgram"); - /* we don't care about partial writes: they shouldn't happen on + /* we don't care about partial writes: they shouldn't happen on * a datagram socket */ return n; TSEND_POLL("tsend_datagram"); @@ -156,8 +156,8 @@ int tsend_dgram(int fd, const char* buf, unsigned int len, return -1; } - -/* sends on connected datagram fd (which must be O_NONBLOCK); + +/* sends on connected datagram fd (which must be O_NONBLOCK); * if it cannot send any data in timeout milliseconds it will return ERROR * returns: -1 on error, or number of bytes written * (if less than len => couldn't send all) diff --git a/src/core/tsend.h b/src/core/tsend.h index 346340d..bc85ba1 100644 --- a/src/core/tsend.h +++ b/src/core/tsend.h @@ -23,7 +23,7 @@ int tsend_stream(int fd, const char* buf, unsigned int len, int timeout); -int tsend_dgram(int fd, const char* buf, unsigned int len, +int tsend_dgram(int fd, const char* buf, unsigned int len, const struct sockaddr* to, socklen_t tolen, int timeout); int tsend_dgram_ev(int fd, const struct iovec* v, int count, int timeout);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017