d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,909 Commits 1 Branch 0 Tags 11 MiB
762ad432e8
Commit Graph

584 Commits

Author SHA1 Message Date
Roger A. Light
5d02f58151 Fix reconnect delay backoff behaviour. 
Closes #1027. Thanks to Harm Verhagen.

Bug: https://github.com/eclipse/mosquitto/issues/1027
 2018-12-04 17:19:31 +00:00
Roger A. Light
e169f1c7c2 When using ADNS, don't ask for all network protocols when connecting. 
This can lead to confusing "Protocol not supported" errors if the
network is down, because UDP sockets are provided.

Thanks to jsaak.

Closes #1062.

Bug: https://github.com/eclipse/mosquitto/issues/1062
 2018-12-04 12:39:00 +00:00
Roger A. Light
867fe80e0e Properties are now freed after the callback. 2018-11-29 16:51:48 +00:00
Roger A. Light
1b854e250e Function for copying property lists. 2018-11-28 17:09:17 +00:00
Roger A. Light
d5108956bf Process session-expiry-interval on CONNECT and DISCONNECT. 
Add test to check for invalid values.
 2018-11-27 12:23:21 +00:00
Roger A. Light
54db895cb3 Rename clean_session to clean_start for v5. 2018-11-27 10:02:10 +00:00
Roger A. Light
0123ff1efe Rename *_with_properties() -> *_v5(). 2018-11-22 18:55:04 +00:00
Roger Light
f809ecbcbe Add DISCONNECT handling to library. 2018-11-22 18:13:18 +00:00
Roger Light
236e967161 Pass properties when disconnecting clients. 2018-11-22 18:09:31 +00:00
Roger Light
f7dc097f82 Move client disconnect code to own function. 2018-11-22 17:31:17 +00:00
Roger Light
3cb8a52ef3 Add reason code to mosquitto_disconnect_with_properties() 2018-11-22 16:56:17 +00:00
Roger Light
14c2f528cf Add reason code to send__disconnect(). 2018-11-22 16:52:39 +00:00
Roger A. Light
d64ce2e242 Make mosquitto_reason_string public. 2018-11-22 10:17:16 +00:00
Roger A. Light
94631ae68b Don't free properties any more, we use them. 2018-11-20 17:54:44 +00:00
Roger A. Light
59b3fdfdf8 Add client property value reading functions. 2018-11-20 17:54:26 +00:00
Roger A. Light
158189393e Add v5 client callbacks. 2018-11-20 14:36:18 +00:00
Roger A. Light
098a1c8ecf Fix subscribe_multiple datatypes. 2018-11-13 14:05:03 +00:00
Roger A. Light
beb96c6b8b Merge branch 'master' into develop 2018-11-11 21:41:44 +00:00
Roger A. Light
e81db23ce4 Bump version number. 2018-11-08 12:12:27 +00:00
Roger A. Light
71b8c4d892 Fix TLS connections when using an external event loop. 
Affects the use of mosquitto_loop_read() and mosquitto_write().
Closes #990.
 2018-11-07 21:08:10 +00:00
Iblis Lin
0368a8c01d add socket headers for FreeBSD 
Signed-off-by: Iblis Lin <iblis@hs.ntnu.edu.tw>
 2018-11-07 10:28:26 +00:00
Bartosz Taczała
e86b27a2da Adding support for QNX7.0.0 
Change-Id: Id01e2880aa5cadc0e93a46b95fe675e1938051fa
Signed-off-by: Bartosz Taczała <bartosz.taczala@mobica.com>
 2018-11-06 23:11:09 +00:00
Roger A. Light
f77c1ca91b private struct mqtt5__property -> public mosquitto_property. 2018-11-01 23:50:54 +00:00
Roger A. Light
f9e0fa246a Validate properties coming into client library. 2018-11-01 18:53:06 +00:00
Roger A. Light
8aa936936e Library and client support for topic-alias. 2018-11-01 15:47:21 +00:00
Roger A. Light
de3a9af1f7 Client+library support for unsubscribe properties. 2018-11-01 14:12:52 +00:00
Roger A. Light
741a8a9cc3 Client disconnect property support, plus disconnect packet fix. 2018-11-01 11:57:47 +00:00
Roger A. Light
383608613a Client+lib will property support. 2018-11-01 11:37:57 +00:00
Roger A. Light
12cba75c73 Client support for adding properties. 2018-10-31 12:38:39 +00:00
Roger A. Light
b462115fa6 Add reason code to PUBACK/REC/REL/COMP. 2018-10-31 08:24:28 +00:00
Roger A. Light
ba874c6014 Merge branch 'mqtt5' of gitlab.com:ralight/mosquitto-private into mqtt5 2018-10-30 14:58:57 +00:00
Roger A. Light
446ad6290a Add mosquitto_string_to_property_info. 2018-10-30 11:54:36 +00:00
Roger A. Light
c19b3598c0 Add mosquitto_string_to_command. 2018-10-30 11:40:06 +00:00
Roger A. Light
63a479564b Add mosquitto_property_command_check() 2018-10-30 11:32:37 +00:00
Roger A. Light
636e813d1c Load of constant renames ahead of making mqtt_protocol.h public. 2018-10-30 11:11:31 +00:00
Roger A. Light
9eebcf6704 Rename property__free_all->mosquitto_property_free_all 
Make public function.
 2018-10-30 10:16:42 +00:00
