From a1a190b4828b3678c2a75d7d55926e8c3351ccba Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Tue, 5 Oct 2021 15:20:37 +0100 Subject: [PATCH] Pointless whitespace tidy. --- ChangeLog.txt | 6 ++--- Makefile | 4 +--- THANKS.txt | 2 +- about.html | 24 +++++++++---------- apps/db_dump/db_dump.c | 6 ++--- apps/db_dump/db_dump.h | 4 ++-- apps/db_dump/print.c | 4 ++-- apps/mosquitto_ctrl/dynsec.c | 2 +- apps/mosquitto_ctrl/mosquitto_ctrl.c | 2 +- apps/mosquitto_passwd/get_password.c | 4 ++-- apps/mosquitto_passwd/get_password.h | 4 ++-- apps/mosquitto_passwd/mosquitto_passwd.c | 6 ++--- buildtest.py | 2 +- client/Makefile | 2 +- client/client_props.c | 5 ++-- client/client_shared.c | 6 ++--- client/client_shared.h | 4 ++-- client/pub_client.c | 4 ++-- client/pub_shared.c | 4 ++-- client/pub_shared.h | 4 ++-- client/rr_client.c | 4 ++-- client/sub_client.c | 4 ++-- client/sub_client_output.c | 8 +++---- client/sub_client_output.h | 4 ++-- doc/historical/old-regex.txt | 2 +- doc/joss-paper/paper.md | 2 +- docker/README.md | 2 +- edl-v10 | 2 +- epl-v20 | 6 ++--- examples/mysql_log/Makefile | 2 +- examples/subscribe_simple/Makefile | 2 +- examples/temperature_conversion/Makefile | 2 +- include/mosquitto_broker.h | 4 ++-- include/mosquitto_plugin.h | 6 ++--- lib/actions.c | 4 ++-- lib/alias_mosq.c | 5 ++-- lib/alias_mosq.h | 4 ++-- lib/callbacks.c | 4 ++-- lib/connect.c | 4 ++-- lib/cpp/mosquittopp.cpp | 4 ++-- lib/dummypthread.h | 4 ++-- lib/helpers.c | 4 ++-- lib/logging_mosq.c | 4 ++-- lib/logging_mosq.h | 4 ++-- lib/loop.c | 4 ++-- lib/memory_mosq.c | 4 ++-- lib/memory_mosq.h | 4 ++-- lib/messages_mosq.c | 4 ++-- lib/messages_mosq.h | 4 ++-- lib/misc_mosq.h | 4 ++-- lib/mosquitto.c | 4 ++-- lib/mosquitto_internal.h | 4 ++-- lib/net_mosq.c | 2 +- lib/net_mosq.h | 4 ++-- lib/options.c | 9 ++++--- lib/packet_mosq.h | 4 ++-- lib/property_mosq.c | 2 +- lib/property_mosq.h | 4 ++-- lib/read_handle.c | 4 ++-- lib/read_handle.h | 4 ++-- lib/send_mosq.c | 4 ++-- lib/send_mosq.h | 4 ++-- lib/srv_mosq.c | 6 ++--- lib/strings_mosq.c | 4 ++-- lib/thread_mosq.c | 6 ++--- lib/time_mosq.c | 4 ++-- lib/time_mosq.h | 4 ++-- lib/tls_mosq.c | 4 ++-- lib/tls_mosq.h | 4 ++-- lib/utf8_mosq.c | 6 ++--- lib/util_mosq.h | 4 ++-- lib/will_mosq.c | 4 ++-- lib/will_mosq.h | 4 ++-- man/Makefile | 2 +- man/mosquitto.8.xml | 2 +- man/mosquitto.conf.5.xml | 4 ++-- man/mosquitto_pub.1.xml | 4 ++-- man/mosquitto_rr.1.xml | 2 +- man/mosquitto_sub.1.xml | 4 ++-- misc/currentcost/cc128_read.pl | 4 ++-- .../gnome-panel/CurrentCostMQTT.server | 10 ++++---- plugins/auth-by-ip/mosquitto_auth_by_ip.c | 4 ++-- plugins/dynamic-security/clients.c | 2 +- .../mosquitto_message_timestamp.c | 4 ++-- .../mosquitto_payload_modification.c | 8 +++---- src/Makefile | 2 +- src/bridge.c | 6 ++--- src/bridge_topic.c | 4 ++-- src/conf_includedir.c | 4 ++-- src/context.c | 6 ++--- src/control.c | 4 ++-- src/database.c | 4 ++-- src/keepalive.c | 4 ++-- src/lib_load.h | 4 ++-- src/logging.c | 4 ++-- src/loop.c | 4 ++-- src/mosquitto.c | 4 ++-- src/mosquitto_broker_internal.h | 4 ++-- src/mux_poll.c | 4 ++-- src/net.c | 4 ++-- src/persist.h | 6 ++--- src/persist_read_v234.c | 10 ++++---- src/persist_read_v5.c | 8 +++---- src/persist_write.c | 10 ++++---- src/persist_write_v5.c | 4 ++-- src/plugin.c | 4 ++-- src/plugin_debug.c | 4 ++-- src/plugin_defer.c | 4 ++-- src/plugin_public.c | 6 ++--- src/property_broker.c | 4 ++-- src/read_handle.c | 4 ++-- src/security.c | 12 +++++----- src/security_default.c | 8 +++---- src/service.c | 6 ++--- src/session_expiry.c | 6 ++--- src/signals.c | 4 ++-- src/subs.c | 4 ++-- src/sys_tree.c | 12 +++++----- src/sys_tree.h | 4 ++-- src/will_delay.c | 6 ++--- test/Makefile | 2 +- .../02-subpub-qos1-message-expiry-will.py | 2 +- test/broker/02-subpub-qos1-message-expiry.py | 2 +- test/broker/02-subpub-qos2-1322.py | 6 ++--- .../02-subscribe-persistence-flipflop.py | 14 +++++------ .../03-publish-qos1-max-inflight-expire.py | 4 ++-- test/broker/06-bridge-b2br-disconnect-qos2.py | 2 +- .../06-bridge-fail-persist-resend-qos2.py | 2 +- test/broker/08-ssl-connect-no-identity.py | 2 +- test/broker/11-message-expiry.py | 2 +- .../12-prop-assigned-client-identifier.py | 2 +- test/broker/c/auth_plugin_msg_params.c | 2 +- test/broker/c/mosquitto_plugin_v2.h | 6 ++--- test/lib/Makefile | 6 ++--- test/lib/c/02-subscribe-qos1-async1.c | 2 +- test/lib/c/02-subscribe-qos1-async2.c | 2 +- test/old/msgsps_pub.c | 2 +- test/random/Makefile | 2 +- test/random/random_client.py | 2 +- test/ssl/gen.sh | 10 ++++---- test/ssl/openssl.cnf | 4 ++-- test/unit/Makefile | 2 +- test/unit/bridge_topic_test.c | 2 +- test/unit/persist_read_test.c | 2 +- test/unit/subs_test.c | 2 +- test/unit/test.c | 2 +- www/pages/documentation/dynamic-security.md | 4 ++-- .../08/updated-debian-repository-backend.md | 6 ++--- www/posts/2018/08/version-151-released.md | 6 ++--- www/posts/2018/09/version-152-released.md | 6 ++--- www/posts/2018/11/mqtt5-progress.md | 8 +++---- www/posts/2018/11/version-154-released.md | 6 ++--- www/posts/2018/12/version-155-released.md | 6 ++--- www/posts/2019/02/version-1-5-6-released.md | 2 +- www/posts/2019/04/version-1-6-released.md | 2 +- www/posts/2020/05/version-1-6-10-released.md | 2 +- .../2020/06/mosquitto-ubuntu-appliance.md | 2 +- .../06/test-mosquitto-org-cert-updated.md | 2 +- www/posts/2021/01/version-2-0-5-released.md | 2 +- 159 files changed, 342 insertions(+), 351 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ff71f4e0..95bd285c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -104,7 +104,7 @@ Broker: Closes #2207. - Improve QoS 0 outgoing packet queueing. - Fix non-reachable bridge blocking the broker on Windows. Closes #2172. -- Fix possible corruption of pollfd array on Windows when bridges were +- Fix possible corruption of pollfd array on Windows when bridges were reconnecting. Closes #2173. - Fix QoS 0 messages not being queued when `queue_qos0_messages` was enabled. Closes #2224. @@ -334,7 +334,7 @@ Client library: Build: - `install` Makefile target should depend on `all`, not `mosquitto`, to ensure that man pages are always built. Closes #1989. -- Fixes for lots of minor build warnings highlighted by Visual Studio. +- Fixes for lots of minor build warnings highlighted by Visual Studio. Apps: - Disallow control characters in mosquitto_passwd usernames. @@ -695,7 +695,7 @@ Broker: native version. Closes #1684. - Fix possible assert crash associated with bridge reconnecting when compiled without epoll support. Closes #1700. - + Client library: - Don't treat an unexpected PUBACK, PUBREL, or PUBCOMP as a fatal error. Issue #1629. diff --git a/Makefile b/Makefile index 3b206b36..f3164a1e 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ clean : set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} clean; done $(MAKE) -C test clean -reallyclean : +reallyclean : set -e; for d in ${DIRS}; do $(MAKE) -C $${d} reallyclean; done set -e; for d in ${DOCDIRS}; do $(MAKE) -C $${d} reallyclean; done $(MAKE) -C test reallyclean @@ -107,7 +107,6 @@ uninstall : dist : reallyclean set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done - mkdir -p dist/mosquitto-${VERSION} cp -r ${DISTFILES} dist/mosquitto-${VERSION}/ cd dist; tar -zcf mosquitto-${VERSION}.tar.gz mosquitto-${VERSION}/ @@ -125,7 +124,6 @@ coverage : localdocker : reallyclean set -e; for d in ${DISTDIRS}; do $(MAKE) -C $${d} dist; done - rm -rf dockertmp/ mkdir -p dockertmp/mosquitto-${VERSION} cp -r ${DISTFILES} dockertmp/mosquitto-${VERSION}/ diff --git a/THANKS.txt b/THANKS.txt index 28431898..fbe0c94a 100644 --- a/THANKS.txt +++ b/THANKS.txt @@ -29,7 +29,7 @@ Dariusz Suchojad Darren Oliver David Huang David Monro -Dirk O. Kaar +Dirk O. Kaar Dominik Obermaier Dominik Zajac Ed Morris diff --git a/about.html b/about.html index 45ea3922..dbcdfffd 100644 --- a/about.html +++ b/about.html @@ -5,30 +5,30 @@

