FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

bugfix: 70_Jabber: Fixed broken callback registration in Net::XMPP >= 1.04

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9139 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
bios01 2015-08-27 11:24:59 +00:00
parent 15d1122af1
commit c637b00210
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 70_Jabber: Fixed broken callback registration in Net::XMPP >= 1.04
- bugfix: 95_Dashboard: support for alias attribute, which if set, is shown - bugfix: 95_Dashboard: support for alias attribute, which if set, is shown
instead of the device name in the left navigation instead of the device name in the left navigation
- feature: 70_Pushover: Rewrite for Non-Blocking HttpUtils - feature: 70_Pushover: Rewrite for Non-Blocking HttpUtils

7
fhem/FHEM/70_Jabber.pm
View File

@ -22,9 +22,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with fhem. If not, see <http://www.gnu.org/licenses/>. # along with fhem. If not, see <http://www.gnu.org/licenses/>.
# #
# Version: 1.1 - 2014-07-28 # Version: 1.4 - 2015-08-27
# #
# Changelog: # Changelog:
# v1.4 2015-08-27 Fixed broken callback registration in Net::XMPP >= 1.04
# v1.3 2015-01-10 Fixed DNS SRV resolving and resulting wrong to: address # v1.3 2015-01-10 Fixed DNS SRV resolving and resulting wrong to: address
# v1.2 2015-01-09 hardening XML::Stream Process() call and fix of ssl_verify # v1.2 2015-01-09 hardening XML::Stream Process() call and fix of ssl_verify
# v1.1 2014-07-28 Added UTF8 encoding / decoding to Messages # v1.1 2014-07-28 Added UTF8 encoding / decoding to Messages
@ -351,6 +352,10 @@ sub Jabber_CheckConnection($)
#Default to to SRV lookups, ugly hack because older versions of XMPP::Connection dont call the respective value in XML::Stream.. #Default to to SRV lookups, ugly hack because older versions of XMPP::Connection dont call the respective value in XML::Stream..
$hash->{JabberDevice}->{STREAM}->{SIDS}->{default}->{srv} = "_xmpp-client._tcp"; $hash->{JabberDevice}->{STREAM}->{SIDS}->{default}->{srv} = "_xmpp-client._tcp";
#fix for weak callbacks, since Net::XMPP v.1.05 they "weaken" the reference to prevent *possible* memory problems,
#but that causes the callbacks to not work anymore, so we unweaken it here by initializing the callbacks again :)
$hash->{JabberDevice}->InitCallbacks();
#Needed for Message handling: #Needed for Message handling:
$hash->{JabberDevice}->SetMessageCallBacks(normal => sub { \&Jabber_INC_Message($hash,@_) }, chat => sub { \&Jabber_INC_Message($hash,@_) } ); $hash->{JabberDevice}->SetMessageCallBacks(normal => sub { \&Jabber_INC_Message($hash,@_) }, chat => sub { \&Jabber_INC_Message($hash,@_) } );
#Needed if someone wants to subscribe to us and is on the WhiteList #Needed if someone wants to subscribe to us and is on the WhiteList