Roger A. Light
be5602be28 Add sections to mosquitto.h. 2018-10-30 10:03:08 +00:00
Roger A. Light
5aa983c210 Fix copy/paste error. 2018-10-25 20:41:34 +01:00
Roger A. Light
b6c667689d Write properties for all commands apart from AUTH. 2018-10-25 13:21:42 +01:00
Roger A. Light
8077376a79 Add read support for AUTH packets. 2018-10-25 12:54:17 +01:00
Roger A. Light
ca40255720 mid == 0 is a protocol error. 2018-10-25 12:12:57 +01:00
Roger A. Light
eefa7f7604 All existing commands read properties. 2018-10-25 12:11:00 +01:00
Roger A. Light
723d9c2782 Check whether properties are on the correct commands. 2018-10-25 11:23:04 +01:00
Roger A. Light
267178bd99 User properties are copied from PUBLISH to PUBLISH. 2018-10-25 10:24:19 +01:00
Roger A. Light
0baf358cf8 Add properties member to will struct. 2018-10-24 14:07:09 +01:00
majekw
7f1419e4de Fix mosquitto_pub -l if compiled using cmake. 
Since dde005ef92 mosquito_pub is throwing error
that 'threading support has not been compiled' when compiled using cmake.
It looks like WITH_THREADING flag is not set at top level Makefile and used
only in lib/ directory, so library is correctly compiled with threading.
But for client this flag is undefined, so it gives error on '-l' option.

This commit moves part related to WITH_THREADING flag out of lib/CMakeLists.txt
to top levele CMakeLists.txt, so it could be accessible to all subdirectories.

Signed-off-by: Marek Wodzinski <majek@w7i.pl>
 2018-10-23 18:56:00 +01:00
Roger A. Light
0a9ee5b4cf Fix memory leak when reconnecting with TLS errors. 
Fix memory leak that occurred if mosquitto_reconnect() was used when TLS
errors were present.

Closes #592. Thanks to smartdabao and aaronovz1.
 2018-10-23 10:46:55 +01:00
Roger A. Light
35dea07dcd Merge branch 'master' 2018-10-23 10:39:20 +01:00
Roger A. Light
40ed672ecf Fix topic matching tests and function. 2018-10-16 22:49:13 +01:00
Roger A. Light
77099bb58c Add property write tests. 2018-10-16 21:32:13 +01:00
Roger A. Light
4daaaaf4a7 Add property writing support, untested. 2018-10-16 14:35:37 +01:00
Roger A. Light
262ac3fb5b Fix varint length reporting. 2018-10-10 17:53:19 +01:00
Roger A. Light
6609bbac10 Move topic matching tests to unit tests. Needs improving. 2018-10-10 17:52:41 +01:00
Roger A. Light
c0ff424082 Add property__get_length_all() and property__get_length(). 
For getting the number of bytes needed for writing a property list.
 2018-10-10 14:50:30 +01:00
Roger A. Light
8210c1fa7a All outgoing packets now write property length for MQTT 5. 
At the moment this only writes a 0 property length, i.e. no properties.
It does mean that output packets are more correct than before.
 2018-10-10 12:42:27 +01:00
Roger A. Light
e5eb03b2e6 Allow building without shared library. 2018-10-07 00:56:42 +01:00
Roger A. Light
abb3fee1f8 Coverage reporting for whole broker. 2018-10-06 21:56:48 +01:00
Roger A. Light
8e793f68e1 Simplify prop validation. 2018-10-04 22:58:46 +01:00
Roger A. Light
bc1caedc32 Some property string read tests. 2018-10-04 22:49:34 +01:00
Roger A. Light
f59526a014 Property read in16 tests. 2018-10-04 21:16:46 +01:00
Roger A. Light
e14b613a02 Property read int32 tests. 2018-10-04 19:04:21 +01:00
Roger A. Light
f4b2838574 Property reading, and tests for byte properties. 2018-10-04 17:18:57 +01:00
Roger A. Light
05b40b90db Add reason strings. 2018-10-04 12:43:43 +01:00
Roger A. Light
75b6851c76 Property identifer is a varint. 2018-10-04 10:44:11 +01:00
Roger A. Light
572be268e5 Fix signedness of varint reading. 2018-10-04 09:53:30 +01:00
Roger A. Light
366744bad7 Fix subscribe_multiple datatypes. 2018-10-04 09:46:51 +01:00
Roger A. Light
c9d9ad8e72 UTF-8 validation tests and fixes. 2018-10-04 09:03:54 +01:00
Roger A. Light
72131c84ce Binary data read functions and tests. 2018-10-03 21:35:33 +01:00
Roger A. Light
debf7493ad UTF-8 validation tests and fixes. 2018-10-03 18:42:15 +01:00
Roger A. Light
400db91166 Handle UTF-8 validation in packet__read_string. 2018-10-03 15:04:24 +01:00
Roger A. Light
b6b8da1fa6 Variable Byte Integer reading tests. 2018-10-03 11:57:20 +01:00
Roger A. Light
99a1c0e43a Move simple datatype reading functions to own file. 
This facilitates easier testing.
 2018-10-03 10:23:58 +01:00