About This Content

- -

May 8, 2014

+ +

May 8, 2014

License

-

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise +

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the Eclipse Public License Version 2.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL"). -A copy of the EPL is available at https://www.eclipse.org/legal/epl-2.0/ -and a copy of the EDL is available at -http://www.eclipse.org/org/documents/edl-v10.php. +A copy of the EPL is available at https://www.eclipse.org/legal/epl-2.0/ +and a copy of the EDL is available at +http://www.eclipse.org/org/documents/edl-v10.php. For purposes of the EPL, "Program" will mean the Content.

-

If you did not receive this Content directly from the Eclipse Foundation, the Content is +

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was +apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise indicated below, the terms and conditions of the EPL still apply to any source code in the Content and such source code may be obtained at http://www.eclipse.org.

- +

Third Party Content

-

The Content includes items that have been sourced from third parties as set out below. If you - did not receive this Content directly from the Eclipse Foundation, the following is provided - for informational purposes only, and you should look to the Redistributor's license for +

The Content includes items that have been sourced from third parties as set out below. If you + did not receive this Content directly from the Eclipse Foundation, the following is provided + for informational purposes only, and you should look to the Redistributor's license for terms and conditions of use.

libwebsockets 2.4.2

diff --git a/apps/db_dump/db_dump.c b/apps/db_dump/db_dump.c index 3f6958ad..234e121c 100644 --- a/apps/db_dump/db_dump.c +++ b/apps/db_dump/db_dump.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -124,7 +124,7 @@ static int dump__cfg_chunk_process(FILE *db_fd, uint32_t length) fclose(db_fd); return rc; } - + if(do_print) printf("DB_CHUNK_CFG:\n"); if(do_print) printf("\tLength: %d\n", length); if(do_print) printf("\tShutdown: %d\n", chunk.shutdown); diff --git a/apps/db_dump/db_dump.h b/apps/db_dump/db_dump.h index f6586aa7..281848b3 100644 --- a/apps/db_dump/db_dump.h +++ b/apps/db_dump/db_dump.h @@ -6,12 +6,12 @@ Copyright (c) 2010-2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/apps/db_dump/print.c b/apps/db_dump/print.c index 886563bd..b30320fb 100644 --- a/apps/db_dump/print.c +++ b/apps/db_dump/print.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/apps/mosquitto_ctrl/dynsec.c b/apps/mosquitto_ctrl/dynsec.c index 052597e2..3a5f4f1c 100644 --- a/apps/mosquitto_ctrl/dynsec.c +++ b/apps/mosquitto_ctrl/dynsec.c @@ -373,7 +373,7 @@ static void print_default_acl_access(cJSON *j_response) if(j_acltype == NULL || !cJSON_IsString(j_acltype) || j_allow == NULL || !cJSON_IsBool(j_allow) ){ - + fprintf(stderr, "Error: Invalid response from server.\n"); return; } diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.c b/apps/mosquitto_ctrl/mosquitto_ctrl.c index aa706a61..837470d2 100644 --- a/apps/mosquitto_ctrl/mosquitto_ctrl.c +++ b/apps/mosquitto_ctrl/mosquitto_ctrl.c @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) print_usage(); return 1; } - + /* In built modules */ if(!strcasecmp(argv[0], "dynsec")){ l_ctrl_main = dynsec__main; diff --git a/apps/mosquitto_passwd/get_password.c b/apps/mosquitto_passwd/get_password.c index 42842536..09e36de5 100644 --- a/apps/mosquitto_passwd/get_password.c +++ b/apps/mosquitto_passwd/get_password.c @@ -4,12 +4,12 @@ Copyright (c) 2012-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/apps/mosquitto_passwd/get_password.h b/apps/mosquitto_passwd/get_password.h index 3cada7c6..24db8fd1 100644 --- a/apps/mosquitto_passwd/get_password.h +++ b/apps/mosquitto_passwd/get_password.h @@ -6,12 +6,12 @@ Copyright (c) 2012-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/apps/mosquitto_passwd/mosquitto_passwd.c b/apps/mosquitto_passwd/mosquitto_passwd.c index d783c289..f5b2470e 100644 --- a/apps/mosquitto_passwd/mosquitto_passwd.c +++ b/apps/mosquitto_passwd/mosquitto_passwd.c @@ -4,12 +4,12 @@ Copyright (c) 2012-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -350,7 +350,7 @@ static int copy_contents(FILE *src, FILE *dest) rewind(src); rewind(dest); - + #ifdef WIN32 _chsize(fileno(dest), 0); #else diff --git a/buildtest.py b/buildtest.py index e85c2120..8fc2f688 100755 --- a/buildtest.py +++ b/buildtest.py @@ -42,7 +42,7 @@ def run_test(msg, opts): proc = subprocess.run(args, stdout=subprocess.DEVNULL) if proc.returncode != 0: raise RuntimeError("BUILD FAILED: %s" % (' '.join(args))) - + def simple_tests(): for bv in build_variants: for enabled in ["yes", "no"]: diff --git a/client/Makefile b/client/Makefile index a182fdf8..a951488b 100644 --- a/client/Makefile +++ b/client/Makefile @@ -87,5 +87,5 @@ uninstall : reallyclean : clean -clean : +clean : -rm -f *.o mosquitto_pub mosquitto_sub mosquitto_rr *.gcda *.gcno diff --git a/client/client_props.c b/client/client_props.c index fcec9cad..96217f62 100644 --- a/client/client_props.c +++ b/client/client_props.c @@ -4,12 +4,12 @@ Copyright (c) 2018-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -109,7 +109,6 @@ int cfg_parse_property(struct mosq_config *cfg, int argc, char *argv[], int *idx (*idx) += 2; } - switch(cmd){ case CMD_CONNECT: proplist = &cfg->connect_props; diff --git a/client/client_shared.c b/client/client_shared.c index e6c6ad56..fee029a6 100644 --- a/client/client_shared.c +++ b/client/client_shared.c @@ -4,12 +4,12 @@ Copyright (c) 2014-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -992,7 +992,7 @@ int client_config_line_proc(struct mosq_config *cfg, int pub_or_sub, int argc, c if(cfg->pub_mode != MSGMODE_NONE){ fprintf(stderr, "Error: Only one type of message can be sent at once.\n\n"); return 1; - }else{ + }else{ cfg->pub_mode = MSGMODE_STDIN_FILE; } #ifdef WITH_SRV diff --git a/client/client_shared.h b/client/client_shared.h index 49484ff6..b15ffc4f 100644 --- a/client/client_shared.h +++ b/client/client_shared.h @@ -4,12 +4,12 @@ Copyright (c) 2014-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/client/pub_client.c b/client/pub_client.c index 4ee026bd..848e2c2d 100644 --- a/client/pub_client.c +++ b/client/pub_client.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/client/pub_shared.c b/client/pub_shared.c index 0b9323c9..33357212 100644 --- a/client/pub_shared.c +++ b/client/pub_shared.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/client/pub_shared.h b/client/pub_shared.h index 9f657de4..779505b4 100644 --- a/client/pub_shared.h +++ b/client/pub_shared.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/client/rr_client.c b/client/rr_client.c index 52b0d2e5..e74536f7 100644 --- a/client/rr_client.c +++ b/client/rr_client.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/client/sub_client.c b/client/sub_client.c index 304eb914..4ff3bf9a 100644 --- a/client/sub_client.c +++ b/client/sub_client.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/client/sub_client_output.c b/client/sub_client_output.c index c3fb5c33..b0cb1506 100644 --- a/client/sub_client_output.c +++ b/client/sub_client_output.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -361,7 +361,7 @@ static int json_print(const struct mosquitto_message *message, const mosquitto_p fputs(json_str, stdout); free(json_str); - + return MOSQ_ERR_SUCCESS; #else UNUSED(properties); @@ -384,7 +384,7 @@ static int json_print(const struct mosquitto_message *message, const mosquitto_p write_payload(message->payload, message->payloadlen, 0, 0, 0, 0, 0); fputs("}", stdout); } - + return MOSQ_ERR_SUCCESS; #endif } diff --git a/client/sub_client_output.h b/client/sub_client_output.h index bf116be6..a3443bd5 100644 --- a/client/sub_client_output.h +++ b/client/sub_client_output.h @@ -4,12 +4,12 @@ Copyright (c) 2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/doc/historical/old-regex.txt b/doc/historical/old-regex.txt index 10fd170d..de49c8af 100644 --- a/doc/historical/old-regex.txt +++ b/doc/historical/old-regex.txt @@ -17,7 +17,7 @@ level is #. ^(?: # Must start at beginning of string (?: # (Level 1 hierarchy) (a|\+)(?!$) # Match a or +, but only if not EOL. - ) # AND + ) # AND (?: (?: # (Level 2 hierarchy) / # Match / diff --git a/doc/joss-paper/paper.md b/doc/joss-paper/paper.md index ce08ced3..c5d5e26c 100644 --- a/doc/joss-paper/paper.md +++ b/doc/joss-paper/paper.md @@ -38,7 +38,7 @@ block for building larger systems and has been used to evaluate MQTT for use in Smart City Services [@Antonic_2015], and in the development of an environmental monitoring system [@Bellavista_2017]. Mosquitto has also been used to support research less directly as part of a scheme for remote control of an experiment -[@Schulz_2014]. +[@Schulz_2014]. Outside of academia, Mosquitto is used in other open source projects such as the [openHAB](http://www.openhab.org/) home automation project and diff --git a/docker/README.md b/docker/README.md index 71bc3bae..ca72ebac 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,4 +1,4 @@ -# Docker Images +# Docker Images This directory contains Docker files for Mosquitto. diff --git a/edl-v10 b/edl-v10 index 0d500b98..bc03db03 100644 --- a/edl-v10 +++ b/edl-v10 @@ -16,7 +16,7 @@ modification, are permitted provided that the following conditions are met: 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 diff --git a/epl-v20 b/epl-v20 index e23ece2c..e48e0963 100644 --- a/epl-v20 +++ b/epl-v20 @@ -261,8 +261,8 @@ No third-party beneficiary rights are created under this Agreement. Exhibit A - Form of Secondary Licenses Notice -"This Source Code may also be made available under the following -Secondary Licenses when the conditions for such availability set forth +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}." @@ -274,4 +274,4 @@ version(s), and exceptions or additional permissions here}." file in a relevant directory) where a recipient would be likely to look for such a notice. - You may add additional accurate notices of copyright ownership. \ No newline at end of file + You may add additional accurate notices of copyright ownership. diff --git a/examples/mysql_log/Makefile b/examples/mysql_log/Makefile index e8c8b2cc..2005db13 100644 --- a/examples/mysql_log/Makefile +++ b/examples/mysql_log/Makefile @@ -11,5 +11,5 @@ mosquitto_mysql_log : mysql_log.o mysql_log.o : mysql_log.c ${CC} -c $^ -o $@ ${CFLAGS} -I../../lib -clean : +clean : -rm -f *.o mosquitto_mysql_log diff --git a/examples/subscribe_simple/Makefile b/examples/subscribe_simple/Makefile index f5576c53..2cceffd6 100644 --- a/examples/subscribe_simple/Makefile +++ b/examples/subscribe_simple/Makefile @@ -25,5 +25,5 @@ multiple.o : multiple.c ../../lib/libmosquitto.so.${SOVERSION} ../../lib/libmosquitto.so.${SOVERSION} : $(MAKE) -C ../../lib -clean : +clean : -rm -f *.o sub_single sub_multiple diff --git a/examples/temperature_conversion/Makefile b/examples/temperature_conversion/Makefile index 0f20ac41..fc0456dd 100644 --- a/examples/temperature_conversion/Makefile +++ b/examples/temperature_conversion/Makefile @@ -14,5 +14,5 @@ main.o : main.cpp temperature_conversion.o : temperature_conversion.cpp ${CXX} -c $^ -o $@ ${CFLAGS} -clean : +clean : -rm -f *.o mqtt_temperature_conversion diff --git a/include/mosquitto_broker.h b/include/mosquitto_broker.h index a2aff495..9a6ba1e4 100644 --- a/include/mosquitto_broker.h +++ b/include/mosquitto_broker.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/include/mosquitto_plugin.h b/include/mosquitto_plugin.h index d8a6c72c..769b666d 100644 --- a/include/mosquitto_plugin.h +++ b/include/mosquitto_plugin.h @@ -4,12 +4,12 @@ Copyright (c) 2012-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -282,7 +282,7 @@ mosq_plugin_EXPORT int mosquitto_auth_plugin_cleanup(void *user_data, struct mos mosq_plugin_EXPORT int mosquitto_auth_security_init(void *user_data, struct mosquitto_opt *opts, int opt_count, bool reload); -/* +/* * Function: mosquitto_auth_security_cleanup * * This function is called in two scenarios: diff --git a/lib/actions.c b/lib/actions.c index f260eaba..6ab8ac28 100644 --- a/lib/actions.c +++ b/lib/actions.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/alias_mosq.c b/lib/alias_mosq.c index 95fbc969..08d4f525 100644 --- a/lib/alias_mosq.c +++ b/lib/alias_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2019-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -34,7 +34,6 @@ int alias__add(struct mosquitto *mosq, const char *topic, uint16_t alias) if(mosq->aliases[i].topic){ return MOSQ_ERR_SUCCESS; }else{ - return MOSQ_ERR_NOMEM; } } diff --git a/lib/alias_mosq.h b/lib/alias_mosq.h index 7df41497..836520fc 100644 --- a/lib/alias_mosq.h +++ b/lib/alias_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2019-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/callbacks.c b/lib/callbacks.c index 5dc50e24..2e4f6bcc 100644 --- a/lib/callbacks.c +++ b/lib/callbacks.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/connect.c b/lib/connect.c index 6b801471..ab61b66c 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/cpp/mosquittopp.cpp b/lib/cpp/mosquittopp.cpp index 0bc8d3b8..ca4c1679 100644 --- a/lib/cpp/mosquittopp.cpp +++ b/lib/cpp/mosquittopp.cpp @@ -4,12 +4,12 @@ Copyright (c) 2010-2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + Contributors: Roger Light - initial implementation and documentation. */ diff --git a/lib/dummypthread.h b/lib/dummypthread.h index 611a1574..c0eb2c15 100644 --- a/lib/dummypthread.h +++ b/lib/dummypthread.h @@ -8,7 +8,7 @@ #define pthread_mutex_init(A, B) #define pthread_mutex_destroy(A) -#define pthread_mutex_lock(A) -#define pthread_mutex_unlock(A) +#define pthread_mutex_lock(A) +#define pthread_mutex_unlock(A) #endif diff --git a/lib/helpers.c b/lib/helpers.c index 3f076925..b418065a 100644 --- a/lib/helpers.c +++ b/lib/helpers.c @@ -4,12 +4,12 @@ Copyright (c) 2016-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/logging_mosq.c b/lib/logging_mosq.c index 24d56867..348dba8a 100644 --- a/lib/logging_mosq.c +++ b/lib/logging_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/logging_mosq.h b/lib/logging_mosq.h index bc94f5f5..ee5a5196 100644 --- a/lib/logging_mosq.h +++ b/lib/logging_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/loop.c b/lib/loop.c index 155b5e11..3373c186 100644 --- a/lib/loop.c +++ b/lib/loop.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/memory_mosq.c b/lib/memory_mosq.c index 4367197e..ff69251d 100644 --- a/lib/memory_mosq.c +++ b/lib/memory_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/memory_mosq.h b/lib/memory_mosq.h index 48fadf8c..d76ed5a4 100644 --- a/lib/memory_mosq.h +++ b/lib/memory_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/messages_mosq.c b/lib/messages_mosq.c index 8773c968..92c92ea1 100644 --- a/lib/messages_mosq.c +++ b/lib/messages_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/messages_mosq.h b/lib/messages_mosq.h index ee5ba5cd..b8f5e197 100644 --- a/lib/messages_mosq.h +++ b/lib/messages_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/misc_mosq.h b/lib/misc_mosq.h index f86f5d76..b758db3c 100644 --- a/lib/misc_mosq.h +++ b/lib/misc_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/mosquitto.c b/lib/mosquitto.c index cd8fc00a..0d68d313 100644 --- a/lib/mosquitto.c +++ b/lib/mosquitto.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h index d405d883..b2e7a03e 100644 --- a/lib/mosquitto_internal.h +++ b/lib/mosquitto_internal.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/net_mosq.c b/lib/net_mosq.c index bd927191..22f5a313 100644 --- a/lib/net_mosq.c +++ b/lib/net_mosq.c @@ -668,7 +668,7 @@ static int net__init_ssl_ctx(struct mosquitto *mosq) #if !defined(OPENSSL_NO_ENGINE) EVP_PKEY *pkey; #endif - + #ifndef WITH_BROKER if(mosq->user_ssl_ctx){ mosq->ssl_ctx = mosq->user_ssl_ctx; diff --git a/lib/net_mosq.h b/lib/net_mosq.h index 9feae613..37a21461 100644 --- a/lib/net_mosq.h +++ b/lib/net_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/options.c b/lib/options.c index b734f13f..29f8225f 100644 --- a/lib/options.c +++ b/lib/options.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -113,15 +113,14 @@ int mosquitto_username_pw_set(struct mosquitto *mosq, const char *username, cons int mosquitto_reconnect_delay_set(struct mosquitto *mosq, unsigned int reconnect_delay, unsigned int reconnect_delay_max, bool reconnect_exponential_backoff) { if(!mosq) return MOSQ_ERR_INVAL; - + if(reconnect_delay == 0) reconnect_delay = 1; mosq->reconnect_delay = reconnect_delay; mosq->reconnect_delay_max = reconnect_delay_max; mosq->reconnect_exponential_backoff = reconnect_exponential_backoff; - + return MOSQ_ERR_SUCCESS; - } diff --git a/lib/packet_mosq.h b/lib/packet_mosq.h index 38921794..827aeb1f 100644 --- a/lib/packet_mosq.h +++ b/lib/packet_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/property_mosq.c b/lib/property_mosq.c index f8d15408..6249869c 100644 --- a/lib/property_mosq.c +++ b/lib/property_mosq.c @@ -169,7 +169,7 @@ int property__read_all(int command, struct mosquitto__packet *packet, mosquitto_ return MOSQ_ERR_NOMEM; } - rc = property__read(packet, &proplen, p); + rc = property__read(packet, &proplen, p); if(rc){ mosquitto__free(p); mosquitto_property_free_all(properties); diff --git a/lib/property_mosq.h b/lib/property_mosq.h index c913c051..bd5e2b67 100644 --- a/lib/property_mosq.h +++ b/lib/property_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2018-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/read_handle.c b/lib/read_handle.c index dd6a06bd..eafa65b1 100644 --- a/lib/read_handle.c +++ b/lib/read_handle.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/read_handle.h b/lib/read_handle.h index 3f97f90d..3340ae19 100644 --- a/lib/read_handle.h +++ b/lib/read_handle.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/send_mosq.c b/lib/send_mosq.c index 059e7604..f4a3ef39 100644 --- a/lib/send_mosq.c +++ b/lib/send_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/send_mosq.h b/lib/send_mosq.h index 7ab48f11..85b51c37 100644 --- a/lib/send_mosq.h +++ b/lib/send_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/srv_mosq.c b/lib/srv_mosq.c index 3ee74f16..55d58ff5 100644 --- a/lib/srv_mosq.c +++ b/lib/srv_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2013-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -34,7 +34,7 @@ Contributors: #ifdef WITH_SRV static void srv_callback(void *arg, int status, int timeouts, unsigned char *abuf, int alen) -{ +{ struct mosquitto *mosq = arg; struct ares_srv_reply *reply = NULL; diff --git a/lib/strings_mosq.c b/lib/strings_mosq.c index ae9af1cf..292a1a74 100644 --- a/lib/strings_mosq.c +++ b/lib/strings_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/thread_mosq.c b/lib/thread_mosq.c index 32a3e7e0..a792bc12 100644 --- a/lib/thread_mosq.c +++ b/lib/thread_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2011-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -80,7 +80,7 @@ int mosquitto_loop_stop(struct mosquitto *mosq, bool force) send(mosq->sockpairW, &sockpair_data, 1, 0); #endif } - + #ifdef HAVE_PTHREAD_CANCEL if(force){ pthread_cancel(mosq->thread_id); diff --git a/lib/time_mosq.c b/lib/time_mosq.c index da4a9154..3a9362c2 100644 --- a/lib/time_mosq.c +++ b/lib/time_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2013-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/time_mosq.h b/lib/time_mosq.h index 175d9732..93d4fc24 100644 --- a/lib/time_mosq.h +++ b/lib/time_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2013-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/tls_mosq.c b/lib/tls_mosq.c index 13d9aa22..940df073 100644 --- a/lib/tls_mosq.c +++ b/lib/tls_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2013-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/tls_mosq.h b/lib/tls_mosq.h index 479741d2..ae175d9e 100644 --- a/lib/tls_mosq.h +++ b/lib/tls_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2013-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/utf8_mosq.c b/lib/utf8_mosq.c index 4a79cbd8..cc5abc18 100644 --- a/lib/utf8_mosq.c +++ b/lib/utf8_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2016-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -75,7 +75,7 @@ int mosquitto_validate_utf8(const char *str, int len) } codepoint = (codepoint<<6) | (ustr[i] & 0x3F); } - + /* Check for UTF-16 high/low surrogates */ if(codepoint >= 0xD800 && codepoint <= 0xDFFF){ return MOSQ_ERR_MALFORMED_UTF8; diff --git a/lib/util_mosq.h b/lib/util_mosq.h index 6fa60cfc..7d993442 100644 --- a/lib/util_mosq.h +++ b/lib/util_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/will_mosq.c b/lib/will_mosq.c index 1699d4ae..ba73abe7 100644 --- a/lib/will_mosq.c +++ b/lib/will_mosq.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/lib/will_mosq.h b/lib/will_mosq.h index 9bfdc572..ad5573bc 100644 --- a/lib/will_mosq.h +++ b/lib/will_mosq.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/man/Makefile b/man/Makefile index 65e212c0..c834aeb9 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,6 +1,6 @@ include ../config.mk -.PHONY : all clean install uninstall dist +.PHONY : all clean install uninstall dist MANPAGES = \ libmosquitto.3 \ diff --git a/man/mosquitto.8.xml b/man/mosquitto.8.xml index ca0cd599..693488ef 100644 --- a/man/mosquitto.8.xml +++ b/man/mosquitto.8.xml @@ -86,7 +86,7 @@ described in mosquitto.conf5 and this is the main point of information for mosquitto. - The files required for SSL/TLS support are described in + The files required for SSL/TLS support are described in mosquitto-tls7. diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml index 06055a4b..364b9785 100644 --- a/man/mosquitto.conf.5.xml +++ b/man/mosquitto.conf.5.xml @@ -176,7 +176,7 @@ Reloaded on reload signal. The currently loaded ACLs will be freed and reloaded. Existing subscriptions will be affected after the reload. - See also + See also @@ -456,7 +456,7 @@ D.conf Send log messages to a particular destination. Possible destinations are: - + . and log to the console on the diff --git a/man/mosquitto_pub.1.xml b/man/mosquitto_pub.1.xml index 800df2dc..171fc515 100644 --- a/man/mosquitto_pub.1.xml +++ b/man/mosquitto_pub.1.xml @@ -461,7 +461,7 @@ If retain is given, the message will be retained as a - "last known good" value on the broker. See + "last known good" value on the broker. See mqtt7 for more information. Note that zero length payloads are never retained. If you send a zero length @@ -555,7 +555,7 @@ If used, this will load and trust the OS provided CA - certificates. This can be used in conjunction with + certificates. This can be used in conjunction with and and can be used on its own to enable TLS mode. This will be set by default if diff --git a/man/mosquitto_rr.1.xml b/man/mosquitto_rr.1.xml index 408a4408..7e45b683 100644 --- a/man/mosquitto_rr.1.xml +++ b/man/mosquitto_rr.1.xml @@ -572,7 +572,7 @@ If used, this will load and trust the OS provided CA - certificates. This can be used in conjunction with + certificates. This can be used in conjunction with and and can be used on its own to enable TLS mode. This will be set by default if diff --git a/man/mosquitto_sub.1.xml b/man/mosquitto_sub.1.xml index 7323bd1a..6a7c5b38 100644 --- a/man/mosquitto_sub.1.xml +++ b/man/mosquitto_sub.1.xml @@ -651,7 +651,7 @@ mosquitto_sub -t 'bbc/#' -T bbc/bbc1 --remove-retained If used, this will load and trust the OS provided CA - certificates. This can be used in conjunction with + certificates. This can be used in conjunction with and and can be used on its own to enable TLS mode. This will be set by default if @@ -889,7 +889,7 @@ mosquitto_sub -t 'bbc/#' -T bbc/bbc1 --remove-retained For example would set the minimum topic - field width to 10 characters, and the maximum topic width to + field width to 10 characters, and the maximum topic width to 10 characters, i.e. the field will always be exactly 10 characters long. diff --git a/misc/currentcost/cc128_read.pl b/misc/currentcost/cc128_read.pl index fbf892ed..c69ce589 100755 --- a/misc/currentcost/cc128_read.pl +++ b/misc/currentcost/cc128_read.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Reads data from a Current Cost device via serial port. -# Spawns +# Spawns use strict; use Device::SerialPort qw( :PARAM :STAT 0.07 ); @@ -18,6 +18,6 @@ open(SERIAL, "+<$PORT"); open(MQTT, "|$pubclient"); while (my $line = ) { print(MQTT "$line"); -} +} close(MQTT); diff --git a/misc/currentcost/gnome-panel/CurrentCostMQTT.server b/misc/currentcost/gnome-panel/CurrentCostMQTT.server index 9e74bdac..55986232 100644 --- a/misc/currentcost/gnome-panel/CurrentCostMQTT.server +++ b/misc/currentcost/gnome-panel/CurrentCostMQTT.server @@ -1,6 +1,6 @@ - @@ -11,9 +11,9 @@ - + diff --git a/plugins/auth-by-ip/mosquitto_auth_by_ip.c b/plugins/auth-by-ip/mosquitto_auth_by_ip.c index 49cc0178..66e26fd5 100644 --- a/plugins/auth-by-ip/mosquitto_auth_by_ip.c +++ b/plugins/auth-by-ip/mosquitto_auth_by_ip.c @@ -4,12 +4,12 @@ Copyright (c) 2021 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR EDL-1.0 Contributors: diff --git a/plugins/dynamic-security/clients.c b/plugins/dynamic-security/clients.c index e5416ba2..a22e5cfb 100644 --- a/plugins/dynamic-security/clients.c +++ b/plugins/dynamic-security/clients.c @@ -153,7 +153,7 @@ int dynsec_clients__config_load(cJSON *tree) j_password = cJSON_GetObjectItem(j_client, "password"); j_iterations = cJSON_GetObjectItem(j_client, "iterations"); - if(j_salt && cJSON_IsString(j_salt) + if(j_salt && cJSON_IsString(j_salt) && j_password && cJSON_IsString(j_password) && j_iterations && cJSON_IsNumber(j_iterations)){ diff --git a/plugins/message-timestamp/mosquitto_message_timestamp.c b/plugins/message-timestamp/mosquitto_message_timestamp.c index ae35ff87..1b11c44f 100644 --- a/plugins/message-timestamp/mosquitto_message_timestamp.c +++ b/plugins/message-timestamp/mosquitto_message_timestamp.c @@ -4,12 +4,12 @@ Copyright (c) 2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/plugins/payload-modification/mosquitto_payload_modification.c b/plugins/payload-modification/mosquitto_payload_modification.c index 6af83ef5..669790bf 100644 --- a/plugins/payload-modification/mosquitto_payload_modification.c +++ b/plugins/payload-modification/mosquitto_payload_modification.c @@ -4,12 +4,12 @@ Copyright (c) 2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -19,7 +19,7 @@ Contributors: /* * This is an *example* plugin which demonstrates how to modify the payload of * a message after it is received by the broker and before it is sent on to - * other clients. + * other clients. * * You should be very sure of what you are doing before making use of this feature. * @@ -76,7 +76,7 @@ static int callback_message(int event, void *event_data, void *userdata) * broker. */ ed->payload = new_payload; ed->payloadlen = new_payloadlen; - + return MOSQ_ERR_SUCCESS; } diff --git a/src/Makefile b/src/Makefile index 92bad827..d85d1fb0 100644 --- a/src/Makefile +++ b/src/Makefile @@ -330,7 +330,7 @@ uninstall : -rm -f "${DESTDIR}${prefix}/include/mosquitto_broker.h" -rm -f "${DESTDIR}${prefix}/include/mosquitto_plugin.h" -clean : +clean : -rm -f *.o mosquitto *.gcda *.gcno reallyclean : clean diff --git a/src/bridge.c b/src/bridge.c index 9ca367a9..7139dbf2 100644 --- a/src/bridge.c +++ b/src/bridge.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -63,7 +63,7 @@ void bridge__start_all(void) for(i=0; ibridge_count; i++){ if(bridge__new(&(db.config->bridges[i])) > 0){ - log__printf(NULL, MOSQ_LOG_WARNING, "Warning: Unable to connect to bridge %s.", + log__printf(NULL, MOSQ_LOG_WARNING, "Warning: Unable to connect to bridge %s.", db.config->bridges[i].name); } } diff --git a/src/bridge_topic.c b/src/bridge_topic.c index dc19fda1..402ce7aa 100644 --- a/src/bridge_topic.c +++ b/src/bridge_topic.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/conf_includedir.c b/src/conf_includedir.c index f46fb5aa..bb71ccca 100644 --- a/src/conf_includedir.c +++ b/src/conf_includedir.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/context.c b/src/context.c index d1ff0372..a0125eed 100644 --- a/src/context.c +++ b/src/context.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -39,7 +39,7 @@ struct mosquitto *context__init(mosq_sock_t sock) context = mosquitto__calloc(1, sizeof(struct mosquitto)); if(!context) return NULL; - + #ifdef WITH_EPOLL context->ident = id_client; #else diff --git a/src/control.c b/src/control.c index 9cef197c..88c4e9da 100644 --- a/src/control.c +++ b/src/control.c @@ -4,12 +4,12 @@ Copyright (c) 2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/database.c b/src/database.c index bc090daa..11d6ef34 100644 --- a/src/database.c +++ b/src/database.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/keepalive.c b/src/keepalive.c index 89d5c50b..f9321854 100644 --- a/src/keepalive.c +++ b/src/keepalive.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/lib_load.h b/src/lib_load.h index 70948d70..271bd81e 100644 --- a/src/lib_load.h +++ b/src/lib_load.h @@ -4,12 +4,12 @@ Copyright (c) 2012-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/logging.c b/src/logging.c index cfac6a20..6795d7e9 100644 --- a/src/logging.c +++ b/src/logging.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/loop.c b/src/loop.c index 3a770ca1..dbc16ae3 100644 --- a/src/loop.c +++ b/src/loop.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/mosquitto.c b/src/mosquitto.c index 776b71f0..09632f28 100644 --- a/src/mosquitto.c +++ b/src/mosquitto.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h index 934cbf4d..7ca127dd 100644 --- a/src/mosquitto_broker_internal.h +++ b/src/mosquitto_broker_internal.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/mux_poll.c b/src/mux_poll.c index 8d6bb2f1..496fcf84 100644 --- a/src/mux_poll.c +++ b/src/mux_poll.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2019 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/net.c b/src/net.c index 9bc9f807..ad9d53da 100644 --- a/src/net.c +++ b/src/net.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/persist.h b/src/persist.h index 35081770..897e68c3 100644 --- a/src/persist.h +++ b/src/persist.h @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -76,7 +76,7 @@ struct PF_client{ uint16_t listener_port; uint16_t username_len; - /* tail: 4 byte padding, because 64bit member + /* tail: 4 byte padding, because 64bit member * forces multiple of 8 for struct size */ }; struct P_client{ diff --git a/src/persist_read_v234.c b/src/persist_read_v234.c index 7f7a64f9..7460c309 100644 --- a/src/persist_read_v234.c +++ b/src/persist_read_v234.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -46,10 +46,10 @@ int persist__chunk_header_read_v234(FILE *db_fptr, uint32_t *chunk, uint32_t *le rlen = fread(&i16temp, sizeof(uint16_t), 1, db_fptr); if(rlen != 1) return 1; - + rlen = fread(&i32temp, sizeof(uint32_t), 1, db_fptr); if(rlen != 1) return 1; - + *chunk = ntohs(i16temp); *length = ntohl(i32temp); @@ -167,7 +167,7 @@ int persist__chunk_msg_store_read_v234(FILE *db_fptr, struct P_msg_store *chunk, read_e(db_fptr, &chunk->F.qos, sizeof(uint8_t)); read_e(db_fptr, &chunk->F.retain, sizeof(uint8_t)); - + read_e(db_fptr, &i32temp, sizeof(uint32_t)); chunk->F.payloadlen = ntohl(i32temp); diff --git a/src/persist_read_v5.c b/src/persist_read_v5.c index a6e66351..abc9a580 100644 --- a/src/persist_read_v5.c +++ b/src/persist_read_v5.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -47,7 +47,7 @@ int persist__chunk_header_read_v56(FILE *db_fptr, uint32_t *chunk, uint32_t *len rlen = fread(&header, sizeof(struct PF_header), 1, db_fptr); if(rlen != 1) return 1; - + *chunk = ntohl(header.chunk); *length = ntohl(header.length); @@ -79,7 +79,7 @@ int persist__chunk_client_read_v56(FILE *db_fptr, struct P_client *chunk, uint32 }else{ return 1; } - + chunk->F.session_expiry_interval = ntohl(chunk->F.session_expiry_interval); chunk->F.last_mid = ntohs(chunk->F.last_mid); chunk->F.id_len = ntohs(chunk->F.id_len); diff --git a/src/persist_write.c b/src/persist_write.c index 3ac4f4a5..ccfbc29c 100644 --- a/src/persist_write.c +++ b/src/persist_write.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -295,7 +295,7 @@ static int persist__retain_save_all(FILE *db_fptr) persist__retain_save(db_fptr, retainhier->children, 0); } } - + return MOSQ_ERR_SUCCESS; } @@ -389,9 +389,9 @@ int persist__backup(bool shutdown) * written to disk. Need to flush to send data from app to OS * buffers, then fsync to deliver data from OS buffers to disk * (as well as disk hardware permits). - * + * * man close (http://linux.die.net/man/2/close, 2016-06-20): - * + * * "successful close does not guarantee that the data has * been successfully saved to disk, as the kernel defers * writes. It is not common for a filesystem to flush diff --git a/src/persist_write_v5.c b/src/persist_write_v5.c index 3d1d8e81..8c9f6c34 100644 --- a/src/persist_write_v5.c +++ b/src/persist_write_v5.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/plugin.c b/src/plugin.c index fbf3bd7d..e0dd371a 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -4,12 +4,12 @@ Copyright (c) 2016-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/plugin_debug.c b/src/plugin_debug.c index 2e88b961..8a8d6c21 100644 --- a/src/plugin_debug.c +++ b/src/plugin_debug.c @@ -4,12 +4,12 @@ Copyright (c) 2015-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/plugin_defer.c b/src/plugin_defer.c index 05f664fa..fce1284d 100644 --- a/src/plugin_defer.c +++ b/src/plugin_defer.c @@ -4,12 +4,12 @@ Copyright (c) 2015-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/plugin_public.c b/src/plugin_public.c index 4c4d6a47..a800090c 100644 --- a/src/plugin_public.c +++ b/src/plugin_public.c @@ -4,12 +4,12 @@ Copyright (c) 2016-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -169,7 +169,7 @@ int mosquitto_broker_publish( msg = mosquitto__malloc(sizeof(struct mosquitto_message_v5)); if(msg == NULL) return MOSQ_ERR_NOMEM; - + msg->next = NULL; msg->prev = NULL; if(clientid){ diff --git a/src/property_broker.c b/src/property_broker.c index 1a38c204..e829b300 100644 --- a/src/property_broker.c +++ b/src/property_broker.c @@ -4,12 +4,12 @@ Copyright (c) 2018-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/read_handle.c b/src/read_handle.c index c143d7e2..b1cba917 100644 --- a/src/read_handle.c +++ b/src/read_handle.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/security.c b/src/security.c index 1f51d72b..23b5a5cd 100644 --- a/src/security.c +++ b/src/security.c @@ -4,12 +4,12 @@ Copyright (c) 2011-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -257,7 +257,7 @@ static int security__load_v4(struct mosquitto__auth_plugin *plugin, struct mosqu plugin->auth_start_v4 = (FUNC_auth_plugin_auth_start_v4)LIB_SYM(lib, "mosquitto_auth_start"); plugin->auth_continue_v4 = (FUNC_auth_plugin_auth_continue_v4)LIB_SYM(lib, "mosquitto_auth_continue"); - + if(plugin->auth_start_v4){ if(plugin->auth_continue_v4){ log__printf(NULL, MOSQ_LOG_INFO, @@ -695,7 +695,7 @@ int mosquitto_acl_check(struct mosquitto *context, const char *topic, uint32_t p rc = acl__check_dollar(topic, access); if(rc) return rc; - /* + /* * If no plugins exist we should accept at this point so set rc to success. */ rc = MOSQ_ERR_SUCCESS; @@ -785,7 +785,7 @@ int mosquitto_unpwd_check(struct mosquitto *context) } for(i=0; iauth_plugin_config_count; i++){ - if(opts->auth_plugin_configs[i].plugin.version == 4 + if(opts->auth_plugin_configs[i].plugin.version == 4 && opts->auth_plugin_configs[i].plugin.unpwd_check_v4){ rc = opts->auth_plugin_configs[i].plugin.unpwd_check_v4( @@ -827,7 +827,7 @@ int mosquitto_unpwd_check(struct mosquitto *context) if(context->username == NULL && ((db.config->per_listener_settings && context->listener->security_options.allow_anonymous != false) || (!db.config->per_listener_settings && db.config->security_options.allow_anonymous != false))){ - + return MOSQ_ERR_SUCCESS; }else{ return MOSQ_ERR_AUTH; diff --git a/src/security_default.c b/src/security_default.c index e659e7bf..4fc6a78b 100644 --- a/src/security_default.c +++ b/src/security_default.c @@ -4,12 +4,12 @@ Copyright (c) 2011-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -682,7 +682,7 @@ static int acl__cleanup(bool reload) /* As we're freeing ACLs, we must clear context->acl_list to ensure no * invalid memory accesses take place later. * This *requires* the ACLs to be reapplied after acl__cleanup() - * is called if we are reloading the config. If this is not done, all + * is called if we are reloading the config. If this is not done, all * access will be denied to currently connected clients. */ HASH_ITER(hh_id, db.contexts_by_id, context, ctxt_tmp){ @@ -754,7 +754,7 @@ static int pwfile__parse(const char *file, struct mosquitto__unpwd **root) log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory."); return MOSQ_ERR_NOMEM; } - + pwfile = mosquitto__fopen(file, "rt", false); if(!pwfile){ log__printf(NULL, MOSQ_LOG_ERR, "Error: Unable to open pwfile \"%s\".", file); diff --git a/src/service.c b/src/service.c index 2a438abd..c0406774 100644 --- a/src/service.c +++ b/src/service.c @@ -4,12 +4,12 @@ Copyright (c) 2011-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -121,7 +121,7 @@ void service_install(void) sc_manager = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); if(sc_manager){ - svc_handle = CreateService(sc_manager, "mosquitto", "Mosquitto Broker", + svc_handle = CreateService(sc_manager, "mosquitto", "Mosquitto Broker", SERVICE_START | SERVICE_STOP | SERVICE_CHANGE_CONFIG, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, service_string, NULL, NULL, NULL, NULL, NULL); diff --git a/src/session_expiry.c b/src/session_expiry.c index 1d2beb57..2ecceb74 100644 --- a/src/session_expiry.c +++ b/src/session_expiry.c @@ -4,12 +4,12 @@ Copyright (c) 2019-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -106,7 +106,6 @@ void session_expiry__remove_all(void) will_delay__remove(context); context__disconnect(context); } - } void session_expiry__check(void) @@ -140,6 +139,5 @@ void session_expiry__check(void) return; } } - } diff --git a/src/signals.c b/src/signals.c index 82d911be..572f063f 100644 --- a/src/signals.c +++ b/src/signals.c @@ -4,12 +4,12 @@ Copyright (c) 2016-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/subs.c b/src/subs.c index 434ac813..687537d9 100644 --- a/src/subs.c +++ b/src/subs.c @@ -4,12 +4,12 @@ Copyright (c) 2010-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/sys_tree.c b/src/sys_tree.c index 5aee42db..fd339214 100644 --- a/src/sys_tree.c +++ b/src/sys_tree.c @@ -4,12 +4,12 @@ Copyright (c) 2009-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -324,7 +324,7 @@ void sys_tree__update(int interval, time_t start_time) len = (uint32_t)snprintf(buf, BUFLEN, "%lu", msgs_received); db__messages_easy_queue(NULL, "$SYS/broker/messages/received", SYS_TREE_QOS, len, buf, 1, 60, NULL); } - + if(msgs_sent != g_msgs_sent){ msgs_sent = g_msgs_sent; len = (uint32_t)snprintf(buf, BUFLEN, "%lu", msgs_sent); @@ -342,7 +342,7 @@ void sys_tree__update(int interval, time_t start_time) len = (uint32_t)snprintf(buf, BUFLEN, "%lu", pub_msgs_received); db__messages_easy_queue(NULL, "$SYS/broker/publish/messages/received", SYS_TREE_QOS, len, buf, 1, 60, NULL); } - + if(pub_msgs_sent != g_pub_msgs_sent){ pub_msgs_sent = g_pub_msgs_sent; len = (uint32_t)snprintf(buf, BUFLEN, "%lu", pub_msgs_sent); @@ -354,13 +354,13 @@ void sys_tree__update(int interval, time_t start_time) len = (uint32_t)snprintf(buf, BUFLEN, "%llu", bytes_received); db__messages_easy_queue(NULL, "$SYS/broker/bytes/received", SYS_TREE_QOS, len, buf, 1, 60, NULL); } - + if(bytes_sent != g_bytes_sent){ bytes_sent = g_bytes_sent; len = (uint32_t)snprintf(buf, BUFLEN, "%llu", bytes_sent); db__messages_easy_queue(NULL, "$SYS/broker/bytes/sent", SYS_TREE_QOS, len, buf, 1, 60, NULL); } - + if(pub_bytes_received != g_pub_bytes_received){ pub_bytes_received = g_pub_bytes_received; len = (uint32_t)snprintf(buf, BUFLEN, "%llu", pub_bytes_received); diff --git a/src/sys_tree.h b/src/sys_tree.h index 72f1da87..95b25526 100644 --- a/src/sys_tree.h +++ b/src/sys_tree.h @@ -4,12 +4,12 @@ Copyright (c) 2015-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: diff --git a/src/will_delay.c b/src/will_delay.c index aca3b931..fc529685 100644 --- a/src/will_delay.c +++ b/src/will_delay.c @@ -4,12 +4,12 @@ Copyright (c) 2019-2020 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause Contributors: @@ -69,7 +69,6 @@ void will_delay__send_all(void) context__send_will(item->context); mosquitto__free(item); } - } void will_delay__check(void) @@ -94,7 +93,6 @@ void will_delay__check(void) return; } } - } diff --git a/test/Makefile b/test/Makefile index 54b15eee..397b916a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -20,7 +20,7 @@ utest : $(MAKE) -C unit test reallyclean : clean -clean : +clean : $(MAKE) -C lib clean $(MAKE) -C broker clean $(MAKE) -C unit clean diff --git a/test/broker/02-subpub-qos1-message-expiry-will.py b/test/broker/02-subpub-qos1-message-expiry-will.py index 3ca26d05..96551475 100755 --- a/test/broker/02-subpub-qos1-message-expiry-will.py +++ b/test/broker/02-subpub-qos1-message-expiry-will.py @@ -45,7 +45,7 @@ def do_test(): helper = mosq_test.do_client_connect(helper_connect, helper_connack, timeout=20, port=port) time.sleep(2) - + sock = mosq_test.do_client_connect(connect_packet, connack2_packet, timeout=20, port=port) packet = sock.recv(len(publish2s_packet)) for i in range(10, 5, -1): diff --git a/test/broker/02-subpub-qos1-message-expiry.py b/test/broker/02-subpub-qos1-message-expiry.py index 554941c1..d73bd857 100755 --- a/test/broker/02-subpub-qos1-message-expiry.py +++ b/test/broker/02-subpub-qos1-message-expiry.py @@ -52,7 +52,7 @@ def do_test(): mosq_test.do_send_receive(helper, publish2s_packet, puback2s_packet, "puback 2") time.sleep(2) - + sock = mosq_test.do_client_connect(connect_packet, connack2_packet, timeout=20, port=port) packet = sock.recv(len(publish2s_packet)) for i in range(9, 5, -1): diff --git a/test/broker/02-subpub-qos2-1322.py b/test/broker/02-subpub-qos2-1322.py index ccc293a8..a4d052c1 100755 --- a/test/broker/02-subpub-qos2-1322.py +++ b/test/broker/02-subpub-qos2-1322.py @@ -21,7 +21,7 @@ #mosquitto_pub -t "topic1" -q 2 -c --id "foobar" -m "message3" ## message3 on topic1 IS NOT RECEIVED # -## listen on topic2 +## listen on topic2 #mosquitto_sub -t "topic2" # ## publish to topic1 without clean session @@ -112,7 +112,7 @@ def do_test(proto_ver): # We expect nothing on sub2 mosq_test.do_ping(sub2, error_string="pingresp2") - + mosq_test.expect_packet(sub1, "publish4", publish4r_packet) pub = mosq_test.do_client_connect(pub_connect_packet, pub_connack2_packet, timeout=10, port=port) mosq_test.do_send_receive(pub, publish5s_packet, pubrec_packet, "pubrec5") @@ -121,7 +121,7 @@ def do_test(proto_ver): # We expect nothing on sub2 mosq_test.do_ping(sub2, error_string="pingresp2") - + mosq_test.expect_packet(sub1, "publish5", publish5r_packet) rc = 0 diff --git a/test/broker/02-subscribe-persistence-flipflop.py b/test/broker/02-subscribe-persistence-flipflop.py index 7a98eb27..d0444dd8 100755 --- a/test/broker/02-subscribe-persistence-flipflop.py +++ b/test/broker/02-subscribe-persistence-flipflop.py @@ -9,17 +9,17 @@ # ^C # mosquitto_sub -i sub -t 'topic' -v -p 29883 -q 1 -d # ^C -# +# # SUBSCRIBE to topic is no longer respected by mosquitto -# +# # run: -# +# # mosquitto_sub -i sub -t 'topic' -v -p 29883 -q 1 -d -c -# +# # and in a separate shell -# +# # mosquitto_pub -i pub -t topic -m 'hello' -p 29883 -q 1 -# +# # sub does not receive the message from mosq_test_helper import * @@ -64,7 +64,7 @@ def do_test(proto_ver): mosq_test.do_send_receive(sub_sock, subscribe_packet, suback_packet, "subscribe persistent 2") # and in a separate shell - # + # # mosquitto_pub -i pub -t topic -m 'hello' -p 29883 -q 1 pub_sock = mosq_test.do_client_connect(connect_packet_pub, connack_packet_pub, port=port) mosq_test.do_send_receive(pub_sock, publish_packet, puback_packet, "publish") diff --git a/test/broker/03-publish-qos1-max-inflight-expire.py b/test/broker/03-publish-qos1-max-inflight-expire.py index 54cb06a2..042f55b7 100755 --- a/test/broker/03-publish-qos1-max-inflight-expire.py +++ b/test/broker/03-publish-qos1-max-inflight-expire.py @@ -14,7 +14,7 @@ def write_config(filename, port): def do_test(proto_ver): rc = 1 keepalive = 60 - + properties = mqtt5_props.gen_uint32_prop(mqtt5_props.PROP_SESSION_EXPIRY_INTERVAL, 1000) sub_connect_packet = mosq_test.gen_connect("sub", keepalive=keepalive, properties=properties, proto_ver=proto_ver, clean_session=False) @@ -61,7 +61,7 @@ def do_test(proto_ver): #mosq_test.expect_packet(sub_sock, "publish 2", r_publish_packet) #sub_sock.send(r_puback_packet) - # + # mid = 1 s_publish_packet = mosq_test.gen_publish("pub/qos1/test", qos=1, mid=mid, payload="message2", proto_ver=proto_ver) s_puback_packet = mosq_test.gen_puback(mid, proto_ver=proto_ver) diff --git a/test/broker/06-bridge-b2br-disconnect-qos2.py b/test/broker/06-bridge-b2br-disconnect-qos2.py index d3757e42..aef08d61 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos2.py +++ b/test/broker/06-bridge-b2br-disconnect-qos2.py @@ -22,7 +22,7 @@ def do_test(proto_ver): else: bridge_protocol = "mqttv50" proto_ver_connect = 5 - + (port1, port2) = mosq_test.get_port(2) conf_file = os.path.basename(__file__).replace('.py', '.conf') write_config(conf_file, port1, port2, bridge_protocol) diff --git a/test/broker/06-bridge-fail-persist-resend-qos2.py b/test/broker/06-bridge-fail-persist-resend-qos2.py index d175a956..79d875ed 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos2.py +++ b/test/broker/06-bridge-fail-persist-resend-qos2.py @@ -92,7 +92,7 @@ def do_test(proto_ver): # Send a legitimate publish packet to verify everything is still ok conn.send(publish_packet) - + mosq_test.expect_packet(conn, "puback", puback_packet) rc = 0 diff --git a/test/broker/08-ssl-connect-no-identity.py b/test/broker/08-ssl-connect-no-identity.py index fcb8f4fc..8bbff40c 100755 --- a/test/broker/08-ssl-connect-no-identity.py +++ b/test/broker/08-ssl-connect-no-identity.py @@ -35,7 +35,7 @@ try: ssock = ssl.wrap_socket(sock, ca_certs="../ssl/test-root-ca.crt", cert_reqs=ssl.CERT_REQUIRED) ssock.settimeout(20) ssock.connect(("localhost", port1)) - + mosq_test.do_send_receive(ssock, connect_packet, connack_packet, "connack") rc = 0 diff --git a/test/broker/11-message-expiry.py b/test/broker/11-message-expiry.py index 6523e827..de109eb0 100755 --- a/test/broker/11-message-expiry.py +++ b/test/broker/11-message-expiry.py @@ -76,7 +76,7 @@ try: broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) time.sleep(7) - + sock = mosq_test.do_client_connect(connect_packet, connack2_packet, timeout=20, port=port) packet = sock.recv(len(publish2s_packet)) for i in range(100, 1, -1): diff --git a/test/broker/12-prop-assigned-client-identifier.py b/test/broker/12-prop-assigned-client-identifier.py index 485692d6..f292eafd 100755 --- a/test/broker/12-prop-assigned-client-identifier.py +++ b/test/broker/12-prop-assigned-client-identifier.py @@ -35,7 +35,7 @@ def do_test(clean_start): if connack_recvd[0:12] == connack_packet[0:12]: # FIXME - this test could be tightened up a lot rc = 0 - + sock.close() except mosq_test.TestError: pass diff --git a/test/broker/c/auth_plugin_msg_params.c b/test/broker/c/auth_plugin_msg_params.c index ccb41516..eb81bf28 100644 --- a/test/broker/c/auth_plugin_msg_params.c +++ b/test/broker/c/auth_plugin_msg_params.c @@ -60,7 +60,7 @@ int mosquitto_auth_acl_check(void *user_data, int access, struct mosquitto *clie abort(); return MOSQ_ERR_ACL_DENIED; } - + return MOSQ_ERR_SUCCESS; } diff --git a/test/broker/c/mosquitto_plugin_v2.h b/test/broker/c/mosquitto_plugin_v2.h index 5b5aca81..f6ed10e1 100644 --- a/test/broker/c/mosquitto_plugin_v2.h +++ b/test/broker/c/mosquitto_plugin_v2.h @@ -4,12 +4,12 @@ Copyright (c) 2012-2014 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License 2.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at https://www.eclipse.org/legal/epl-2.0/ and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + Contributors: Roger Light - initial implementation and documentation. */ @@ -157,7 +157,7 @@ int mosquitto_auth_plugin_cleanup(void *user_data, struct mosquitto_auth_opt *au */ int mosquitto_auth_security_init(void *user_data, struct mosquitto_auth_opt *auth_opts, int auth_opt_count, bool reload); -/* +/* * Function: mosquitto_auth_security_cleanup * * Called when the broker cleans up the security functions when it shuts down. diff --git a/test/lib/Makefile b/test/lib/Makefile index 93603f5b..65d49ca2 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -16,10 +16,10 @@ test : c cpp test-compile : test-compile-c test-compile-cpp -test-compile-c : +test-compile-c : $(MAKE) -C c -test-compile-cpp : +test-compile-cpp : $(MAKE) -C cpp c : test-compile @@ -75,6 +75,6 @@ endif ./11-prop-recv-qos1.py $@/11-prop-recv-qos1.test ./11-prop-recv-qos2.py $@/11-prop-recv-qos2.test -clean : +clean : $(MAKE) -C c clean $(MAKE) -C cpp clean diff --git a/test/lib/c/02-subscribe-qos1-async1.c b/test/lib/c/02-subscribe-qos1-async1.c index 8e76e881..9b0c9d33 100644 --- a/test/lib/c/02-subscribe-qos1-async1.c +++ b/test/lib/c/02-subscribe-qos1-async1.c @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) printf("loop_start failed: %s\n", mosquitto_strerror(rc)); return rc; } - + rc = mosquitto_connect_async(mosq, "localhost", port, 60); if(rc){ printf("connect_async failed: %s\n", mosquitto_strerror(rc)); diff --git a/test/lib/c/02-subscribe-qos1-async2.c b/test/lib/c/02-subscribe-qos1-async2.c index 8339eaac..7fb1533c 100644 --- a/test/lib/c/02-subscribe-qos1-async2.c +++ b/test/lib/c/02-subscribe-qos1-async2.c @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) if(rc){ printf("loop_start failed: %s\n", mosquitto_strerror(rc)); } - + /* 50 millis to be system polite */ struct timespec tv = { 0, 50e6 }; while(should_run){ diff --git a/test/old/msgsps_pub.c b/test/old/msgsps_pub.c index d1c99f35..534d66ad 100644 --- a/test/old/msgsps_pub.c +++ b/test/old/msgsps_pub.c @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) struct mosquitto *mosq; int i; uint8_t buf[MESSAGE_SIZE]; - + mosquitto_lib_init(); mosq = mosquitto_new(NULL, true, NULL); diff --git a/test/random/Makefile b/test/random/Makefile index 87477d46..340e039f 100644 --- a/test/random/Makefile +++ b/test/random/Makefile @@ -19,7 +19,7 @@ auth_plugin.so : auth_plugin.c ../lib/libmosquitto.a : $(MAKE) -C ../../lib libmosquitto.a -clean : +clean : -rm -f *.o random_client *.gcda *.gcno test : all diff --git a/test/random/random_client.py b/test/random/random_client.py index 6206485a..3838b37f 100755 --- a/test/random/random_client.py +++ b/test/random/random_client.py @@ -26,7 +26,7 @@ import time # * 4431 - encrypted MQTT over WebSockets with password authentication # * 4432 - encrypted MQTT over WebSockets with plugin authentication # * 4433 - encrypted MQTT over WebSockets with password and plugin authentication -# +# # The client randomly picks: # * A port out of the list # * Whether to use encryption diff --git a/test/ssl/gen.sh b/test/ssl/gen.sh index 4a0e4a81..bf15d52c 100755 --- a/test/ssl/gen.sh +++ b/test/ssl/gen.sh @@ -43,25 +43,25 @@ rm -f test-alt-ca.csr # Valid server key and certificate. openssl genrsa -out server.key 2048 openssl req -new -key server.key -out server.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=localhost/" -openssl ca -batch -config openssl.cnf -name CA_signing -out server.crt -infiles server.csr +openssl ca -batch -config openssl.cnf -name CA_signing -out server.crt -infiles server.csr rm -f server.csr # Expired server certificate openssl genrsa -out server-expired.key 2048 openssl req -new -key server-expired.key -out server-expired.csr -config openssl.cnf -subj "${SBASESUBJ}-expired/CN=localhost/" -openssl ca -batch -config openssl.cnf -name CA_signing -days 1 -startdate 120820000000Z -enddate 120821000000Z -out server-expired.crt -infiles server-expired.csr +openssl ca -batch -config openssl.cnf -name CA_signing -days 1 -startdate 120820000000Z -enddate 120821000000Z -out server-expired.crt -infiles server-expired.csr rm -f server-expired.csr # Valid client key and certificate. openssl genrsa -out client.key 2048 openssl req -new -key client.key -out client.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=test client/" -openssl ca -batch -config openssl.cnf -name CA_signing -out client.crt -infiles client.csr +openssl ca -batch -config openssl.cnf -name CA_signing -out client.crt -infiles client.csr rm -f client.csr # Expired client certificate openssl genrsa -out client-expired.key 2048 openssl req -new -key client-expired.key -out client-expired.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=test client expired/" -openssl ca -batch -config openssl.cnf -name CA_signing -days 1 -startdate 120820000000Z -enddate 120821000000Z -out client-expired.crt -infiles client-expired.csr +openssl ca -batch -config openssl.cnf -name CA_signing -days 1 -startdate 120820000000Z -enddate 120821000000Z -out client-expired.crt -infiles client-expired.csr rm -f client-expired.csr # Empty CRL file @@ -70,7 +70,7 @@ openssl ca -batch -config openssl.cnf -name CA_signing -gencrl -out crl-empty.pe # Revoked client certificate openssl genrsa -out client-revoked.key 2048 openssl req -new -key client-revoked.key -out client-revoked.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=test client revoked/" -openssl ca -batch -config openssl.cnf -name CA_signing -out client-revoked.crt -infiles client-revoked.csr +openssl ca -batch -config openssl.cnf -name CA_signing -out client-revoked.crt -infiles client-revoked.csr openssl ca -batch -config openssl.cnf -name CA_signing -revoke client-revoked.crt openssl ca -batch -config openssl.cnf -name CA_signing -gencrl -out crl.pem rm -f client-revoked.csr diff --git a/test/ssl/openssl.cnf b/test/ssl/openssl.cnf index 0612f44b..fc6fd845 100644 --- a/test/ssl/openssl.cnf +++ b/test/ssl/openssl.cnf @@ -15,7 +15,7 @@ oid_section = new_oids # To use this configuration file with the "-extfile" option of the # "openssl x509" utility, name here the section containing the # X.509v3 extensions to use: -# extensions = +# extensions = # (Alternatively, use a configuration file that has only # X.509v3 extensions in its main [= default] section.) @@ -168,7 +168,7 @@ x509_extensions = v3_ca # The extentions to add to the self signed cert # input_password = secret # output_password = secret -# This sets a mask for permitted string types. There are several options. +# This sets a mask for permitted string types. There are several options. # default: PrintableString, T61String, BMPString. # pkix : PrintableString, BMPString (PKIX recommendation before 2004) # utf8only: only UTF8Strings (PKIX recommendation after 2004). diff --git a/test/unit/Makefile b/test/unit/Makefile index 3faf173b..d548f080 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -180,7 +180,7 @@ test-broker : build test : test-broker test-lib -clean : +clean : -rm -rf mosq_test bridge_topic_test persist_read_test persist_write_test -rm -rf *.o *.gcda *.gcno coverage.info out/ diff --git a/test/unit/bridge_topic_test.c b/test/unit/bridge_topic_test.c index 03907ba4..ddaa55d7 100644 --- a/test/unit/bridge_topic_test.c +++ b/test/unit/bridge_topic_test.c @@ -1,6 +1,6 @@ #include "config.h" #include - + #include #include diff --git a/test/unit/persist_read_test.c b/test/unit/persist_read_test.c index 2bac2d44..84d55c3b 100644 --- a/test/unit/persist_read_test.c +++ b/test/unit/persist_read_test.c @@ -574,7 +574,7 @@ static void TEST_v6_client(void) memset(&config, 0, sizeof(struct mosquitto__config)); memset(&listener, 0, sizeof(struct mosquitto__listener)); db.config = &config; - + listener.port = 1883; config.per_listener_settings = true; config.listeners = &listener; diff --git a/test/unit/subs_test.c b/test/unit/subs_test.c index a596e8bc..a46b305a 100644 --- a/test/unit/subs_test.c +++ b/test/unit/subs_test.c @@ -63,7 +63,7 @@ static void TEST_sub_add_single(void) CU_ASSERT_PTR_NOT_NULL(db.subs); if(db.subs){ sub = db.subs; - + hier_quick_check(&sub, NULL, ""); hier_quick_check(&sub, NULL, ""); hier_quick_check(&sub, NULL, "a"); diff --git a/test/unit/test.c b/test/unit/test.c index c59a7461..143ccb16 100644 --- a/test/unit/test.c +++ b/test/unit/test.c @@ -1,6 +1,6 @@ #include "config.h" #include - + #include #include diff --git a/www/pages/documentation/dynamic-security.md b/www/pages/documentation/dynamic-security.md index 89884cb0..a84f8589 100644 --- a/www/pages/documentation/dynamic-security.md +++ b/www/pages/documentation/dynamic-security.md @@ -167,7 +167,7 @@ messages on a specific topic within that hierarchy like 'topic/secret'. The different events have ACL types associated with them, and it is these ACLs that you will add to your roles. Each ACL has a `topic`, a `priority`, and can -be set to `allow` or `deny`. +be set to `allow` or `deny`. The `publishClientSend` and `publishClientReceive` ACL types map directly to the events of the same name. The topic can contain wildcards, so allowing send @@ -499,7 +499,7 @@ The initial configuration sets the default ACL type behaviours to: * `subscribe`: deny * `unsubscribe`: allow -If you wish to change these, use `mosquitto_ctrl`. +If you wish to change these, use `mosquitto_ctrl`. ``` mosquitto_ctrl dynsec setDefaultACLAccess publishClientSend deny diff --git a/www/posts/2018/08/updated-debian-repository-backend.md b/www/posts/2018/08/updated-debian-repository-backend.md index 093dfa85..9541d543 100644 --- a/www/posts/2018/08/updated-debian-repository-backend.md +++ b/www/posts/2018/08/updated-debian-repository-backend.md @@ -3,9 +3,9 @@ .. slug: updated-debian-repository-backend .. date: 2018-08-08 23:00:43 UTC+01:00 .. tags: Packaging -.. category: -.. link: -.. description: +.. category: +.. link: +.. description: .. type: text --> diff --git a/www/posts/2018/08/version-151-released.md b/www/posts/2018/08/version-151-released.md index cb81505a..4bc92906 100644 --- a/www/posts/2018/08/version-151-released.md +++ b/www/posts/2018/08/version-151-released.md @@ -3,9 +3,9 @@ .. slug: version-151-released .. date: 2018-08-16 17:01:08 UTC+01:00 .. tags: Releases -.. category: -.. link: -.. description: +.. category: +.. link: +.. description: .. type: text --> diff --git a/www/posts/2018/09/version-152-released.md b/www/posts/2018/09/version-152-released.md index f1f4924e..fe47204e 100644 --- a/www/posts/2018/09/version-152-released.md +++ b/www/posts/2018/09/version-152-released.md @@ -3,9 +3,9 @@ .. slug: version-152-released .. date: 2018-09-19 18:18:36 UTC+01:00 .. tags: Releases -.. category: -.. link: -.. description: +.. category: +.. link: +.. description: .. type: text --> diff --git a/www/posts/2018/11/mqtt5-progress.md b/www/posts/2018/11/mqtt5-progress.md index 2b27e821..c2221b42 100644 --- a/www/posts/2018/11/mqtt5-progress.md +++ b/www/posts/2018/11/mqtt5-progress.md @@ -3,9 +3,9 @@ .. slug: mqtt5-progress .. date: 2018-11-29 21:33:29 UTC+00:00 .. tags: MQTT5 -.. category: -.. link: -.. description: +.. category: +.. link: +.. description: .. type: text --> @@ -56,4 +56,4 @@ mosquitto_pub -t topic -m '{"key":"value"}' -D publish content-type "application Further updates will be posted when more features are available. [repository]: https://github.com/eclipse/mosquitto/tree/mqtt5 -[roadmap]: https://mosquitto.org/roadmap/ \ No newline at end of file +[roadmap]: https://mosquitto.org/roadmap/ diff --git a/www/posts/2018/11/version-154-released.md b/www/posts/2018/11/version-154-released.md index 7d0c9dd5..8b30f5f8 100644 --- a/www/posts/2018/11/version-154-released.md +++ b/www/posts/2018/11/version-154-released.md @@ -3,9 +3,9 @@ .. slug: version-154-released .. date: 2018-11-08 15:00:26 UTC+00:00 .. tags: Releases -.. category: -.. link: -.. description: +.. category: +.. link: +.. description: .. type: text --> diff --git a/www/posts/2018/12/version-155-released.md b/www/posts/2018/12/version-155-released.md index b2d5f96e..95359cb2 100644 --- a/www/posts/2018/12/version-155-released.md +++ b/www/posts/2018/12/version-155-released.md @@ -3,9 +3,9 @@ .. slug: version-155-released .. date: 2018-12-11 15:57:18 UTC+00:00 .. tags: Releases -.. category: -.. link: -.. description: +.. category: +.. link: +.. description: .. type: text --> diff --git a/www/posts/2019/02/version-1-5-6-released.md b/www/posts/2019/02/version-1-5-6-released.md index d5f58bde..27582620 100644 --- a/www/posts/2019/02/version-1-5-6-released.md +++ b/www/posts/2019/02/version-1-5-6-released.md @@ -41,7 +41,7 @@ If a client publishes a retained message to a topic that they have access to, and then their access to that topic is revoked, the retained message will still be delivered to future subscribers. This behaviour may be undesirable in some applications, so a configuration option `check_retain_source` has been -introduced to enforce checking of the retained message source on publish. +introduced to enforce checking of the retained message source on publish. Patches for older versions are available at diff --git a/www/posts/2019/04/version-1-6-released.md b/www/posts/2019/04/version-1-6-released.md index a5e521be..33b69660 100644 --- a/www/posts/2019/04/version-1-6-released.md +++ b/www/posts/2019/04/version-1-6-released.md @@ -79,7 +79,7 @@ version 2.0. # Changelog -The more detailed changelog is below, but does not include many of the +The more detailed changelog is below, but does not include many of the fixes and improvements that have been made: ## Broker features diff --git a/www/posts/2020/05/version-1-6-10-released.md b/www/posts/2020/05/version-1-6-10-released.md index 7ad63d95..0ac4d00c 100644 --- a/www/posts/2020/05/version-1-6-10-released.md +++ b/www/posts/2020/05/version-1-6-10-released.md @@ -25,7 +25,7 @@ Mosquitto 1.6.10 has been released, this is a bugfix release. native version. Closes [#1684]. - Fix possible assert crash associated with bridge reconnecting when compiled without epoll support. Closes [#1700]. - + # Client library - Don't treat an unexpected PUBACK, PUBREL, or PUBCOMP as a fatal error. Issue [#1629]. diff --git a/www/posts/2020/06/mosquitto-ubuntu-appliance.md b/www/posts/2020/06/mosquitto-ubuntu-appliance.md index a00ad7f1..82fcd68d 100644 --- a/www/posts/2020/06/mosquitto-ubuntu-appliance.md +++ b/www/posts/2020/06/mosquitto-ubuntu-appliance.md @@ -2,7 +2,7 @@ .. title: Mosquitto now an Ubuntu Appliance .. slug: mosquitto-now-an-ubuntu-appliance .. date: 2020-06-16 16:01:13 UTC+01:00 -.. tags: +.. tags: .. category: news .. link: .. description: diff --git a/www/posts/2020/06/test-mosquitto-org-cert-updated.md b/www/posts/2020/06/test-mosquitto-org-cert-updated.md index 611209fc..70ffc710 100644 --- a/www/posts/2020/06/test-mosquitto-org-cert-updated.md +++ b/www/posts/2020/06/test-mosquitto-org-cert-updated.md @@ -10,7 +10,7 @@ --> The CA certificate and server certificate for the broker running at -[test.mosquitto.org] has been updated to use a stronger key. +[test.mosquitto.org] has been updated to use a stronger key. This means that if you have downloaded the CA certificate, you will need to do so again. diff --git a/www/posts/2021/01/version-2-0-5-released.md b/www/posts/2021/01/version-2-0-5-released.md index e7d06d58..a94cb0c1 100644 --- a/www/posts/2021/01/version-2-0-5-released.md +++ b/www/posts/2021/01/version-2-0-5-released.md @@ -35,7 +35,7 @@ Version 2.0.5 of Mosquitto has been released. This is a bugfix release. # Build - `install` Makefile target should depend on `all`, not `mosquitto`, to ensure that man pages are always built. Closes [#1989]. -- Fixes for lots of minor build warnings highlighted by Visual Studio. +- Fixes for lots of minor build warnings highlighted by Visual Studio. # Apps - Disallow control characters in mosquitto_passwd usernames.