diff -Nru mosquitto-1.4.3/ChangeLog.txt mosquitto-1.4.4/ChangeLog.txt --- mosquitto-1.4.3/ChangeLog.txt 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/ChangeLog.txt 2015-09-16 21:54:44.000000000 +0000 @@ -1,3 +1,14 @@ +1.4.4 - 20150916 +================ + +Broker: +- Don't leak sockets when outgoing bridge with multiple addresses cannot + connect. Closes #477571. +- Fix cross compiling of websockets. Closes #475807. +- Fix memory free related crashes on openwrt. Closes #475707. +- Fix excessive calls to message retry check. + + 1.4.3 - 20150818 ================ @@ -22,6 +33,7 @@ Clients: - Report error string on connection failure rather than error code. + 1.4.2 - 20150507 ================ diff -Nru mosquitto-1.4.3/CMakeLists.txt mosquitto-1.4.4/CMakeLists.txt --- mosquitto-1.4.3/CMakeLists.txt 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/CMakeLists.txt 2015-09-16 21:54:44.000000000 +0000 @@ -11,7 +11,7 @@ cmake_minimum_required(VERSION 2.8) # Only for version 3 and up. cmake_policy(SET CMP0042 NEW) -set (VERSION 1.4.3) +set (VERSION 1.4.4) if (WIN32) execute_process(COMMAND cmd /c echo %DATE% %TIME% OUTPUT_VARIABLE TIMESTAMP diff -Nru mosquitto-1.4.3/config.mk mosquitto-1.4.4/config.mk --- mosquitto-1.4.3/config.mk 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/config.mk 2015-09-16 21:54:44.000000000 +0000 @@ -83,7 +83,7 @@ # Also bump lib/mosquitto.h, CMakeLists.txt, # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi -VERSION=1.4.3 +VERSION=1.4.4 TIMESTAMP:=$(shell date "+%F %T%z") # Client library SO version. Bump if incompatible API/ABI changes are made. diff -Nru mosquitto-1.4.3/debian/changelog mosquitto-1.4.4/debian/changelog --- mosquitto-1.4.3/debian/changelog 2015-08-19 15:24:20.000000000 +0000 +++ mosquitto-1.4.4/debian/changelog 2015-10-02 09:25:00.000000000 +0000 @@ -1,3 +1,11 @@ +mosquitto (1.4.4-1) unstable; urgency=low + + * New upstream release. + * Fix Vcs link. + * Note that libs & clients also support MQTT v3.1.1. + + -- Roger A. Light Mon, 21 Sep 2015 09:56:28 +0100 + mosquitto (1.4.3-1) unstable; urgency=low * New upstream release. diff -Nru mosquitto-1.4.3/debian/control mosquitto-1.4.4/debian/control --- mosquitto-1.4.3/debian/control 2015-08-19 09:31:01.000000000 +0000 +++ mosquitto-1.4.4/debian/control 2015-10-02 09:24:38.000000000 +0000 @@ -2,16 +2,28 @@ Section: net Priority: optional Maintainer: Roger A. Light -Build-Depends: debhelper (>= 9), libc-ares-dev, libssl-dev (>=1.0.0), libwebsockets-dev (>=1.2), libwrap0-dev, python-all (>= 2.6.6-3~), uthash-dev, uuid-dev +Build-Depends: debhelper (>= 9), + libc-ares-dev, + libssl-dev (>=1.0.0), + libwebsockets-dev (>=1.2), + libwrap0-dev, + python-all (>= 2.6.6-3~), + uthash-dev, + uuid-dev Standards-Version: 3.9.6 Homepage: http://mosquitto.org/ -Vcs-Git: http://git.eclipse.org/r/mosquitto/org.eclipse.mosquitto +Vcs-Git: https://git.eclipse.org/r/mosquitto/org.eclipse.mosquitto Vcs-Browser: http://git.eclipse.org/c/mosquitto/org.eclipse.mosquitto.git Package: mosquitto Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser (>= 3.10), lsb-base (>=4.1+Debian3), libuuid1, apparmor +Depends: adduser (>= 3.10), + apparmor, + libuuid1, + lsb-base (>=4.1+Debian3), + ${misc:Depends}, + ${shlibs:Depends} Description: MQTT version 3.1/3.1.1 compatible message broker This is a message broker that supports version 3.1 and 3.1.1 of the MQTT protocol. @@ -26,21 +38,23 @@ Section: devel Architecture: all Multi-Arch: foreign -Depends: ${misc:Depends}, mosquitto (>= ${source:Version}), mosquitto (<< ${source:Version}.1~) +Depends: mosquitto (<< ${source:Version}.1~), + mosquitto (>= ${source:Version}), + ${misc:Depends} Description: Development files for Mosquitto Mosquitto is a message broker that supports the MQTT protocol. . This package contains the include files used if you wish to compile a package - which requires Mosquitto's source file headers. + which requires Mosquitto's source file headers. Package: libmosquitto1 Section: libs Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libc-ares2 -Description: MQTT version 3.1 client library - This is a C library for implementing MQTT version 3.1 clients. +Depends: libc-ares2, ${misc:Depends}, ${shlibs:Depends} +Description: MQTT version 3.1/3.1.1 client library + This is a C library for implementing MQTT version 3.1/3.1.1 clients. . MQTT provides a method of carrying out messaging using a publish/subscribe model. It is lightweight, both in terms of bandwidth usage and ease of @@ -52,12 +66,14 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, libmosquitto1 (>= ${source:Version}), libmosquitto1 (<< ${source:Version}.1~) +Depends: libmosquitto1 (<< ${source:Version}.1~), + libmosquitto1 (>= ${source:Version}), + ${misc:Depends} Replaces: libmosquitto0-dev (<< 1.2-1~) Breaks: libmosquitto0-dev (<< 1.2-1~) -Description: MQTT version 3.1 client library, development files +Description: MQTT version 3.1/3.1.1 client library, development files This is the header and man page for the libmosquitto1 C library, which is a - library for implementing MQTT version 3.1 clients. This package is needed to do + library for implementing MQTT version 3.1/3.1.1 clients. This package is needed to do development with libmosquitto1. Package: libmosquittopp1 @@ -65,9 +81,11 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libmosquitto1 (= ${binary:Version}) -Description: MQTT version 3.1 client C++ library - This is a C++ library for implementing MQTT version 3.1 clients. +Depends: libmosquitto1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} +Description: MQTT version 3.1/3.1.1 client C++ library + This is a C++ library for implementing MQTT version 3.1/3.1.1 clients. . MQTT provides a method of carrying out messaging using a publish/subscribe model. It is lightweight, both in terms of bandwidth usage and ease of @@ -79,7 +97,9 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: ${misc:Depends}, libmosquittopp1 (>= ${source:Version}), libmosquittopp1 (<< ${source:Version}.1~) +Depends: libmosquittopp1 (<< ${source:Version}.1~), + libmosquittopp1 (>= ${source:Version}), + ${misc:Depends} Replaces: libmosquittopp0-dev (<< 1.2-1~) Breaks: libmosquittopp0-dev (<< 1.2-1~) Description: MQTT version 3.1 client C++ library, development files @@ -90,11 +110,13 @@ Package: mosquitto-clients Architecture: any Multi-Arch: foreign -Depends: ${shlibs:Depends}, ${misc:Depends}, libmosquitto1 (= ${binary:Version}) +Depends: libmosquitto1 (= ${binary:Version}), + ${misc:Depends}, + ${shlibs:Depends} Description: Mosquitto command line MQTT clients - This is two MQTT version 3.1 command line clients. mosquitto_pub can be used - to publish messages to a broker and mosquitto_sub can be used to subscribe to - a topic to receive messages. + This is two MQTT version 3.1/3.1.1 command line clients. mosquitto_pub can be + used to publish messages to a broker and mosquitto_sub can be used to + subscribe to a topic to receive messages. . MQTT provides a method of carrying out messaging using a publish/subscribe model. It is lightweight, both in terms of bandwidth usage and ease of @@ -107,7 +129,8 @@ Multi-Arch: foreign Priority: extra Section: debug -Depends: ${misc:Depends}, mosquitto (= ${binary:Version}) | mosquitto-clients (= ${binary:Version}) +Depends: mosquitto (= ${binary:Version}) | mosquitto-clients (= ${binary:Version}), + ${misc:Depends} Description: debugging symbols for mosquitto binaries This package contains debugging files used to investigate problems with the binaries provided by the packages mosquitto, mosquitto-clients, @@ -118,7 +141,7 @@ Multi-Arch: same Priority: extra Section: debug -Depends: ${misc:Depends}, libmosquitto1 (= ${binary:Version}) +Depends: libmosquitto1 (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for libmosquitto binaries This package contains debugging files used to investigate problems with the binaries provided by the libmosquitto1 package. @@ -128,8 +151,7 @@ Multi-Arch: same Priority: extra Section: debug -Depends: ${misc:Depends}, libmosquittopp1 (= ${binary:Version}) +Depends: libmosquittopp1 (= ${binary:Version}), ${misc:Depends} Description: debugging symbols for libmosquittopp binaries This package contains debugging files used to investigate problems with the binaries provided by the libmosquittopp1 package. - diff -Nru mosquitto-1.4.3/debian/copyright mosquitto-1.4.4/debian/copyright --- mosquitto-1.4.3/debian/copyright 2015-08-19 15:23:23.000000000 +0000 +++ mosquitto-1.4.4/debian/copyright 2015-09-21 09:12:59.000000000 +0000 @@ -47,7 +47,7 @@ . Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this - software without specific prior written permission. + software without specific prior written permission. . THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED @@ -78,7 +78,7 @@ . i) changes to the Program, and . - ii) additions to the Program; + ii) additions to the Program; . where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a @@ -157,13 +157,13 @@ . iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on - or through a medium customarily used for software exchange. + or through a medium customarily used for software exchange. . When the Program is made available in source code form: . a) it must be made available under this Agreement; and . - b) a copy of this Agreement must be included with each copy of the Program. + b) a copy of this Agreement must be included with each copy of the Program. . Contributors may not remove or alter any copyright notices contained within the Program. @@ -275,4 +275,3 @@ Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - diff -Nru mosquitto-1.4.3/debian/libmosquitto-dev.install mosquitto-1.4.4/debian/libmosquitto-dev.install --- mosquitto-1.4.3/debian/libmosquitto-dev.install 2015-08-19 09:31:01.000000000 +0000 +++ mosquitto-1.4.4/debian/libmosquitto-dev.install 2015-09-21 09:12:59.000000000 +0000 @@ -1,3 +1,3 @@ -usr/share/man/man3/libmosquitto.3 usr/include/mosquitto.h usr/lib/*/libmosquitto.so +usr/share/man/man3/libmosquitto.3 diff -Nru mosquitto-1.4.3/debian/mosquitto.install mosquitto-1.4.4/debian/mosquitto.install --- mosquitto-1.4.3/debian/mosquitto.install 2015-08-19 09:31:00.000000000 +0000 +++ mosquitto-1.4.4/debian/mosquitto.install 2015-09-21 09:12:59.000000000 +0000 @@ -1,11 +1,11 @@ -usr/sbin/mosquitto -usr/bin/mosquitto_passwd -etc/mosquitto/mosquitto.conf -etc/mosquitto/conf.d/README etc/mosquitto/ca_certificates/README etc/mosquitto/certs/README -usr/share/man/man8/mosquitto.8 +etc/mosquitto/conf.d/README +etc/mosquitto/mosquitto.conf +usr/bin/mosquitto_passwd +usr/sbin/mosquitto usr/share/man/man1/mosquitto_passwd.1 usr/share/man/man5/mosquitto.conf.5 -usr/share/man/man7/mqtt.7 usr/share/man/man7/mosquitto-tls.7 +usr/share/man/man7/mqtt.7 +usr/share/man/man8/mosquitto.8 diff -Nru mosquitto-1.4.3/debian/patches/build-timestamp.patch mosquitto-1.4.4/debian/patches/build-timestamp.patch --- mosquitto-1.4.3/debian/patches/build-timestamp.patch 2015-08-19 09:32:24.000000000 +0000 +++ mosquitto-1.4.4/debian/patches/build-timestamp.patch 2015-09-21 08:57:21.000000000 +0000 @@ -6,7 +6,7 @@ @@ -84,7 +84,7 @@ # Also bump lib/mosquitto.h, CMakeLists.txt, # installer/mosquitto.nsi, installer/mosquitto-cygwin.nsi - VERSION=1.4.3 + VERSION=1.4.4 -TIMESTAMP:=$(shell date "+%F %T%z") +TIMESTAMP:=$(shell dpkg-parsechangelog -l../debian/changelog | grep Date | sed -e 's/Date: //') diff -Nru mosquitto-1.4.3/debian/rules mosquitto-1.4.4/debian/rules --- mosquitto-1.4.3/debian/rules 2015-08-19 09:31:01.000000000 +0000 +++ mosquitto-1.4.4/debian/rules 2015-09-21 09:22:13.000000000 +0000 @@ -12,7 +12,7 @@ dh_installchangelogs ChangeLog.txt override_dh_auto_configure: - # Don't process CMake rules. + # Don't process CMake rules, CMakeLists.txt is only included for Windows/Mac support. override_dh_auto_test: diff -Nru mosquitto-1.4.3/installer/mosquitto-cygwin.nsi mosquitto-1.4.4/installer/mosquitto-cygwin.nsi --- mosquitto-1.4.3/installer/mosquitto-cygwin.nsi 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/installer/mosquitto-cygwin.nsi 2015-09-16 21:54:44.000000000 +0000 @@ -7,7 +7,7 @@ !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' Name "mosquitto" -!define VERSION 1.4.3 +!define VERSION 1.4.4 OutFile "mosquitto-${VERSION}-install-cygwin.exe" InstallDir "$PROGRAMFILES\mosquitto" diff -Nru mosquitto-1.4.3/installer/mosquitto.nsi mosquitto-1.4.4/installer/mosquitto.nsi --- mosquitto-1.4.3/installer/mosquitto.nsi 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/installer/mosquitto.nsi 2015-09-16 21:54:44.000000000 +0000 @@ -9,7 +9,7 @@ !define env_hklm 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"' Name "mosquitto" -!define VERSION 1.4.3 +!define VERSION 1.4.4 OutFile "mosquitto-${VERSION}-install-win32.exe" InstallDir "$PROGRAMFILES\mosquitto" diff -Nru mosquitto-1.4.3/lib/memory_mosq.c mosquitto-1.4.4/lib/memory_mosq.c --- mosquitto-1.4.3/lib/memory_mosq.c 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/lib/memory_mosq.c 2015-09-16 21:54:44.000000000 +0000 @@ -54,6 +54,9 @@ void _mosquitto_free(void *mem) { #ifdef REAL_WITH_MEMORY_TRACKING + if(!mem){ + return; + } memcount -= malloc_usable_size(mem); #endif free(mem); diff -Nru mosquitto-1.4.3/lib/mosquitto.h mosquitto-1.4.4/lib/mosquitto.h --- mosquitto-1.4.3/lib/mosquitto.h 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/lib/mosquitto.h 2015-09-16 21:54:44.000000000 +0000 @@ -45,7 +45,7 @@ #define LIBMOSQUITTO_MAJOR 1 #define LIBMOSQUITTO_MINOR 4 -#define LIBMOSQUITTO_REVISION 3 +#define LIBMOSQUITTO_REVISION 4 /* LIBMOSQUITTO_VERSION_NUMBER looks like 1002001 for e.g. version 1.2.1. */ #define LIBMOSQUITTO_VERSION_NUMBER (LIBMOSQUITTO_MAJOR*1000000+LIBMOSQUITTO_MINOR*1000+LIBMOSQUITTO_REVISION) diff -Nru mosquitto-1.4.3/man/libmosquitto.3 mosquitto-1.4.4/man/libmosquitto.3 --- mosquitto-1.4.3/man/libmosquitto.3 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/libmosquitto.3 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: libmosquitto .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: Library calls .\" Source: Mosquitto Project .\" Language: English .\" -.TH "LIBMOSQUITTO" "3" "08/19/2015" "Mosquitto Project" "Library calls" +.TH "LIBMOSQUITTO" "3" "09/16/2015" "Mosquitto Project" "Library calls" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mosquitto.8 mosquitto-1.4.4/man/mosquitto.8 --- mosquitto-1.4.3/man/mosquitto.8 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mosquitto.8 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mosquitto .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: System management commands .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MOSQUITTO" "8" "08/19/2015" "Mosquitto Project" "System management commands" +.TH "MOSQUITTO" "8" "09/16/2015" "Mosquitto Project" "System management commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mosquitto.conf.5 mosquitto-1.4.4/man/mosquitto.conf.5 --- mosquitto-1.4.3/man/mosquitto.conf.5 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mosquitto.conf.5 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mosquitto.conf .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: File formats and conventions .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MOSQUITTO\&.CONF" "5" "08/19/2015" "Mosquitto Project" "File formats and conventions" +.TH "MOSQUITTO\&.CONF" "5" "09/16/2015" "Mosquitto Project" "File formats and conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mosquitto_passwd.1 mosquitto-1.4.4/man/mosquitto_passwd.1 --- mosquitto-1.4.3/man/mosquitto_passwd.1 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mosquitto_passwd.1 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mosquitto_passwd .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: Commands .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MOSQUITTO_PASSWD" "1" "08/19/2015" "Mosquitto Project" "Commands" +.TH "MOSQUITTO_PASSWD" "1" "09/16/2015" "Mosquitto Project" "Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mosquitto_pub.1 mosquitto-1.4.4/man/mosquitto_pub.1 --- mosquitto-1.4.3/man/mosquitto_pub.1 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mosquitto_pub.1 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mosquitto_pub .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: Commands .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MOSQUITTO_PUB" "1" "08/19/2015" "Mosquitto Project" "Commands" +.TH "MOSQUITTO_PUB" "1" "09/16/2015" "Mosquitto Project" "Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mosquitto_sub.1 mosquitto-1.4.4/man/mosquitto_sub.1 --- mosquitto-1.4.3/man/mosquitto_sub.1 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mosquitto_sub.1 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mosquitto_sub .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: Commands .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MOSQUITTO_SUB" "1" "08/19/2015" "Mosquitto Project" "Commands" +.TH "MOSQUITTO_SUB" "1" "09/16/2015" "Mosquitto Project" "Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mosquitto-tls.7 mosquitto-1.4.4/man/mosquitto-tls.7 --- mosquitto-1.4.3/man/mosquitto-tls.7 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mosquitto-tls.7 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mosquitto-tls .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: Conventions and miscellaneous .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MOSQUITTO\-TLS" "7" "08/19/2015" "Mosquitto Project" "Conventions and miscellaneous" +.TH "MOSQUITTO\-TLS" "7" "09/16/2015" "Mosquitto Project" "Conventions and miscellaneous" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/man/mqtt.7 mosquitto-1.4.4/man/mqtt.7 --- mosquitto-1.4.3/man/mqtt.7 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/man/mqtt.7 2015-09-16 21:54:44.000000000 +0000 @@ -2,12 +2,12 @@ .\" Title: mqtt .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 08/19/2015 +.\" Date: 09/16/2015 .\" Manual: Conventions and miscellaneous .\" Source: Mosquitto Project .\" Language: English .\" -.TH "MQTT" "7" "08/19/2015" "Mosquitto Project" "Conventions and miscellaneous" +.TH "MQTT" "7" "09/16/2015" "Mosquitto Project" "Conventions and miscellaneous" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -Nru mosquitto-1.4.3/src/loop.c mosquitto-1.4.4/src/loop.c --- mosquitto-1.4.3/src/loop.c 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/src/loop.c 2015-09-16 21:54:44.000000000 +0000 @@ -115,6 +115,7 @@ #endif int context_count; time_t expiration_check_time = 0; + time_t last_timeout_check = 0; char *id; #ifndef WIN32 @@ -178,7 +179,7 @@ && context->bridge->cur_address != 0 && now > context->bridge->primary_retry){ - if(_mosquitto_try_connect(context, context->bridge->addresses[0].address, context->bridge->addresses[0].port, &bridge_sock, NULL, false) == MOSQ_ERR_SUCCESS){ + if(_mosquitto_try_connect(context, context->bridge->addresses[0].address, context->bridge->addresses[0].port, &bridge_sock, NULL, false) <= 0){ COMPAT_CLOSE(bridge_sock); _mosquitto_socket_close(db, context); context->bridge->cur_address = context->bridge->address_count-1; @@ -307,7 +308,11 @@ expiration_check_time = time(NULL) + 3600; } - mqtt3_db_message_timeout_check(db, db->config->retry_interval); + if(last_timeout_check < mosquitto_time()){ + /* Only check at most once per second. */ + mqtt3_db_message_timeout_check(db, db->config->retry_interval); + last_timeout_check = mosquitto_time(); + } #ifndef WIN32 sigprocmask(SIG_SETMASK, &sigblock, &origsig); diff -Nru mosquitto-1.4.3/src/Makefile mosquitto-1.4.4/src/Makefile --- mosquitto-1.4.3/src/Makefile 2015-08-19 09:13:50.000000000 +0000 +++ mosquitto-1.4.4/src/Makefile 2015-09-16 21:54:44.000000000 +0000 @@ -90,7 +90,7 @@ ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ websockets.o : websockets.c mosquitto_broker.h - ${CC} $(BROKER_CFLAGS) -c $< -o $@ + ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@ will_mosq.o : ../lib/will_mosq.c ../lib/will_mosq.h ${CROSS_COMPILE}${CC} $(BROKER_CFLAGS) -c $< -o $@