Roger A. Light
1488992ea8 Naive reading of MQTT 5 properties. No processing done. 2018-10-02 16:43:40 +01:00
Roger A. Light
17b3709790 Fix varint reading. 2018-10-02 14:07:23 +01:00
Roger Light
6c9e8d51c2 Merge branch 'develop' into mqtt5 2018-10-02 11:28:03 +01:00
Roger A. Light
1867f30785 Merge branch 'master' 
Conflicts:
	ChangeLog.txt
 2018-10-02 08:31:54 +01:00
Roger A. Light
cf9a72d8db Add mosquitto_subscribe_multiple. 2018-09-27 22:05:15 +01:00
Roger A. Light
c78003cacf Bump version number, add CVE details. 2018-09-25 16:26:28 +01:00
Roger A. Light
f9c9f3d396 Fix incorrect hash usage with duplicate clients. 
Fix duplicate clients being added to by_id hash before the old client
was removed.

Closes #645.
 2018-09-25 14:25:54 +01:00
Roger A. Light
59bd07627d Various build improvements to help packaging. 2018-09-25 14:25:54 +01:00
Roger A. Light
dd0e0d91b0 Fix build on Windows. 2018-09-20 10:38:35 +01:00
Roger A. Light
3f87232065 Bump version number. 2018-09-19 18:09:43 +01:00
Roger A. Light
4ee6941188 Primitive v5 CONNACK support - no properties. 2018-09-19 11:13:50 +01:00
Roger A. Light
561513fdd4 Very simple v5 CONNECT support - no properties. 2018-09-19 11:00:15 +01:00
Roger A. Light
ccc97d8c96 Function for reading variable length ints from packet. 2018-09-19 10:59:57 +01:00
Roger A. Light
33a523eea9 Add identifiers for v5. 
Clients know about v5, just need library support...
 2018-09-19 10:59:41 +01:00
Roger A. Light
a127c93a5a Property identifiers. 2018-09-19 10:59:31 +01:00
Roger A. Light
99c6ec7f6e Protocol name will never be changed from MQTT. 2018-09-19 10:58:36 +01:00
Roger A. Light
5dc88fe8f3 Add v5 return codes 2018-09-19 10:58:23 +01:00
Roger A. Light
0bacff11df Rename mqtt3_protocol.h -> mqtt_protocol.h. 2018-09-19 10:58:12 +01:00
Roger A. Light
48f096bc1c Read/write new 32 bit ints from packets. 2018-09-19 10:57:16 +01:00
Michael Heimpold
a459e93498 Install pkg-config files also for non-CMake builds 
At the moment, pkg-config hint files are only installed when CMake is
used as build system. However, it is very convenient for programs using
libmosquitto to have these files always in place, so let's add it
here, too.

Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com>
 2018-09-18 15:25:22 +01:00
Fredrik Fornwall
915e91d9be Fix build with OPENSSL_NO_ENGINE 
Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
 2018-09-18 15:02:32 +01:00
Roger A. Light
ae45bd3d40 Update changelog and fixes to #927 PR. 2018-09-18 14:57:13 +01:00
yzhivik
96e62d596f fix SOCKS5 username and password set 
fix SOCKS5 request wrt IP4/IP6/FQDN

Signed-off-by: yzhivik <yuriy.zhyvytsya@gmail.com>
 2018-09-18 14:34:31 +01:00
Roger A. Light
a9da3c263d Bump version number. 
Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-16 17:01:08 +01:00
Roger A. Light
4ccc68d2df Revert incorrect change. 2018-08-16 11:33:06 +01:00
Roger A. Light
9d30625622 Build fix for Windows. 2018-08-16 11:16:16 +01:00
Roger A. Light
88765a5e80 Consistent use of config.h across the project. 2018-08-16 11:14:51 +01:00
Roger A. Light
a199cac69e Don't confuse expiring and duplicate clients. 2018-08-15 17:27:59 +01:00
Roger A. Light
0ec090f31a Fixes for building on FreeBSD. 2018-08-15 17:02:56 +01:00
Roger A. Light
10b19a42ed Fixes for building on NetBSD. 
Closes #258.

Thanks to Daniel Ölschlegel.
 2018-08-09 15:21:40 +01:00
Roger A. Light
c757cb0912 Remove incorrect comment. 2018-08-09 15:01:39 +01:00
Roger A. Light
e185d18917 Better fix for #851. 
Ensure all sockets that are closed are set to INVALID_SOCKET.

Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-08 15:23:03 +01:00
Roger A. Light
7f0b4d6271 Fix connection problems when using mosquitto_connect_async(). 
The connection wouldn't always complete if mosquitto_loop_start() was
called before mosquitto_connect_async(). Closes #848.

Thanks to Ian Gough.

Bug: https://github.com/eclipse/mosquitto/issues/848

Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-08 09:21:19 +01:00
Roger A. Light
575dce91f0 Fix segfault on startup if bridge CA certificates could not be read. 
Closes #851.

Thanks to chelliwell.

Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-02 15:06:09 +01:00
Roger A. Light
4bacbecb1b Fix some places where return codes were incorrect. 
Closes #850.

Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-02 14:41:04 +01:00
Roger A. Light
bcf76b9cb6 Remove use of AI_ADDRCONFIG. 
Closes #869, #901.

Thanks to Alex Richman.

Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-02 01:11:31 +01:00
Roger A. Light
286400abcf Use AF_UNSPEC etc. instead of PF_UNSPEC to comply with POSIX. 
Closes #863.

Thanks to denigmus and Patrick TJ McPhee.

Signed-off-by: Roger A. Light <roger@atchoo.org>
 2018-08-02 00:27:52 +01:00
