This patch fixes various warnings produced during the build the most
common warning, is the truncation of "size_t" (usually unsigned long) to
(int). This patch explicitly casts the result to "int" in these cases
to supress the warning. Additionally, this patch includes a fix to an
internal library load function to take a "const char *" parameter
instead of a "char *" parameter.
Signed-off-by: Keith Holman <keith.holman@windriver.com>
* develop: (21 commits)
Add OpenSSL version check for X509_check_host
Try to update OpenSSL on Ubuntu$
Add TLS config for client and server for hostname verification #420
Add TLS hostname check and CApath #420#418
Add tests for wrong protocol name #294
Check for bad protocol name #294
Check for SSLOptions structure when SSL protocol prefix is used #334
Update CONTRIBUTING.md CLA info
Remove reference to exit() function #342
Reinstate tests for appveyor
Enclose references to OsWrapper in #if defines
Squashed commit of the following:
Package AppVeyor artifacts attempt 1
Create /usr/local/include if it doesn't exist #275
Remove 373 test from Makefile... add the test source for posterity #416
Add doc for token in ResponseOptions #411
Add missing string.h include to SSLSocket.c
Try AppVeyor config again
Update AppVeyor config for latest test broker updates
Move ListRemove after where qe is used #339
...
# Conflicts:
# src/SSLSocket.c
# test/test_issue373.c
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
* develop:
Remove reference to internal Heap functions for now
Some cleanup of testing code
Add call to AppVeyor env setup
Do we need spaces?
Try again...
Change vcvars syntax
Check visual studio env var
Correct vcvarsall location
Add Visual Studio 2013 build as well as 2015
Reinstate .travis.yml
Update cd command
Use HTTPS git checkout instead of SSH
Another Python3 try
Update Python3 version
Try AppVeyor build with local broker
修改了restoreCommand时：（1）topics指针未申请内存的问题；（2）unsub误写为sub的问题。
fix issue that MQTTClient_connect hangs on network outage, for windows
# Conflicts:
# src/Socket.c
# test/test6.c
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
* test4issue373:
Extend test_issue373 to test also with QoS 1 and 2
Add helper script for test_issue373 to cyclically disconnect the VM running the broker
Add log output for failed message queueing in test due to disconnect
Do not reduce the tcp send buffer size for production code
# Conflicts:
# test/test_issue373.c
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
The functions implemented in Heap.c are not usable for Windows builds.
Therefore use only for none MSVC builds.
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
* test4issue373:
Add log output for failed message queueing in test due to disconnect
Add trace output to verify that reducing the tcp send buffer forces TCPSOCKET_INTERRUPTED
Reduce the tcp snd buffer to provocate issue #385
Move the evaluation of the not freed memory _after_ call of MQTTAsync_destroy()
Fix Windows build of test_issue373 and increase number of iterations
Consider any not freed memory as test failure
Modified number of connect iterations and messages send per second
Moved the decrement of pendingMessageCnt to another call back function
Add test for issue #373 and #385
Add skeleton of test_issue373
The functions implemented in Heap.c are not usable for Windows builds.
Therefore use only for none MSVC builds.
Increase the workload and number of connect/disconnects.
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
For some unknown reason, decrementing pendingMessageCnt in
test373DeliveryComplete() does not work. Therefore moved to other call
back functions.
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
This test connects to a broker up to 10 times.
As long as the connection is established, 100 message should be published
each second.
At the end all memory should be freed and no segmentation occurred.
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
This commit fixes two bugs related to `serverURIs` iterating in MQTTAsync.c
1. Segfault occurs when there is no healthy connection in `serverURIs`
Two off-by-one errors of the `currentURI` cause the issue. The first
one happens when doing boundary check of `serverURIs`, and the other
one happens when accessing `serverURIs` without checking the boundary
first.
2. The first URI in `serverURIs` gets skipped when restricting
`MQTTVersion` to a particular value
`currentURI` gets increased *before* connection attempts in each
iteration.
Signed-off-by: Lance Chen <cyen0312@gmail.com>
- Reduce the number of iterations to 20 (It usually fails in iteration 3)
- Reduce the timeout by factor 10
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
With the call of MQTTAsync_create() within the iteration loop, the test
fails.
Remove the opts.serverURIs
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
This patch adds a new test property which forces CMake to abort the test
execution after 9 minutes.
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit f6c276e1b334c43c3dc5a9bfe68ce4c4dc540d18
Author: Ian Craggs <icraggs@gmail.com>
Date: Fri Mar 17 08:52:43 2017 +0000
Fix up defines again
commit a8a50e3f3685913aeedb4d2b29e01e594f4938f8
Author: Ian Craggs <icraggs@gmail.com>
Date: Thu Mar 16 22:45:25 2017 +0000
Fix OSX compile definition in CMake config
commit 7b139247ff164f4f11faab41474442e5f0504452
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu Mar 16 18:52:45 2017 +0000
Fix MacOS compile options
commit 9f1fceb28d3b6db25832da493da8fc1b5b7a5742
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu Mar 16 17:36:07 2017 +0000
Accidentally removed OPENSSL compile flag
commit 213eeaa0439602d70383b16b4cff354a09136457
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu Mar 16 17:11:46 2017 +0000
Change MacOS semaphore implementation and other build fixes
commit 4e00e4c322cb07285e559e736c579f0c2806d09e
Merge: 2baa87d 159c152
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu Mar 16 14:24:34 2017 +0000
Merge branch 'fixes' of ssh://github.com/eclipse/paho.mqtt.c into fixes
commit 2baa87d83caf457bbf08a1fad34c06ef6e4820f3
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Thu Mar 16 14:18:19 2017 +0000
Add USE_NAMED_SEMAPHORES compile flag for OSX
commit 159c1527be4e09fd42d0a4ae99d766d145f1a573
Author: Ian Craggs <icraggs@gmail.com>
Date: Wed Mar 15 23:04:42 2017 +0000
Correct test3 invocation
commit 15989ba1bdcf181cd9f9d21fbc0e952d046968b4
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 15 18:47:23 2017 +0000
Run proxy for test9
commit 3c7cc3c4fcdb65b2a4d600859f8dd44aece641ed
Author: Ian Craggs <icraggs@paho-mbp.hursley.uk.ibm.com>
Date: Wed Mar 15 12:06:42 2017 +0000
More build/test changes
commit a4bbb576dc27a8dc96f0fc1cd0af097090270ffc
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 15 11:06:55 2017 +0000
Stop mosquitto first
commit 3da32b8477c7fa2e0cdeab012288d8bac028eabe
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 15 09:16:54 2017 +0000
Start mosquitto
commit c000141195426ddfd1c2c00d079c30b345a8f64a
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 15 09:09:27 2017 +0000
Try starting mosquitto alternatively
commit 1a800225407aa9e8c989994f04a6d2410fa9edf9
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 15 08:58:45 2017 +0000
Environment variable
commit bc5e4609e3ae0e636e7944ed4326a1e46dbab386
Author: Ian Craggs <icraggs@gmail.com>
Date: Tue Mar 14 21:27:24 2017 +0000
Environment variables
commit fea6358def6b4da465e9e6c79ab9ba0044824166
Author: Ian Craggs <icraggs@paho-mbp.hursley.uk.ibm.com>
Date: Tue Mar 14 15:03:47 2017 +0000
Fix certs dir
commit 0f7f8a47d94b9324edd7a2e14cdf7eb3c5c5db19
Author: Ian Craggs <icraggs@paho-mbp.hursley.uk.ibm.com>
Date: Tue Mar 14 11:52:03 2017 +0000
Update certs dir
commit eacb0b62b70880b3dc81468b525435866c7bcb65
Author: Ian Craggs <icraggs@paho-mbp.hursley.uk.ibm.com>
Date: Tue Mar 14 11:35:39 2017 +0000
Another attempt at updating Mosquitto
commit 8e2071d237186ba498b8f3c4f08327b6d7235f49
Author: Ian Craggs <icraggs@paho-mbp.hursley.uk.ibm.com>
Date: Tue Mar 14 11:01:54 2017 +0000
Allow mosquitto upgrade
commit 9d608cc9f0a6b1e1f784547c7595bd936bf5a29d
Author: Ian Craggs <icraggs@gmail.com>
Date: Mon Mar 13 23:32:37 2017 +0000
Other build fix attempt
commit 043d8e1eb79ea2b50b79a405bd9d52dd489dcf3f
Merge: f234399 80b3d30
Author: Ian Craggs <icraggs@gmail.com>
Date: Mon Mar 13 23:21:56 2017 +0000
Merge branch 'fixes' of ssh://github.com/eclipse/paho.mqtt.c into fixes
commit f234399d480d603d3e725c427d1c3c17ad2a76cc
Author: Ian Craggs <icraggs@gmail.com>
Date: Mon Mar 13 23:18:32 2017 +0000
MQTTClient unpersist fix and local mosquitto
commit 80b3d3057a1c06f5de64da8521123469afeb61d5
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 8 10:48:23 2017 +0000
Try to fix up certs path
commit bb72cba38e2b5e9149715ae0fb523d765d867cab
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Wed Mar 8 10:24:12 2017 +0000
Fix up test certificate paths
commit f26fb76633676493919b242721ba12a004265d75
Author: Ian Craggs <icraggs@gmail.com>
Date: Wed Mar 8 00:28:13 2017 +0000
Add OPENSSL compile definition to add the TLS code
commit 9ff1f033a6572700eb91efcb7e59448290223f66
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Mon Mar 6 11:06:05 2017 +0000
Remove local mosquitto start
commit 500b4e0a51268ccc4ddb319fa4d7a0300edfeef3
Merge: 730cceb d710ad1
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Mon Mar 6 10:43:19 2017 +0000
Merge branch 'fixes' of github.com:eclipse/paho.mqtt.c into fixes
commit 730cceb6bd2976cfc1ef7f7c7b22cac42f9826ed
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Mon Mar 6 10:37:00 2017 +0000
Change test broker to mqtt.iotree.co.uk
commit d710ad1373689b9e0eba23c771a1045b1edceed9
Author: Ian Craggs <icraggs@gmail.com>
Date: Mon Mar 6 00:12:36 2017 +0000
More mosquitto config changes
commit a5e38b7cb60c94cc9c1564edf4360f96b7cb7d91
Merge: 011dace b3af687
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Sun Mar 5 23:51:00 2017 +0000
Merge branch 'fixes' of github.com:eclipse/paho.mqtt.c into fixes
commit 011dace5a4f1d5a6ecb7699ce153079a28786434
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Sun Mar 5 23:50:17 2017 +0000
Add mosquitto server config
commit b3af687a1a17eeceb0997a15a63dbe2a93c9c5d5
Author: Ian Craggs <icraggs@gmail.com>
Date: Sun Mar 5 23:39:27 2017 +0000
Change mosquitto config
commit 79c142f28f7b3f27b63cf96fdaa823b4d811088c
Author: Ian Craggs <icraggs@uk.ibm.com>
Date: Sun Mar 5 23:20:53 2017 +0000
Add mosquitto config for testing
commit 75ddf836924eed7a58b3a073ea0c92e48e4c4e84
Author: Ian Craggs <icraggs@gmail.com>
Date: Sun Mar 5 18:55:47 2017 +0000
Update CMake version on Ubuntu
commit ce88bd235d63037c88372f0c433b6f8bc0bfd505
Author: Ian Craggs <icraggs@gmail.com>
Date: Sun Mar 5 13:45:09 2017 +0000
Print out CMake version number
commit 8bacd62993341fbc033bae94994b44f8e36e826b
Author: Ian Craggs <icraggs@gmail.com>
Date: Sat Mar 4 23:20:50 2017 +0000
Run tests on Linux
commit bb64075c41e27a957b23f6dc8b151919037bfb73
Merge: fee1c80d923d0e
Author: Ian Craggs <icraggs@gmail.com>
Date: Sat Mar 4 16:09:17 2017 +0000
Merge branch 'cmake-tests-travis' of https://github.com/orpiske/paho.mqtt.c into fixes
commit d923d0e972
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Tue Feb 14 13:23:08 2017 +0100
Remove duplicated build code for Travis CI
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit d630ed1f7c
Author: Otavio R. Piske <opiske@redhat.com>
Date: Mon Feb 13 22:03:44 2017 +0100
Include the OpenSSL directories earlier in the build/configuration
Compilation may fail when cross-compiling due to CMake/compilers forcely
excluding /usr/include from the include path. Therefore, in this case it's
required to add the include path for OpenSSL earlier in the process so that
OpenSSL-dependent code can access the headers.
Signed-off-by: Otavio R. Piske <opiske@redhat.com>
commit 74d3af9e58
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Tue Feb 7 17:50:54 2017 +0100
Do use the OpenSSL crypto library otherwise linking of SSL versions of the libraries fail due to missing symbols
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 99aecbfbf8
Author: Ryan Pendleton <me@ryanp.me>
Date: Mon Jun 20 13:26:50 2016 -0600
add missing OPENSSL define to CMakeLists.txt
Signed-off-by: Ryan Pendleton <me@ryanp.me>
commit 9f88345618
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Mon Feb 6 10:49:16 2017 +0100
Link w/ compat library on FreeBSD otherwise it fails due to missing ftime function
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit f6bba5e326
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Thu Feb 2 10:16:40 2017 +0100
Start mosquitto daemon accordingly to what is used on each support Travis CI OS
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit adcf8220bf
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Thu Feb 2 09:33:38 2017 +0100
Enable mosquitto installation on OS X and do execute it on all available Travis CI OSes
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 683c6a0b98
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 17:56:07 2017 +0100
Removed the non-existent test7
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 78b8ebd2f6
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 17:49:31 2017 +0100
Prevent all the tests from running for too long otherwise it can cause the Travis CI build to fail
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit dcf574164a
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 17:02:09 2017 +0100
Use a timeout for the test, otherwise Travis CI abort the execution
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 9b7b3c27a7
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 16:36:41 2017 +0100
Conditionally resolve POSIX thread library to allow a more flexible linkage handling in systems that do not use pthreads
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 8ba0271b1e
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 16:30:55 2017 +0100
Changed the build to only build SSL test cases if building with SSL support
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 2cef15f31c
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 16:14:24 2017 +0100
Added missing make command to the build script
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 08eb556549
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 16:06:08 2017 +0100
Use the APT addon from Travis to install the Mosquitto dependency
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 60a1f4e61b
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 16:00:28 2017 +0100
Sudo is required on Travis build since we need to install mosquitto to run the unit tests
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 779460cd06
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 15:55:54 2017 +0100
Adjusted the build on Travis CI so that unit tests are also run
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 7afe13bcb6
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Wed Feb 1 09:27:32 2017 +0100
Initial work towards supporting unit tests with the CMake build system
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit e54b44dd62
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Sat Dec 31 17:06:55 2016 +0100
Decrease mininum required version so that it can be built on EL7
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 21e3203994
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Sat Dec 31 15:39:20 2016 +0100
Fix the library directory name for RHEL and Fedora
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
commit 56199edfde
Author: Otavio Rodolfo Piske <opiske@redhat.com>
Date: Tue Jan 17 08:27:27 2017 +0100
Added missing make command to Travis build script
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
According to ISO/IEC 9899:2011, section 7.22.4.4 (The exit function),
"the constant EXIT_FAILURE is the implementation independent way to
issue failures to exit(3)." Whereas EXIT_SUCCESS is the portable way
to return success.
Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
According to ISO/IEC 9899:2011, section 6.7.6.3 (Function declarators
including prototypes): "The special case of an unnamed parameter of
type void as the only item in the list specifies that the function
has no parameters."
Signed-off-by: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
within each test program.
Among other things, this lead to better test reports from CTest which
improves integration in CI tools and environments (ie.: Jenkins), since
each test execution can be intepreted individually by the CI.
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
This is a work-around to prevent test execution to fail due to not finding the DLLs. This affects only Windows builds and is work-in-progress as the directory locations for the binaries may be adjusted in the future.
Signed-off-by: Otavio Rodolfo Piske <opiske@redhat.com>
Ian Craggs