sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

Segfault in tm module
by Richard Fuchs 24 Oct '13

24 Oct '13

Hi, cancel_branch (t_cancel.c) contains a segfault in lines 284-288 when cfg_get(tm, tm_cfg, reparse_invite) is true but t->uas.request is NULL. My suggested fix is below but I'm not 100% sure if this is really correct. cheers

2 1

git:master: htable: ht_dmq_handle_msg() - do not call parse_headers on cloned message
by Charles Chance 24 Oct '13

24 Oct '13

Module: sip-router Branch: master Commit: 9ca1648fbf167748bcf9155794f703632ca87503 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9ca1648… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Oct 24 16:36:01 2013 +0100 htable: ht_dmq_handle_msg() - do not call parse_headers on cloned message --- modules/htable/ht_dmq.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/modules/htable/ht_dmq.c b/modules/htable/ht_dmq.c index d3ef053..c2cf7a5 100644 --- a/modules/htable/ht_dmq.c +++ b/modules/htable/ht_dmq.c @@ -101,11 +101,6 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp) /* received dmq message */ LM_DBG("dmq message received\n"); - /* parse the message headers */ - if(parse_headers(msg, HDR_EOH_F, 0) < 0) { - LM_ERR("error parsing message headers\n"); - goto error; - } if(!msg->content_length) { LM_ERR("no content length header found\n");

1 0

git:master: memcached: revert earlier doc change regarding minimum library version ( we now have backward compatibility built in)
by Charles Chance 24 Oct '13

24 Oct '13

Module: sip-router Branch: master Commit: 2c990487a780bce2ee2fe64e155ec3f1bc1bdebf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c99048… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Oct 24 16:15:10 2013 +0100 memcached: revert earlier doc change regarding minimum library version (we now have backward compatibility built in) --- modules/memcached/README | 2 +- modules/memcached/doc/memcached_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/memcached/README b/modules/memcached/README index 75e5a43..37e1d06 100644 --- a/modules/memcached/README +++ b/modules/memcached/README @@ -169,7 +169,7 @@ xlog("stored value is $mct(test)"); # will return <null> The following libraries or applications must be installed before running Kamailio with this module loaded: - * the libmemcached library (version 0.38 or higher). + * the libmemcached library. * the memcached server implementation. 4. Parameters diff --git a/modules/memcached/doc/memcached_admin.xml b/modules/memcached/doc/memcached_admin.xml index c52c444..29f17e9 100644 --- a/modules/memcached/doc/memcached_admin.xml +++ b/modules/memcached/doc/memcached_admin.xml @@ -132,7 +132,7 @@ xlog("stored value is $mct(test)"); # will return <null> <itemizedlist> <listitem> <para> - <emphasis>the <ulink url="http://libmemcached.org/">libmemcached</ulink> library (version 0.38 or higher)</emphasis>. + <emphasis>the <ulink url="http://libmemcached.org/">libmemcached</ulink> library</emphasis>. </para> </listitem> <listitem>

1 0

What version of memcached/libmemcached is needed for the memcached module in master?
by Peter Dunkley 24 Oct '13

24 Oct '13

Hello, The memcached module cannot be built for "stock" Enterprise Linux 6 because the versions of libmemcached/memcached that come with EL6 are the wrong ones. Does anyone know what the right versions are, and is it worth updating the module documentation to specify them? That way if someone using RedHat or CentOS wants to use the memcached module at least they know what version to download and build. Regards, Peter -- Peter Dunkley Technical Director Crocodile RCS Ltd

4 10

git:master: ims_charging: fixed deadlock when interim CCA timeout occurs
by Carlos Ruiz Diaz 24 Oct '13

24 Oct '13

Module: sip-router Branch: master Commit: fc4f2216f867b00a6685abdf51b8165572f24f69 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc4f221… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Thu Oct 24 11:05:17 2013 -0300 ims_charging: fixed deadlock when interim CCA timeout occurs --- modules/ims_charging/dialog.c | 2 + modules/ims_charging/ims_ro.c | 12 +++++++- modules/ims_charging/ro_session_hash.h | 4 +- modules/ims_charging/ro_timer.c | 47 ++++++++++++++++++++----------- 4 files changed, 45 insertions(+), 20 deletions(-) diff --git a/modules/ims_charging/dialog.c b/modules/ims_charging/dialog.c index 3e0861e..1b2453b 100644 --- a/modules/ims_charging/dialog.c +++ b/modules/ims_charging/dialog.c @@ -39,7 +39,9 @@ void dlg_reply(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { LM_ERR("Ro Session object is NULL...... aborting\n"); return; } + ro_session_entry = &(ro_session_table->entries[session->h_entry]); + ro_session_lock(ro_session_table, ro_session_entry); if (session->active) { diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 724c463..72a6fe5 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -642,6 +642,16 @@ error: cdpb.AAASessionsUnlock(auth->hash); cdpb.AAADropCCAccSession(auth); } + + shm_free(i_req); + // + // since callback function will be never called because of the error, we need to release the lock on the session + // to it can be reused later. + // + struct ro_session_entry *ro_session_entry = &(ro_session_table->entries[ro_session->h_entry]); + unref_ro_session_unsafe(ro_session, 1, ro_session_entry);//unref from the initial timer that fired this event. + ro_session_unlock(ro_session_table, ro_session_entry); + return; } @@ -1029,7 +1039,7 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, if (is_timeout) { update_stat(ccr_timeouts, 1); LM_ERR("Transaction timeout - did not get CCA\n"); - error_code = RO_RETURN_ERROR; + error_code = RO_RETURN_ERROR; goto error0; } diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h index d57ef28..105bd37 100644 --- a/modules/ims_charging/ro_session_hash.h +++ b/modules/ims_charging/ro_session_hash.h @@ -78,7 +78,7 @@ extern struct ro_session_table *ro_session_table; * \param _entry locked entry */ #define ro_session_lock(_table, _entry) \ - lock_set_get( (_table)->locks, (_entry)->lock_idx); + { LM_DBG("LOCKING %d", (_entry)->lock_idx); lock_set_get( (_table)->locks, (_entry)->lock_idx); LM_DBG("LOCKED %d", (_entry)->lock_idx);} /*! @@ -87,7 +87,7 @@ extern struct ro_session_table *ro_session_table; * \param _entry locked entry */ #define ro_session_unlock(_table, _entry) \ - lock_set_release( (_table)->locks, (_entry)->lock_idx); + { LM_DBG("UNLOCKING %d", (_entry)->lock_idx); lock_set_release( (_table)->locks, (_entry)->lock_idx); LM_DBG("UNLOCKED %d", (_entry)->lock_idx); } /*! * \brief Reference an ro_session without locking diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index 1340c3b..797b696 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -256,19 +256,22 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req) { time_t now = time(0); time_t used_secs; struct ro_session_entry *ro_session_entry = NULL; + int call_terminated = 0; if (!i_req) { LM_ERR("This is so wrong: i_req is NULL\n"); return; } + ro_session_entry = &(ro_session_table->entries[i_req->ro_session->h_entry]); + LM_DBG("credit=%d credit_valid_for=%d", i_req->new_credit, i_req->credit_valid_for); used_secs = now - i_req->ro_session->last_event_timestamp; /* check to make sure diameter server is giving us sane values */ if (i_req->new_credit > i_req->credit_valid_for) { - LM_WARN("That's weird, Diameter server gave us credit with a lower validity period :D. Setting reserved time to validity perioud instead \n"); + LM_WARN("That's weird, Diameter server gave us credit with a lower validity period :D. Setting reserved time to validity period instead \n"); i_req->new_credit = i_req->credit_valid_for; } @@ -321,8 +324,21 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req) { i_req->ro_session->event_type = no_more_credit; int whatsleft = i_req->ro_session->reserved_secs - used_secs; if (whatsleft <= 0) { - LM_WARN("Immediately killing call due to no more credit\n"); + // TODO we need to handle this situation more precisely. + // in case CCR times out, we get a call shutdown but the error message assumes it was due to a lack of credit. + // + LM_WARN("Immediately killing call due to no more credit *OR* no CCA received (timeout) after reservation request\n"); + + // + // we need to unlock the session or else we might get a deadlock on dlg_terminated() dialog callback. + // Do not unref the session because it will be made inside the dlg_terminated() function. + // + + //unref_ro_session_unsafe(i_req->ro_session, 1, ro_session_entry); + ro_session_unlock(ro_session_table, ro_session_entry); + dlgb.lookup_terminate_dlg(i_req->ro_session->dlg_h_entry, i_req->ro_session->dlg_h_id, NULL ); + call_terminated = 1; } else { LM_DBG("No more credit for user - letting call run out of money in [%i] seconds", whatsleft); @@ -337,10 +353,13 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req) { } } - ro_session_entry = &(ro_session_table->entries[i_req->ro_session->h_entry]); - - unref_ro_session_unsafe(i_req->ro_session, 1, ro_session_entry);//unref from the initial timer that fired this event. - ro_session_unlock(ro_session_table, ro_session_entry); + // + // if call was forcefully terminated, the lock was released before dlgb.lookup_terminate_dlg() function call. + // + if (!call_terminated) { + unref_ro_session_unsafe(i_req->ro_session, 1, ro_session_entry);//unref from the initial timer that fired this event. + ro_session_unlock(ro_session_table, ro_session_entry); + } shm_free(i_req); LM_DBG("Exiting async ccr interim nicely"); @@ -350,26 +369,21 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req) { * If we cant we need to put a new timer to kill the call at the appropriate time */ void ro_session_ontimeout(struct ro_tl *tl) { - time_t now, used_secs, call_time; + time_t now, used_secs, call_time; LM_DBG("We have a fired timer [p=%p] and tl=[%i].\n", tl, tl->timeout); /* find the session id for this timer*/ struct ro_session_entry *ro_session_entry = NULL; - - struct ro_session* ro_session; - ro_session = ((struct ro_session*) ((char *) (tl) - - (unsigned long) (&((struct ro_session*) 0)->ro_tl))); + struct ro_session* ro_session = ((struct ro_session*) ((char *) (tl) - (unsigned long) (&((struct ro_session*) 0)->ro_tl))); if (!ro_session) { LM_ERR("Can't find a session. This is bad"); return; } -// LM_ALERT("LOCKING... "); ro_session_entry = &(ro_session_table->entries[ro_session->h_entry]); ro_session_lock(ro_session_table, ro_session_entry); -// LM_ALERT("LOCKED!"); LM_DBG("event-type=%d", ro_session->event_type); @@ -428,7 +442,6 @@ void ro_session_ontimeout(struct ro_tl *tl) { ref_ro_session_unsafe(ro_session, 1); } LM_ERR("Immediately killing call due to unknown error\n"); - dlgb.lookup_terminate_dlg(ro_session->dlg_h_entry, ro_session->dlg_h_id, NULL ); } break; @@ -439,15 +452,15 @@ void ro_session_ontimeout(struct ro_tl *tl) { LM_INFO("Call/session must be ended - no more funds.\n"); else if (ro_session->event_type == unknown_error) LM_ERR("last event caused an error. We will now tear down this session.\n"); - - dlgb.lookup_terminate_dlg(ro_session->dlg_h_entry, ro_session->dlg_h_id, NULL ); } + update_stat(killed_calls, 1); - unref_ro_session_unsafe(ro_session, 1, ro_session_entry); //unref from the initial timer that fired this event. + //unref_ro_session_unsafe(ro_session, 1, ro_session_entry); //unref from the initial timer that fired this event. ro_session_unlock(ro_session_table, ro_session_entry); + dlgb.lookup_terminate_dlg(ro_session->dlg_h_entry, ro_session->dlg_h_id, NULL); return; }

1 0

git:master: pkg/kamailio/centos: added memcached package to .spec
by Peter Dunkley 24 Oct '13

24 Oct '13

Module: sip-router Branch: master Commit: b0797b765af78f19d942a87ea978037027da57c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0797b7… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Oct 24 13:10:08 2013 +0100 pkg/kamailio/centos: added memcached package to .spec - Also: - updated README to remove memcached from list of unbuilt modules - moved auth_identity into the tls package - List of modules not built for CentOS is now: - app_java: should be buildable but Makefile needs work - app_mono: needs newer version of mono-devel than available in base or EPEL - db_cassandra: needs specific versions of thrift (thrift not in base or EPEL at all anyway) - db_oracle: requires non-free Oracle client SDK - iptrtpproxy: obsolete - jabber: obsolete - osp: requires OSP Toolkit which is not available in base or EPEL --- pkg/kamailio/centos/6/README | 43 +++++++++++--------- pkg/kamailio/centos/6/kamailio.spec | 74 ++++++++++++++++++---------------- 2 files changed, 62 insertions(+), 55 deletions(-) diff --git a/pkg/kamailio/centos/6/README b/pkg/kamailio/centos/6/README index 23d48ae..bd8d32c 100644 --- a/pkg/kamailio/centos/6/README +++ b/pkg/kamailio/centos/6/README @@ -1,26 +1,29 @@ The following modules are not included in CentOS 6 builds because they have -dependencies that cannot be met by the standard CentOS YUM repos, require -complex compilation steps, or are obsolete. +dependencies that cannot be met by the base or EPEL CentOS YUM repos or are +obsolete. -If you need any of these modules you will need to find (and possibly build) and -install the dependencies and then do a manual build of Kamailio. +Obsolete modules +---------------- +* iptrtpproxy use the rtpproxy-ng module with mediaproxy-ng instead +* jabber use the xmpp and pua_xmpp modules instead + +Modules with unmet dependencies +------------------------------- +Note: If you need any of these modules you will need to find (and possibly + build) and install the dependencies and then do a manual build of + Kamailio. Ordered by module name: -* app_java requires libgcj-4.7 (CentOS 6 contains libgcj-4.4.7) -* app_mono requires mono-devel-??? (EPEL contains - mono-devel 2.4.3.1) -* db_cassandra requires thrift 0.6.1 or 0.7.0 -* db_oracle requires instantclient-sdk-10.2.0.3 -* iptrtpproxy this module is obsolete -* jabber this module is obsolete -* memcached requires libmemcached > 0.38 (CentOS contains - libmemcached 0.31) -* osp requires the OSP Toolkit +* app_java requires libgcj-4.7 (base contains libgcj-4.4.7) +* app_mono requires mono-devel-??? or higher (EPEL contains + mono-devel 2.4.3.1) +* db_cassandra requires thrift 0.6.1 or 0.7.0 +* db_oracle requires instantclient-sdk-10.2.0.3 +* osp requires the OSP Toolkit Ordered by unmet dependency: -* instantclient-sdk-10.2.0.3 db_oracle -* libgcj-4.7 app_java -* libmemcached > 0.38 memcached -* mono-devel-??? app_mono -* OSP Toolkit osp -* thrift 0.6.1 or 0.7.0 db_cassandra +* instantclient-sdk-10.2.0.3 db_oracle +* libgcj-4.7 app_java +* mono-devel-??? or higher app_mono +* OSP Toolkit osp +* thrift 0.6.1 or 0.7.0 db_cassandra diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index cb8fa4f..6546f05 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,6 +1,6 @@ %define name kamailio %define ver 4.1.0 -%define rel pre1.1%{dist} +%define rel pre1.3%{dist} @@ -15,13 +15,13 @@ Source: http://kamailio.org/pub/kamailio/%{ver}/src/%{name}-%{ver}_src.tar.gz URL: http://kamailio.org/ Vendor: kamailio.org BuildRoot: %{_tmppath}/%{name}-%{ver}-buildroot -Conflicts: kamailio-auth-ephemeral < %ver, kamailio-auth-identity < %ver -Conflicts: kamailio-bdb < %ver, kamailio-carrierroute < %ver, -Conflicts: kamailio-cpl < %ver, kamailio-dialplan < %ver -Conflicts: kamailio-dnssec < %ver, kamailio-geoip < %ver -Conflicts: kamailio-gzcompress < %ver, kamailio-ims < %ver -Conflicts: kamailio-json < %ver, kamailio-lcr < %ver, kamailio-ldap < %ver -Conflicts: kamailio-lua < %ver, kamailio-mysql < %ver +Conflicts: kamailio-auth-ephemeral < %ver, kamailio-bdb < %ver +Conflicts: kamailio-carrierroute < %ver, kamailio-cpl < %ver +Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver +Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver +Conflicts: kamailio-ims < %ver, kamailio-json < %ver, kamailio-lcr < %ver +Conflicts: kamailio-ldap < %ver, kamailio-lua < %ver +Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-purple < %ver, kamailio-python < %ver @@ -57,16 +57,6 @@ BuildRequires: openssl-devel Functions for authentication using ephemeral credentials. -%package auth-identity -Summary: Functions for secure identification of originators of SIP messages for Kamailio. -Group: System Environment/Daemons -Requires: libcurl, openssl, kamailio = %ver -BuildRequires: libcurl-devel, openssl-devel - -%description auth-identity -Functions for secure identification of originators of SIP messages for Kamailio. - - %package bdb Summary: Berkeley database connectivity for Kamailio. Group: System Environment/Daemons @@ -187,6 +177,16 @@ BuildRequires: lua-devel Lua extensions for Kamailio. +%package memcached +Summary: memcached configuration file support for Kamailio. +Group: System Environment/Daemons +Requires: libmemcached, kamailio = %ver +BuildRequires: libmemcached-devel + +%description memcached +memcached configuration file support for Kamailio. + + %package mysql Summary: MySQL database connectivity for Kamailio. Group: System Environment/Daemons @@ -410,11 +410,11 @@ make cfg prefix=/usr cfg_prefix=$RPM_BUILD_ROOT basedir=$RPM_BUILD_ROOT \ cfg_target=/%{_sysconfdir}/kamailio/ modules_dirs="modules" make make every-module skip_modules="app_java app_mono db_cassandra \ - db_oracle iptrtpproxy jabber memcached osp" \ + db_oracle iptrtpproxy jabber osp" \ group_include="kstandard kautheph kberkeley kcarrierroute kcpl kdnssec \ - kgeoip kims kjson kldap klua kmi_xmlrpc kmysql koutbound kperl \ - kpostgres kpresence kpurple kpython kradius kredis ksctp ksnmpstats \ - ksqlite ktls kunixodbc kutils kwebsocket kxml kxmpp" + kgeoip kims kjson kldap klua kmemcached kmi_xmlrpc kmysql koutbound \ + kperl kpostgres kpresence kpurple kpython kradius kredis ksctp \ + ksnmpstats ksqlite ktls kunixodbc kutils kwebsocket kxml kxmpp" make utils @@ -424,11 +424,11 @@ make utils make install make install-modules-all skip_modules="app_java app_mono db_cassandra \ - db_oracle iptrtpproxy jabber memcached osp" \ + db_oracle iptrtpproxy jabber osp" \ group_include="kstandard kautheph kberkeley kcarrierroute kcpl kdnssec \ - kgeoip kims kjson kldap klua kmi_xmlrpc kmysql koutbound kperl \ - kpostgres kpresence kpurple kpython kradius kredis ksctp ksnmpstats \ - ksqlite ktls kunixodbc kutils kwebsocket kxml kxmpp" + kgeoip kims kjson kldap klua kmemcached kmi_xmlrpc kmysql koutbound \ + kperl kpostgres kpresence kpurple kpython kradius kredis ksctp \ + ksnmpstats ksqlite ktls kunixodbc kutils kwebsocket kxml kxmpp" mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d install -m755 pkg/kamailio/centos/%{?centos}/kamailio.init \ @@ -760,12 +760,6 @@ fi %{_libdir}/kamailio/modules/auth_ephemeral.so -%files auth-identity -%defattr(-,root,root) -%doc %{_docdir}/kamailio/modules/README.auth_identity -%{_libdir}/kamailio/modules/auth_identity.so - - %files bdb %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_berkeley @@ -873,6 +867,12 @@ fi %{_libdir}/kamailio/modules/app_lua.so +%files memcached +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.memcached +%{_libdir}/kamailio/modules/memcached.so + + %files mysql %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.db_mysql @@ -1031,7 +1031,9 @@ fi %files tls %defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.auth_identity %doc %{_docdir}/kamailio/modules/README.tls +%{_libdir}/kamailio/modules/auth_identity.so %{_libdir}/kamailio/modules/tls.so @@ -1092,15 +1094,17 @@ fi - rtpproxy-ng - sipt - stun (STUN functionality moved from compile time in core to own module) - - Added ims_charging module to ims package - - Added mi_xmlrpc to xmlrpc package + - Added new modules to other packages: + - ims_charging module to ims package - Added new packages for new modules: - auth_ephemeral - sctp (SCTP functionality moved from compile time in core to own module) - Moved existing modules to different packages: - - auth_identity to main package (previously not built for CentOS) + - auth_identity to tls package (previously not built for CentOS) - cdp and cdp_avp to ims package - dialog_ng to main package + - memcached to own package (previously not built for CentOS) + - mi_xmlrpc to own package (previously not built for CentOS) - tls to own package - Added packages for (new and existing) modules that require EPEL: - carrierroute in own package

3 2

git:master: memcached: added alternate memory management wrappers for backwards compatibility with older libmemcached versions and added preprocessor check for the correct ones to use based on installed version .
by Charles Chance 24 Oct '13

24 Oct '13

Module: sip-router Branch: master Commit: adfa299a1a01aba1c69c1129d78170056d50db42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adfa299… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Oct 24 12:14:38 2013 +0100 memcached: added alternate memory management wrappers for backwards compatibility with older libmemcached versions and added preprocessor check for the correct ones to use based on installed version. --- modules/memcached/memcached.c | 82 +++++++++++++++++++++++++++++++++++------ 1 files changed, 70 insertions(+), 12 deletions(-) diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c index 431cf4e..0815d63 100644 --- a/modules/memcached/memcached.c +++ b/modules/memcached/memcached.c @@ -106,7 +106,7 @@ struct module_exports exports = { /*! - * \brief Wrapper functions around our internal memory management for libmemcache callback + * \brief Wrapper functions around our internal memory management for libmemcached (version >= 0.38) callback * \param mem freed memory * \note pkg_free does not allow NULL pointer as standard free, therefore we check it here * \see pkg_free @@ -116,9 +116,20 @@ static inline void mcd_free(memcached_st *ptr, void *mem, void *context) { pkg_free(mem); } +/*! + * \brief Wrapper functions around our internal memory management for libmemcached (version < 0.38) callback + * \param mem freed memory + * \note pkg_free does not allow NULL pointer as standard free, therefore we check it here + * \see pkg_free + */ + static inline void mcd_free_compat(memcached_st *ptr, void *mem) { + if (mem) + pkg_free(mem); +} + /*! - * \brief Wrapper functions around our internal memory management for libmemcache callback + * \brief Wrapper functions around our internal memory management for libmemcached (version >= 0.38) callback * \param size allocated size * \return allocated memory, or NULL on failure * \see pkg_malloc @@ -127,9 +138,19 @@ static inline void* mcd_malloc(memcached_st *ptr, const size_t size, void *conte return pkg_malloc(size); } +/*! + * \brief Wrapper functions around our internal memory management for libmemcached (version < 0.38) callback + * \param size allocated size + * \return allocated memory, or NULL on failure + * \see pkg_malloc + */ + static inline void* mcd_malloc_compat(memcached_st *ptr, const size_t size) { + return pkg_malloc(size); +} + /*! - * \brief Wrapper functions around our internal memory management for libmemcache callback + * \brief Wrapper functions around our internal memory management for libmemcached (version >= 0.38) callback * \param mem pointer to allocated memory * \param size new size of memory area * \return allocated memory, or NULL on failure @@ -139,9 +160,20 @@ static inline void* mcd_realloc(memcached_st *ptr, void *mem, const size_t size, return pkg_realloc(mem, size); } +/*! + * \brief Wrapper functions around our internal memory management for libmemcached (version < 0.38) callback + * \param mem pointer to allocated memory + * \param size new size of memory area + * \return allocated memory, or NULL on failure + * \see pkg_realloc + */ +static inline void* mcd_realloc_compat(memcached_st *ptr, void *mem, const size_t size) { + return pkg_realloc(mem, size); +} + /*! - * \brief Wrapper functions around our internal memory management for libmemcache callback + * \brief Wrapper functions around our internal memory management for libmemcached (version >= 0.38) callback * \param mem pointer to allocated memory * \param size new size of memory area * \return allocated memory, or NULL on failure @@ -157,6 +189,24 @@ static inline void * mcd_calloc(memcached_st *ptr, size_t nelem, const size_t el return tmp; } +/*! + * \brief Wrapper functions around our internal memory management for libmemcached (version < 0.38) callback + * \param mem pointer to allocated memory + * \param size new size of memory area + * \return allocated memory, or NULL on failure + * \see pkg_malloc + * \todo this is not optimal, use internal calloc implemention which is not exported yet + */ +static inline void * mcd_calloc_compat(memcached_st *ptr, size_t nelem, const size_t elsize) { + void* tmp = NULL; + tmp = pkg_malloc(nelem * elsize); + if (tmp != NULL) { + memset(tmp, 0, nelem * elsize); + } + return tmp; +} + + /** * \brief Callback to check if we could connect successfully to a server * \param ptr memcached handler @@ -206,25 +256,33 @@ static int mod_init(void) { } LM_DBG("allocated new server handle at %p", memcached_h); - if (mcd_memory == 1) { - LM_INFO("Use internal kamailio memory manager for memcached client library"); - rc = memcached_set_memory_allocators(memcached_h, (memcached_malloc_fn)mcd_malloc, - (memcached_free_fn)mcd_free, (memcached_realloc_fn)mcd_realloc, - (memcached_calloc_fn)mcd_calloc, NULL); + if (mcd_memory == 1) { + LM_INFO("Use internal kamailio memory manager for memcached client library\n"); + +#if LIBMEMCACHED_VERSION_HEX >= 0x00038000 + rc = memcached_set_memory_allocators(memcached_h, (memcached_malloc_fn)mcd_malloc, + (memcached_free_fn)mcd_free, (memcached_realloc_fn)mcd_realloc, + (memcached_calloc_fn)mcd_calloc, NULL); +#else + rc = memcached_set_memory_allocators(memcached_h, (memcached_malloc_function)mcd_malloc_compat, + (memcached_free_function)mcd_free_compat, (memcached_realloc_function)mcd_realloc_compat, + (memcached_calloc_function)mcd_calloc_compat); +#endif + if (rc == MEMCACHED_SUCCESS) { - LM_DBG("memory manager callbacks set"); + LM_DBG("memory manager callbacks set\n"); } else { LM_ERR("memory manager callbacks not set, returned %s.\n", memcached_strerror(memcached_h, rc)); return -1; } } else { - LM_INFO("Use system memory manager for memcached client library"); + LM_INFO("Use system memory manager for memcached client library\n"); } servers = memcached_server_list_append(servers, server, atoi(port), &rc); if (memcached_behavior_set(memcached_h, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, mcd_timeout) != MEMCACHED_SUCCESS) { - LM_ERR("could not set server connection timeout"); + LM_ERR("could not set server connection timeout\n"); return -1; } rc = memcached_server_push(memcached_h, servers);

2 1

Presence Proxy
by Jan Gaida 24 Oct '13

24 Oct '13

Hello I'd like to explain my scenario and the module I'd like to develop. I am hoping for comments whether there are already modules like that or which modules' API I could use to make the development easier. Scenario: I have two domains (A and B) with a Kamailio server in each of them configured as presence servers. The agents from both domains want to subscribe to few resources from domain A. Idea: In order to reduce traffic between the domains, the presence server from domain B shall handle the subscriptions internally and use an internal virtual presence-user-agent to subscribe to the resources in domain A. SIP Messages: Subscription: 1) Subscribe resource.domain.a, from each user agent ua_n.domain.b 2) 202 OK from kamailio.domain.b 3) If not already subscribed, Subscribe resource.domain.a from kamailio.domain.b with virtual user-agent 4) 202 OK from kamailio.domain.a (Repeat for each susbcriber) (Subscription has to be refreshed by an internal timer) Events: 1) Publish resouce.domain.a to kamailio.domain.a 2) 200 OK from kamailio.domain.a 3) Notify resource.domain.a to kamailio.domain.b 4) 200 OK from kamailio.domain.b 5) Notify resource.domain.a to each user agent ua_n.domain.b 6) 200 OK from each ua_n.domain.b (Internally, Kamailio of domain B has to forward the incoming Notify to all locally subscribed user-agents) I tried using the PUA module but it does not fit all my needs. Now I think I will have to develop my own module in order to achieve everything. Any ideas? Kind regards -- *Jan **Gaida* Ingeniero Desarrollo Software C/ Marconi 3 (PTM) 28760 Tres Cantos Spain jan.gaida(a)grupoamper.com | www.grupoamper.com -- This message and any attachments are intended only for the use of the individual to whom they are addressed and it may contain information that is privileged or confidential. If you have received this communication by mistake, please notify us immediately by e-mail or telephone.The storage, recording, use or disclosure of this e-mail and its attachments by anyone other than the intended recipient is strictly prohibited. This message has been verified using antivirus software; however, the sender is not responsible for any damage to hardware or software resulting from the presence of any virus. Este mensaje y cualquier anexo son exclusivamente para la persona a quien van dirigidos y pueden contener información privilegiada o confidencial. Si usted ha recibido esta comunicación por error, le agradecemos notificarlo de inmediato por esta misma vía o por teléfono. Está prohibida su retención, grabación, utilización o divulgación con cualquier propósito. Este mensaje ha sido verificado con software antivirus; sin embargo, el remitente no se hace responsable en caso de que en éste o en los archivos adjuntos haya presencia de algún virus que pueda generar daños en los equipos o programas del destinatario.

2 4

git:master: tm: use internal flags field to mark suspended replies with FL_RPL_SUSPENDED
by Daniel-Constantin Mierla 24 Oct '13

24 Oct '13

Module: sip-router Branch: master Commit: a067a3d33ad67c260a3bc377cd4203d41880ca6b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a067a3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 24 07:44:03 2013 +0200 tm: use internal flags field to mark suspended replies with FL_RPL_SUSPENDED - it was set on cfg flags, resulting in messing up with what was used in config file - reported by Juha Heinanen --- modules/tm/t_reply.c | 2 +- modules/tm/t_suspend.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8703750..cac9ab4 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2520,7 +2520,7 @@ int reply_received( struct sip_msg *p_msg ) } #endif - if (unlikely(p_msg->flags&FL_RPL_SUSPENDED)) { + if (unlikely(p_msg->msg_flags&FL_RPL_SUSPENDED)) { goto skip_send_reply; /* suspend the reply (async), no error */ } diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 9509afc..f2cacbc 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -107,7 +107,7 @@ int t_suspend(struct sip_msg *msg, } }else{ LOG(L_DBG,"DEBUG: t_suspend_reply: This is a suspend on reply - setting msg flag to SUSPEND\n"); - msg->flags |= FL_RPL_SUSPENDED; + msg->msg_flags |= FL_RPL_SUSPENDED; /* this is a reply suspend find which branch */ if (t_check( msg , &branch )==-1){ @@ -280,8 +280,8 @@ int t_continue(unsigned int hash_index, unsigned int label, /* this is a continue from a reply suspend */ LOG(L_DBG,"DEBUG: t_continue_reply: Disabling suspend branch"); - t->uac[branch].reply->flags &= ~FL_RPL_SUSPENDED; - if (t->uas.request) t->uas.request->flags&= ~FL_RPL_SUSPENDED; + t->uac[branch].reply->msg_flags &= ~FL_RPL_SUSPENDED; + if (t->uas.request) t->uas.request->msg_flags&= ~FL_RPL_SUSPENDED; LOG(L_DBG,"DEBUG: t_continue_reply: Setting up faked environment"); if (!fake_resp(&faked_resp, t->uac[branch].reply, 0 /* extra flags */, 0)) { @@ -482,8 +482,8 @@ int t_cancel_suspend(unsigned int hash_index, unsigned int label) LOG(L_DBG,"DEBUG: t_cancel_suspend_reply: This is a cancel suspend for a response\n"); - t->uac[branch].reply->flags &= ~FL_RPL_SUSPENDED; - if (t->uas.request) t->uas.request->flags&= ~FL_RPL_SUSPENDED; + t->uac[branch].reply->msg_flags &= ~FL_RPL_SUSPENDED; + if (t->uas.request) t->uas.request->msg_flags&= ~FL_RPL_SUSPENDED; } return 0;

1 0

CentOS packaging and document for 4.1.0 - please help
by Peter Dunkley 23 Oct '13

23 Oct '13

Hello, I have been updating my .spec for CentOS 6 recently. I am trying to get as many modules as possible into the build without needing exotic dependencies. There is one packages that I can't include into CentOS at all (and it would have helped me if the documentation had been updated). There are two packages I think I can include (if people can help with a little work). This is all summarised at the end of the email. I'd appreciate any help people can give me. Regards, Peter *Modules I can't include - but need more documentation* - *app_mono*: simply won't compile with against the version of mono-devel in EPEL for CentOS 6. EPEL contains mono-devel 2.4.3.1 (which is presumably too old). The module documentation for app_mono doesn't specify a minimum version - it would be helpful if it did. *Modules I could include - but need a little work* - *app_java*: this compiles with small Makefile changes (as I discussed recently on-list). It'd be great if some Makefile guru could help-out and adjust this so that it can compile cleanly (and through an automated process) without needing to edit/patch the Makefile for each target system. - *memcached*: as discussed on-list between Henning and Charles, this should be relatively straight-forward to get working with a library version check. *Modules I can't/won't include* - *db_cassandra*: requires specific versions of thrift (and thrift is not available in the base or EPEL repos for CentOS 6 anyway) - *db_oracle*: requires the non-free instantclient-sdk - *osp*: requires the OSP Toolkit (not available in the base or EPEL repos for CentOS 6) - *jabber*: this module is obsolete - *iptrtpproxy*: I believe this module should be obsolete (and it certainly can't work with the standard kernel version in CentOS 6 anyway) -- Peter Dunkley Technical Director Crocodile RCS Ltd

2 3

← Newer
1
...
4
5
6
7
8
9
10
...
26
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 2013