Roger A. Light
5e60136449 Merge branch 'develop' 2018-05-03 07:55:45 +01:00
Roger A. Light
e9d03c8ffd Merge branch 'fixes' 2018-05-02 22:33:27 +01:00
Roger A. Light
84520296fa Bump version number. 2018-05-02 22:33:05 +01:00
Roger A. Light
e90a32835b Merge branch 'fixes' into develop 2018-05-02 22:24:49 +01:00
Roger A. Light
8410a19335 Add fallback case for libressl. 2018-05-02 21:51:08 +01:00
Roger A. Light
6c7ecd7e97 Fix compiling without TLS. 2018-05-02 21:04:42 +01:00
Roger A. Light
79a7b36d20 Don't derefence a null message. 2018-04-19 20:53:38 +01:00
Roger A. Light
b2bb48ac2b Reference counting for openssl 1.0.2. 2018-04-16 22:39:37 +01:00
Roger A. Light
57ee8b92bc Mac build fixes. 2018-04-16 11:48:42 +01:00
Roger A. Light
574fb36ede More utf-8 validation. 2018-04-13 17:42:16 +01:00
Thomas Beckmann (M-Way)
ee610ab19a _mosquitto_net_read must call WSASetLastError when changing errno so that the error code can be picked up by _mosquitto_packet_read 
Signed-off-by: Thomas Beckmann (M-Way) <t.beckmann@mwaysolutions.com>
 2018-04-13 12:09:26 +01:00
Roger A. Light
e961bc9301 Comment to aid init_ssl_ctx understanding. 2018-04-12 21:37:44 +01:00
Roger A. Light
6a2172f472 Windows fixes. 2018-04-12 11:09:02 +01:00
Roger A. Light
2d9fab123e Use SSL_CTX_up_ref() with MOSQ_OPT_SSL_CTX*. 
This limits the use of those options to openssl 1.1.0 and greater.
 2018-04-12 01:15:30 +01:00
Roger A. Light
b649799c78 Protect mosq->ssl_ctx against double initialisation. 2018-04-12 01:11:46 +01:00
Roger A. Light
9852f94ee0 Merge branch 'sub_client_timeout_upstream' of git://github.com/I2SE/mosquitto into I2SE-sub_client_timeout_upstream 2018-04-12 00:20:02 +01:00
Roger A. Light
943b311344 Don't use deprecated openssl functions. 2018-04-11 22:10:48 +01:00
Roger A. Light
c95f24c342 Missing includes. 2018-04-11 21:30:02 +01:00
Roger A. Light
24d68b5af8 Remove support for openssl 1.0.0 and 1.0.1. 
These are no longer supported by openssl.
 2018-04-11 17:12:25 +01:00
Roger A. Light
8470ca89b9 Add MOSQ_OPT_SSL_CTX and MOSQ_OPT_SSL_CTX_WITH_DEFAULTS options. 
Closes #567 and #715.
 2018-04-11 16:34:24 +01:00
Roger A. Light
615d6a2c41 Remove unused file. 2018-04-11 15:27:29 +01:00
Roger A. Light
f4d238be18 Bump copyright years. 2018-04-11 15:24:29 +01:00
Roger A. Light
28dd14fcea Separate out functions from mosquitto.c to aid discoverability. 2018-04-11 15:04:17 +01:00
Roger A. Light
ff79432364 C++ on_connect_with_flags() support. 2018-04-11 14:11:02 +01:00
Roger A. Light
86ced4d98f Add mosquitto_connect_with_flags_callback_set(). 
This allows a second connect callback to be used that exposes the
MQTT connect flags parameter.

Closes #738, #128.
 2018-04-11 14:06:16 +01:00
Thomas Beckmann (M-Way)
8e3c2d9af7 _mosquitto_net_read must call WSASetLastError when changing errno so that the error code can be picked up by _mosquitto_packet_read 
Signed-off-by: Thomas Beckmann (M-Way) <t.beckmann@mwaysolutions.com>
 2018-04-09 22:46:53 +01:00
Roger A. Light
40e6a75709 Use c99 as compiling standard. 
Closes: #765.
 2018-04-06 00:33:22 +01:00
Viktor Gotwig
e90afb8526 Adding tls host name extension (SNI) 
Signed-off-by: Viktor Gotwig <viktor.gotwig@q-loud.de>
 2018-03-13 23:25:28 +00:00
Roger A. Light
5b2bf3d1c1 Bump version number, update copyrights. 2018-02-28 11:15:20 +00:00
Roger A. Light
e6cbff0e94 Fix unauthorised clients being able to cause OOM on connect. 2018-02-24 22:09:19 +00:00
Roger A. Light
927c5d311b Fix missing headers on mac. 2018-02-24 11:15:09 +00:00
Roger A. Light
81cb7ab547 Merge branch 'fixes' into develop 2018-02-13 14:16:47 +00:00
Roger A. Light
9750d1732a Fix builds on travis. 2018-02-13 13:12:03 +00:00
Roger A. Light
c001e778c1 [693] Fix handling of null bytes in received strings. 
Thanks to Umberto Boscolo.

Bug: https://github.com/eclipse/mosquitto/issues/693
 2018-02-13 12:19:34 +00:00
Roger A. Light
1b702538f9 Add check and matches functions which take length arguments. 
mosquitto_pub_topic_check2()
mosquitto_sub_topic_check2()
mosquitto_topic_matches_sub2()
 2018-02-11 21:31:34 +00:00
