diff --git a/.travis.yml b/.travis.yml index db32db6b..f59c8684 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,17 +7,31 @@ os: - linux - osx +sudo: true + +env: + global: + # COVERITY_SCAN_TOKEN + - secure: "j58a3zOmHbWvKOfBaR2WJAU0Lz95M0u3Ji9NUn0Gj+v91z/vd0COF8dR6QO03V9fDms44ghBiUOblgfb8z/GFOaagn2FoHUrSka/Sju+gIFejgeSqwyxL3CjcX69M1f/npiePQDDtD5mb4dZTDZ4Nl3BpTqg+Qtar9/S/7LoheecWdd6kFDDMr+0yx3/nibwbC0+tpXftiB62tgaGwABQBvfQbgBXUxJ+0zaKXORiKmhwnEC15Bub0WmBhmZxahzlDMU2cEzxKVQbYrcf0TqZpbPhN7H42d3ssQJ3ogbqJmptZpoRdv9de6G0Hzq5QDLjkQxd+3z4hxRqOPzICoawkljQ6CF/JOSlqRXTP0/272MBHzgancQpQhO5yfB3eV4OFldQAdtIKHV04jQ9uSPYOi48To//HGOG8GOp6jFMrpKs6T6P8UiB+GTe57GjBdQI5uqZiEBMdc5MNaqDDoskdr+jTsnGJg6uY9ARrap3WFFEWiaTbe/wbE7+o0isb79PmgBzFLpcwpBFgfyQUiDb+e8S2d3ugKeIVlsSlrF7ZTXC40Y+qVwGzvf/RSM3+c9N/ikFmrLdzn0rBrwna4t3vPrBoU1seoCAZu5hwAU0+xNCN4P9M1s4tOnrG7Lq5URqkP0n9gTXvI8rQ7dDJibjP+5RoZUOd1XPkHbyN4Kseg=" + matrix: allow_failures: - os: osx script: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make ; make test ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake . ; make ; make test ; fi + - ./travis-configure.sh + - if [[ "$COVERITY_SCAN_BRANCH" != 1 ]]; then make ; make test ; fi before_install: - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq ; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all uthash-dev uuid-dev libuuid1 xsltproc docbook-xsl ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install c-ares openssl libwebsockets ; fi + - ./travis-install.sh + +addons: + coverity_scan: + project: + name: "eclipse/mosquitto" + description: "Build submitted via Travis CI" + notification_email: roger@atchoo.org + build_command_prepend: ./travis-configure.sh + build_command: "make binary -j 4" + branch_pattern: coverity-.* diff --git a/Mosquitto.podspec b/Mosquitto.podspec new file mode 100644 index 00000000..4113cb0d --- /dev/null +++ b/Mosquitto.podspec @@ -0,0 +1,28 @@ +Pod::Spec.new do |s| + s.name = "Eclipse Mosquitto" + s.version = "1.4.8" + s.summary = "Eclipse Mosquitto is an open source implementation of a server for version 3.1 and 3.1.1 of the MQTT protocol." + s.description = "Eclipse Mosquitto is an open source implementation of a server for version 3.1 and 3.1.1 of the MQTT protocol." + s.homepage = "https://github.com/eclipse/mosquitto" + s.license = 'This project is dual licensed under the Eclipse Public License 1.0 and the Eclipse Distribution License 1.0 as described in the epl-v10 and edl-v10 files.' + s.author = { "Eclipse Foundation" => "emo@eclipse.org" } + s.source = { :git => "https://github.com/eclipse/mosquitto.git", :tag => "v1.4.8" } + + s.ios.deployment_target = '6.0' + s.xcconfig = { 'HEADER_SEARCH_PATHS' => '${PODS_ROOT}/**', + 'CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES' => 'YES', + 'GCC_PREPROCESSOR_DEFINITIONS' => 'WITH_THREADING=1' + } + s.source_files = ['lib/*.{c,h}', '*.h'] + + s.subspec 'WithoutTLS' do |sp| + sp.source_files = ['lib/*.{c,h}', '*.h'] + end + + s.subspec 'TLS' do |sp| + sp.xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'WITH_TLS=1' } + sp.source_files = ['lib/*.{c,h}', '*.h'] + sp.dependency 'OpenSSL-Universal', '~> 1.0.1.19' + end + +end diff --git a/appveyor.yml b/appveyor.yml index 590ad265..65683db2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ os: Visual Studio 2013 environment: CMAKE_ARGS: -DCMAKE_BUILD_TYPE=Release NSIS_ROOT: C:\nsis - SSL_VER: 1_0_2e + SSL_VER: 1_0_2h configuration: - Release diff --git a/logo/mosquitto-14x14.png b/logo/legacy/mosquitto-14x14.png similarity index 100% rename from logo/mosquitto-14x14.png rename to logo/legacy/mosquitto-14x14.png diff --git a/logo/mosquitto-16x16.png b/logo/legacy/mosquitto-16x16.png similarity index 100% rename from logo/mosquitto-16x16.png rename to logo/legacy/mosquitto-16x16.png diff --git a/logo/mosquitto.svg b/logo/legacy/mosquitto.svg similarity index 100% rename from logo/mosquitto.svg rename to logo/legacy/mosquitto.svg diff --git a/logo/mosquitto-logo-only.svg b/logo/mosquitto-logo-only.svg new file mode 100644 index 00000000..90304382 --- /dev/null +++ b/logo/mosquitto-logo-only.svg @@ -0,0 +1,58 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/logo/mosquitto-text-below.svg b/logo/mosquitto-text-below.svg new file mode 100644 index 00000000..ef8c3fc6 --- /dev/null +++ b/logo/mosquitto-text-below.svg @@ -0,0 +1,66 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/logo/mosquitto-text-side.svg b/logo/mosquitto-text-side.svg new file mode 100644 index 00000000..7f50724c --- /dev/null +++ b/logo/mosquitto-text-side.svg @@ -0,0 +1,66 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/logo/mosquitto.ico b/logo/mosquitto.ico new file mode 100644 index 00000000..88c91589 Binary files /dev/null and b/logo/mosquitto.ico differ diff --git a/readme.md b/readme.md index 20e20d0d..34874fe9 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,5 @@ -Mosquitto -========= +Eclipse Mosquitto +================= Mosquitto is an open source implementation of a server for version 3.1 and 3.1.1 of the MQTT protocol. @@ -12,10 +12,13 @@ See the following links for more information on MQTT: Mosquitto project information is available at the following locations: - Main homepage: -- Find existing bugs: -- Submit a bug: -- Source code repository: +- Find existing bugs or submit a new bug: +- Source code repository: There is also a public test server available at Mosquitto was written by Roger Light + +Master: [![Travis Build Status (master)](https://travis-ci.org/eclipse/mosquitto.svg?branch=master)](https://travis-ci.org/eclipse/mosquitto) +Develop: [![Travis Build Status (develop)](https://travis-ci.org/eclipse/mosquitto.svg?branch=develop)](https://travis-ci.org/eclipse/mosquitto) +Fixes: [![Travis Build Status (fixes)](https://travis-ci.org/eclipse/mosquitto.svg?branch=fixes)](https://travis-ci.org/eclipse/mosquitto) diff --git a/src/conf.c b/src/conf.c index aade7fcb..587e970b 100644 --- a/src/conf.c +++ b/src/conf.c @@ -224,6 +224,7 @@ void mqtt3_config_cleanup(struct mqtt3_config *config) if(config->persistence_file) _mosquitto_free(config->persistence_file); if(config->persistence_filepath) _mosquitto_free(config->persistence_filepath); if(config->psk_file) _mosquitto_free(config->psk_file); + if(config->pid_file) _mosquitto_free(config->pid_file); if(config->listeners){ for(i=0; ilistener_count; i++){ if(config->listeners[i].host) _mosquitto_free(config->listeners[i].host); diff --git a/src/read_handle_server.c b/src/read_handle_server.c index d7122193..93d0d024 100644 --- a/src/read_handle_server.c +++ b/src/read_handle_server.c @@ -550,6 +550,9 @@ int mqtt3_handle_connect(struct mosquitto_db *db, struct mosquitto *context) msg_tail = msg_prev->next; }else{ context->msgs = context->msgs->next; + if(context->last_msg == msg_tail){ + context->last_msg = NULL; + } _mosquitto_free(msg_tail); msg_tail = context->msgs; }