Roger A. Light
3066f89a24 packet__read_string() returns the string length. 2018-02-11 20:47:17 +00:00
JonoJensen
7d8d04bc39 Fix issue when SSL_connect() returns SSL_ERROR_WANT_READ. A call to SSL_write here will later transmit a new client hello and make ssl connection fail. 
Signed-off-by: JonoJensen <jono.jensen@yahoo.se>
 2018-01-14 23:18:28 +00:00
Michael Heimpold
26a81747cd mosquitto_loop_forever: use nanosleep instead of sleep 
The advantage of nanosleep(2) is, that -according to POSIX spec- it does not
interact with signals as sleep(3) does. So it is not affected when used by a
program which is e.g. using alarm(3).

Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com>
 2018-01-12 14:59:53 +01:00
Roger A. Light
b02c1a41bb [670] Fix topic matching of foo/bar against foo/+/# 
Thanks to mrdis.

Bug: https://github.com/eclipse/mosquitto/issues/670
 2018-01-09 14:36:19 +00:00
Roger A. Light
9c6a5f3cf0 [656] Fix building on Windows. 
Thanks to Arun Kirthi Cherian.

Bug: https://github.com/eclipse/mosquitto/issues/656
 2018-01-06 22:42:40 +00:00
Pierre Fersing
254f30cdb1 Fix mosquitto_want_write for TLS sock connecting 
Copied logic from mosquitto_loop which was already patched by
39ffd6fa.

Bugs: #648
 2018-01-05 15:39:11 +01:00
Roger A. Light
b193918ca0 [649] Don't close socket again if nonblock fails. 
Thanks to Edwin van den Oetelaar.

Bug: https://github.com/eclipse/mosquitto/issues/649
 2017-12-21 21:56:01 +00:00
Roger A. Light
ae666b07ce [654] Initialise "result" in mosquitto_topic_matches_sub. 
Thanks to markhermelinggt.

Bug: https://github.com/eclipse/mosquitto/issues/654
 2017-12-21 08:36:58 +00:00
Michael Heimpold
48dec391f7 Quote ${DESTDIR} usage in various Makefiles 
This prevents failures during make install when whitespace
is part of DESTDIR pathname.

Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com>
 2017-12-01 22:28:26 +00:00
Roger A. Light
b11855821e Update UTF-8 validation checks. 2017-07-30 21:57:43 +01:00
toast-uz
df9ad5f0bd Add Epoll. (#495) 
Signed-off-by: Tatsuzo Osawa <tatsuzo.osawa@gmail.com>
 2017-07-27 18:43:09 +01:00
Roger A. Light
124ee1af91 [490] Further fix for auth related crashes. 
Bug: https://github.com/eclipse/mosquitto/issues/490
 2017-07-27 14:56:10 +01:00
Roger A. Light
22063013be [490] Fix auth plugin+WS client+MOSQ_ERR_AUTH related crash. 
Thanks to "hasunperera".

Bug: https://github.com/eclipse/mosquitto/issues/490
 2017-07-27 00:12:32 +01:00
Roger A. Light
5a267368d7 Merge branch 'master' into develop 2017-07-19 00:15:42 +01:00
Aska.Wu
d40d7772d3 Fix the TLS handshake problem if PSK has leading zero 
Incorrect psk will be provided by psk_server_callback() because leading zero
is skipped by BN_bn2bin() and BN_num_bytes().

Signed-off-by: Aska.Wu <askawu@gmail.com>
 2017-07-18 21:52:29 +01:00
Roger A. Light
d8cc5bc4fe Merge branch 'fixes' of github.com:eclipse/mosquitto into fixes 2017-07-17 22:02:30 +01:00
Zard1096
5b73897f98 Fix iOS crash issues 
Relate to issues #327 and #63.
mosq->sock may be closed before FD_SET(mosq->sock, &writefds) and
FD_ISSET(mosq->sock, &writefds) but after judgement in line 947
if(mosq->sock != INVALID_SOCKET). FD_SET(-1, ...) and FD_ISSET(-1, ...)
would certainly crash.

Signed-off-by: Zard1096 <mr.zardqi@gmail.com>
 2017-07-16 23:22:13 +01:00
Roger A. Light
e74203de2c Merge branch 'master' into develop 2017-07-16 22:52:01 +01:00
Roger A. Light
1fa4d74278 Bump version number. 2017-07-10 23:44:16 +01:00
Dr. Lars Voelker
74adb43cc1 Adding OCSP Stapling support to mosquitto 
Adding OCSP Stapling support to mosquitto, so that the TLS client side
requests the certificate status and checks it.
This code uses the OpenSSL-based OCSP implementation and is somewhat
based on the libcurl code for OCSP stapling.

Signed-off-by: Dr. Lars Voelker <lars.voelker@bmw.de>
 2017-07-07 13:05:17 +02:00
Roger A. Light
6b351ce0f1 Bump version number. 2017-06-27 22:14:08 +01:00
Roger A. Light
2d90a1f45b Fix umask value. 2017-06-27 11:21:34 +01:00
Roger A. Light
94978ac89b Restore old umask after creating file. 2017-06-27 10:53:06 +01:00
Roger A. Light
6e7d02ba16 Fix for CVE-2017-9868 for Windows. 2017-06-26 14:53:33 +01:00
Roger A. Light
326983d35e [417] Fix lazy bridges not timing out for idle_timeout. 
Thanks to spinachmedia.

Bug: https://github.com/eclipse/mosquitto/issues/417
 2017-06-19 17:15:00 +01:00
Roger A. Light
c07ba2a3da Experimental fix for poor websockets performance. 2017-06-18 12:52:59 +01:00
Jan Lukavsky
621f18d696 #419 Broker sometimes kills connection to client 
Signed-off-by: Jan Lukavsky <je.ik@seznam.cz>
 2017-06-11 22:00:45 +01:00
Roger A. Light
b61fefcf08 Merge branch 'master' into develop 2017-05-31 21:05:26 +01:00
Roger A. Light
2897f71aba Bump version number. 2017-05-28 21:53:19 +01:00
Jelle van der Waa
ab266e7f5f lib: fix OpenSSL 1.1 deprecation warning for ERR_remove_state 
ERR_remove_state has been marked deprecated in OpenSSL 1.1.0 and do
nothing, as the OpenSSL libraries now normally do all thread
initialization and deinitialisation automatically.

Signed-off-by: Jelle van der Waa <jelle@vdwaa.nl>
 2017-05-05 22:49:05 +01:00
Roger A. Light
91b308a11d Merge branch 'master' into develop 2017-03-06 21:19:53 +00:00
Roger A. Light
ac981782db Fix typo and use net__print_ssl_error() as available. 2017-03-06 10:58:56 +00:00
Jiří Pinkava
cd0985c3e2 Log more TLS error details 
Signed-off-by: Jiří Pinkava <j-pi@seznam.cz>
 2017-03-06 10:56:45 +00:00
Roger A. Light
bda9893713 Version bump. 2017-02-20 23:48:30 +00:00
Roger A. Light
433ee5c4d6 [344] Don't compile in async dns support by default for makefiles. 2017-02-20 23:48:30 +00:00
Roger A. Light
6f45ab9624 [344] Only do async dns on glibc. 2017-02-20 23:48:30 +00:00
Roger A. Light
5eae4b56d6 [344] More leak fixes. 2017-02-20 23:48:30 +00:00
Roger A. Light
e0e8cc9f3e [344] Fix leaks and incorrect connect call. 2017-02-20 23:48:30 +00:00
Roger A. Light
e13af18ed9 Start of fix for [344]. 2017-02-20 23:48:30 +00:00
Fredrik Fornwall
35cc1eb21e Check for rt and pthread libraries before linking 
This fixes building on Android which does not have separate librt
or libpthread libraries.

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
 2017-02-20 23:48:30 +00:00
Roger A. Light
b5b5e6f27d Don't use reserved identifiers in public headers. 2017-02-20 23:48:30 +00:00
Jens Breitbart
b9d4ebfba3 Fix compiler warnings (unused parameter, additional semicolon). 
A modern version of the clang compiler complained about:
* unused parameters
* additional semicolon
. This commit fixes these warnings.

Signed-off-by: Jens Breitbart <jbreitbart@gmail.com>
 2017-02-20 23:48:30 +00:00
Roger A. Light
8e4a80a928 [329] Fix potential negative timeout being passed to pselect. 
Thanks to Dollars.

Bug: https://github.com/eclipse/mosquitto/issues/329
 2017-02-20 23:48:30 +00:00
Teun Lassche
4dc96a2533 Fix #304 Socket leakage 
Signed-off-by: Teun Lassche <contact@thlassche.nl>
 2017-02-20 23:48:30 +00:00
Roger A. Light
98ea684906 [323] Allow outgoing IPv6 connections to use TLS. 
Bug: https://github.com/eclipse/mosquitto/issues/323
 2017-02-20 23:48:30 +00:00
Roger A. Light
9f32d5c0ac Version bump. 2017-02-20 21:57:45 +00:00
Roger A. Light
e4e81a0fb1 [111] Add mosquitto_userdata function to libmosquitto. 
This allows retrieving mosq->userdata.

Bug: https://github.com/eclipse/mosquitto/issues/111
 2017-02-19 20:45:52 +00:00
Roger A. Light
f0485d1398 [344] Don't compile in async dns support by default for makefiles. 2017-02-08 22:30:00 +00:00
Roger A. Light
3d40ffe18b [344] Only do async dns on glibc. 2017-02-08 15:40:44 +00:00
Roger A. Light
ee543a25f5 [344] More leak fixes. 2017-02-07 16:11:57 +00:00
Roger A. Light
f464970fcf [344] Fix leaks and incorrect connect call. 2017-02-06 23:10:43 +00:00
Roger A. Light
ef7a230365 Start of fix for [344]. 2017-02-06 22:41:34 +00:00
Fredrik Fornwall
532273250c Check for rt and pthread libraries before linking 
This fixes building on Android which does not have separate librt
or libpthread libraries.

Signed-off-by: Fredrik Fornwall <fredrik@fornwall.net>
 2017-01-30 21:00:25 +00:00
Roger A. Light
ef417a6688 Don't use reserved identifiers in public headers. 2017-01-05 21:42:24 +00:00
Jens Breitbart
fbb60d67a7 Fix compiler warnings (unused parameter, additional semicolon). 
A modern version of the clang compiler complained about:
* unused parameters
* additional semicolon
. This commit fixes these warnings.

Signed-off-by: Jens Breitbart <jbreitbart@gmail.com>
 2016-12-10 20:02:19 +00:00
Roger A. Light
2c2ba2cf10 [329] Fix potential negative timeout being passed to pselect. 
Thanks to Dollars.

Bug: https://github.com/eclipse/mosquitto/issues/329
 2016-12-08 21:06:45 +00:00
Teun Lassche
dac29a5a5f Fix #304 Socket leakage 
Signed-off-by: Teun Lassche <contact@thlassche.nl>
 2016-12-04 22:00:53 +00:00
Roger A. Light
6f7a0bff4b [323] Allow outgoing IPv6 connections to use TLS. 
Bug: https://github.com/eclipse/mosquitto/issues/323
 2016-11-30 11:31:30 +00:00
Karl Palsson
c6aac741c2 broker: support byte based queueing 
Limiting queued message depth purely based on message count is hard to
control for memory constrained devices.  The size of messages can vary
wildly, from a few bytes, to a few kilobytes.  Support a new
max_queued_bytes option, and drop packets when the first limit is
reached.  Option defaults to 0 (disabled) by default.
Support also a max_inflight_bytes variable, with similar behaviour.

Fixes (partof) https://github.com/eclipse/mosquitto/issues/100

This pulls up some helper routines for calculating whether to allow
inflight or queuing, resolving some inconsistences in connection
resumption.

Signed-off-by: Karl Palsson <karlp@etactica.com>
 2016-09-09 17:27:39 +00:00
Roger A. Light
87b6a746fd Bump version number. 2016-08-16 22:52:22 +01:00
Roger A. Light
79cc06b180 [237] Fix memory leak when verifying a server certificate. 
Only for certificates with a subjectAltName. Closes #237.

Thanks to MrSaturday.

Bug: https://github.com/eclipse/mosquitto/issues/237
 2016-08-08 21:49:32 +01:00
Roger A. Light
017db6706f Rename mosquitto_broker.h -> mosquitto_broker_internal.h 2016-07-08 10:10:04 +01:00
Roger A. Light
8378fe44cf Update copyrights. 2016-07-08 09:42:24 +01:00
jbwdevries
1c90a4487c Fixes a bug where the C++ wrapper would always claim SOCKS was not supported. (#198) 
The WITH_* flags are not handed over to the C++ wrapper, instead it relies on
the actual library to check status.

Signed-off-by: Johan de Vries (Ubuntu VM) <devries@wivion.nl>
 2016-06-29 17:12:20 +01:00
Roger A. Light
1c3988a397 Merge branch 'master' into develop 2016-06-21 23:33:58 +01:00
Roger A. Light
a8a5daf06b Check client topic inputs for valid UTF-8. 2016-06-20 22:56:01 +01:00
Roger A. Light
fa2d3143a4 Separate the C and C++ static libraries. 2016-06-15 21:11:46 +01:00
Roger A. Light
2286caaca2 Merge branch 'enhance-bare-makefile-static-library-build' of https://github.com/Lance0312/mosquitto into Lance0312-enhance-bare-makefile-static-library-build 2016-06-15 20:59:34 +01:00
Roger A. Light
d90cd585dd Add WITH_STRIP build option. 2016-06-13 21:36:41 +01:00
Roger A. Light
2d0af7309f Bump version number. 2016-06-02 21:32:21 +01:00
Roger A. Light
30686f2dc9 Fix mosquitto_topic_matches_sub(). 2016-06-02 20:53:09 +01:00
Lance Chen
5ccd0dbb80
Add an build option to control building static libraries or not 
The option WITH_STATIC_LIBRARIES is default to yes

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-06-03 01:59:37 +08:00
Lance Chen
97847fa95b
Rename option BUILD_STATIC_LIBRARY to WITH_STATIC_LIBRARIES 
to conform to the bare Makefiles

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-06-03 01:59:10 +08:00
Lance Chen
4b4817c3f0
Build the CPP static library with bare Makefiles 
In order to make the CPP static library include all
objects from the C static library, the list of objects
(MOSQ_OBJS) is isolated into objects.mk to be used for
building the C and CPP static libraries.

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-06-02 18:02:26 +08:00
Lance Chen
a9b7237d09
Install/Uninstall the C static library 
Symbol stripping is done explicitly with strip command,
since stripping with install command removes too many
symbols, making the result library unusable.

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-06-02 18:02:22 +08:00
Roger A. Light
c035913b2a [180] Fix #includes in lib/send_mosq.c 
Ensures that LWS_LIBRARY_VERSION_NUMBER is always present in all source
files when it is defined.

Thanks to dennisip86.

Bug: https://github.com/eclipse/mosquitto/issues/180
 2016-05-31 12:07:10 +01:00
Lance Chen
f18e8e12a8
Add build configuration for CPP static library 
The CPP static library respects options
BUILD_STATIC_LIBRARY and WITH_PIC as well.

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-05-31 17:03:52 +08:00
Lance Chen
aa360e4029
Add an option to control building static library with PIC or not 
The option WITH_PIC is default to OFF.

By default, the static library is built from the
source code directly. If WITH_PIC is enabled, the
static library is built with the same set of
object libraries that the shared library uses.

To link Mosquitto static library into a shared
library, one must enable WITH_PIC to make the
piece of code locatable.

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-05-31 17:03:52 +08:00
Lance Chen
7ee997e6cc
Add an option to control building static library or not 
The BUILD_STATIC_LIBRARY option is default to ON.

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-05-31 17:03:52 +08:00
Lance Chen
b87082c604
Fix fail linking of handle* functions in the shared library 
The shared library fails to link to `handle*` functions
implementd in lib/handle_* because these source file
definitions seem to be removed accidentally in commit
3499c09.

Signed-off-by: Lance Chen <cyen0312@gmail.com>
 2016-05-31 14:53:48 +08:00
Roger A. Light
a187b3f5fa [57] Handle PUB* with unknown message id gracefully. 
Allows message flow to complete where e.g. the broker didn't persist a
partially complete flow.

Thanks to jsaak jsaak and Hiram van Paassen.

Bug: https://github.com/eclipse/mosquitto/issues/57
 2016-05-19 15:16:19 +01:00
Roger A. Light
e8185ddaa7 [166] Don't cancel external threads. 
libmosquitto shouldn't cancel threads it didn't create. This change
allows us to keep track of whether threads were created by the library
or by external code.

Thanks to Josip Ćavar.

Bug: https://github.com/eclipse/mosquitto/issues/166
 2016-05-18 14:05:08 +01:00
Roger A. Light
c6ef86bd1f Print openssl errors when debugging enabled. 2016-05-16 21:57:31 +01:00
Roger Light
dfeb2f9ba6 Merge pull request #141 from PierreF/large-queued-performance-2 
Improve performance with lots of queued message
 2016-05-15 22:31:35 +01:00
Dmitry Kaukov
606aa5b4fa Workaround for Windows SSL (#160) 
Closes #154.

Signed-off-by: Dmitry Kaukov <dkaukov@opentable.com>
 2016-05-14 21:45:02 +01:00
Ian Johnson
a0a0cc3076 Renaming STATIC_LIB -> LIBMOSQUITTO_STATIC 
Signed-off-by: Ian Johnson <ijohnson@wolfram.com>
 2016-04-21 09:51:46 -05:00
Ian Johnson
3499c094dc Putting the list of files into a variable C_SRC and modiftying the add_library calls to use this variable 
Signed-off-by: Ian Johnson <ijohnson@wolfram.com>
 2016-04-19 16:57:44 -05:00
Ian Johnson
93906b9dfd We don't want to add any declaration properties for the static library, as the static library doesn't export or import anything, so when STATIC_LIB is defined the libmosq_EXPORT defines to nothing 
Signed-off-by: Ian Johnson <ijohnson@wolfram.com>
 2016-04-19 16:56:36 -05:00
Ian Johnson
13f28d1c1e Adding the static library target, libmosquitto_static, to CMakeLists.txt so it gets installed, and when compiled STATIC_LIB gets defined for only the static library 
Signed-off-by: Ian Johnson <ijohnson@wolfram.com>
 2016-04-19 16:56:25 -05:00
Ian Johnson
87112a7e21 On Mac, we don't want to run /sbin/ldconfig as it doesn't exist 
Signed-off-by: Ian Johnson <ijohnson@wolfram.com>
 2016-04-19 16:56:10 -05:00
Pierre Fersing
44f23252a0 Improve performance with lots of queued message 
Split message queue in two queues: in-flight and queued to avoid the
need to iterate over all messages.

Signed-off-by: Pierre Fersing <pierre.fersing@bleemeo.com>
 2016-04-18 16:24:13 +02:00
Roger A. Light
caa394d0fe Return value of pthread_create is now checked. 2016-03-17 21:22:56 +00:00
Roger A. Light
69a08ab905 Fix string quoting in CMakeLists.txt. Closes #4. 2016-03-13 20:33:08 +00:00
Roger A. Light
556c629ab5 Don't use reserved names in header guards. 
Closes #3.
 2016-03-13 18:43:13 +00:00
Roger A. Light
db2e66c543 Reorganise functions into separate files as appropriate. 2016-03-12 21:49:48 +00:00
Roger A. Light
af995d211d Fix client library keepalive handling. 
Fix the case where a message received just before the keepalive timer
expired would cause the client to miss the keepalive timer.

Thanks to Graham Benton.
 2016-02-28 17:24:43 +00:00
Roger A. Light
5cca6b4239 Bump version number. 2016-02-14 14:10:52 +00:00
Roger A. Light
f6939d4cbb Merge branch 'develop' of ssh://git.eclipse.org:29418/mosquitto/org.eclipse.mosquitto into develop 2016-02-09 23:03:34 +00:00
Roger A. Light
d5abf5a18a Outgoing connections can use any TLS version. 2016-02-09 23:02:46 +00:00
Roger A. Light
fd6a6cac14 Only increment inflight msgs when limit not reached. 2016-02-09 23:01:31 +00:00
Roger A. Light
97e6ac22d8 Only increment inflight messages if the limit hasn't been reached. 2016-02-09 23:00:15 +00:00
Roger A. Light
26b015908e Default to using MQTT v3.1.1. 2016-02-05 21:22:42 +00:00
Roger A. Light
4e4c08aaf0 "retained" -> "want_retained". 2016-01-26 17:10:54 +00:00
Roger A. Light
7709621911 Reorder helper function arguments for consistency. 2016-01-26 17:06:32 +00:00
Roger A. Light
0a95c9a3af Add mosquitto_subscribe_callback(). 2016-01-26 17:00:08 +00:00
Roger A. Light
1288b14dcb Fixes and cleanup for subscribe_simple. 2016-01-26 09:55:32 +00:00