Commit Graph

776 Commits

Author SHA1 Message Date
Ian Craggs 1ec9058185 Attempt upload again 2018-04-05 16:19:02 +01:00
Ian Craggs cb7f29ce5e Further package upload attempt 2018-04-05 13:49:09 +01:00
Ian Craggs ec0ff46fac Attempt to get package file uploaded 2018-04-05 13:39:16 +01:00
Ian Craggs 602f2d8778 Update version numbers and use CMake packaging 2018-04-05 13:06:29 +01:00
Ian Craggs c0a56c96be Fix for issue #285 2018-04-03 17:02:31 +01:00
Ian Craggs 10c895c5da Fix copyright date 2018-03-25 18:29:01 +01:00
Ian Craggs dc6dc24ac0 Merge branch '373' of https://github.com/JuergenKosel/paho.mqtt.c into JuergenKosel-373 2018-03-23 16:51:53 +00:00
Ian Craggs b69d1ad21b Fix for issue #409 2018-03-23 13:58:28 +00:00
Ian Craggs 4cf648dba4 Remove compiler warnings on Windows 2018-03-23 12:01:49 +00:00
Ian Craggs d27a7c5899 Allocate username/password buffers #431 2018-03-21 16:07:28 +00:00
Juergen Kosel 231eda090d Move definition of mutex_type into own header file
To avoid inconsitstant definition of "bool", the definition of
mutex_type is moved into its own header file. This way, Socket.h does
not need to include Thread.h.

Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
2018-03-13 08:37:24 +01:00
Juergen Kosel e858851455 Modify order of includes to fix travis build
Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
2018-03-12 16:49:27 +01:00
Juergen Kosel fcfb5b43ef Merge branch 'develop' into 373
* 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>
2018-03-12 15:19:44 +01:00
Juergen Kosel 341037269e Prevent release socket_mutex during call of select()
As suggested in https://github.com/eclipse/paho.mqtt.c/issues/385#issuecomment-372299490
the socket_mutex is released during the call of select(),
to avoid a performance penalty.

Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
2018-03-12 14:56:45 +01:00
Juergen Kosel 2d25517408 Lock the socket_mutex inside Socket_getReadySocket()
To reduce the performance penalty of commit 779ca42a46
Ian has recommended to release the socket_mutex during the call of select.
See https://github.com/eclipse/paho.mqtt.c/issues/385#issuecomment-372299490

As a preparation for this, the locking of the socket_mutex is moved inside
the Socket_getReadySocket() function.

Signed-off-by: Juergen Kosel <juergen.kosel@softing.com>
2018-03-12 14:46:15 +01:00
Ian Craggs 99fb071d6d Merge branch 'master' into develop 2018-03-03 16:52:14 +00:00
Ian Craggs 2202fbd81c
Merge pull request #401 from toulouse/master
Add missing string.h include to SSLSocket.c
2018-03-03 16:47:46 +00:00
Ian Craggs 5446bdca1c Add OpenSSL version check for X509_check_host 2018-03-03 12:06:05 +00:00
Ian Craggs 18010d4438 Try to update OpenSSL on Ubuntu$ 2018-03-01 20:53:42 +00:00
Ian Craggs e4c2ed2327 Add TLS config for client and server for hostname verification #420 2018-03-01 20:24:23 +00:00
Ian Craggs 695563fccb Add TLS hostname check and CApath #420 #418 2018-03-01 19:52:20 +00:00
Ian Craggs 8276dcd217 Add tests for wrong protocol name #294 2018-02-26 16:57:13 +00:00
Ian Craggs d1d6496d11 Check for bad protocol name #294 2018-02-26 16:56:06 +00:00
Ian Craggs adf15a38a1 Check for SSLOptions structure when SSL protocol prefix is used #334 2018-02-26 16:20:37 +00:00
Ian Craggs 13da462a3e Update CONTRIBUTING.md CLA info 2018-02-19 10:30:39 +00:00
Ian Craggs b9ea755ca0 Remove reference to exit() function #342 2018-02-16 21:19:45 +00:00
Ian Craggs ace5213838 Reinstate tests for appveyor 2018-02-16 20:33:19 +00:00
Ian Craggs bef1e5cea1 Enclose references to OsWrapper in #if defines 2018-02-16 20:16:22 +00:00
Ian Craggs 0601d9b4a1 Squashed commit of the following:
commit b13131578a33c7018a06045e3c3048995aabb3f3
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 19:01:47 2018 +0000

    Move lib files to correct place

commit 0b9c323f97f4c87bb2801d1722aa9da230ec8be6
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:50:58 2018 +0000

    Fix command name

commit 4c1bc966a35e854026900c88044a4e8d50e88a7a
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:49:03 2018 +0000

    Fix directories in zip

commit 5fd2ffe84f8f86c903c9e93dc10d6eb35362529b
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:33:51 2018 +0000

    Correct 7z command

commit a53e01fd44c7e657e06a4a3f928bb444e2b11110
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 18:27:37 2018 +0000

    Add notices, licenses to zip

commit 6e4bf4efaafd89cce5bae46962e658d17277dbbe
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 17:53:50 2018 +0000

    Separate 7z commands

commit 0010f6773d5b3ba0bcfeec143927c2ce013661f2
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 17:52:17 2018 +0000

    3

commit c9755e262173d4216342b038cd841bf87d9243dc
Author: Ian Craggs <icraggs@uk.ibm.com>
Date:   Fri Feb 16 17:49:56 2018 +0000

    Attempt 2
2018-02-16 20:13:37 +00:00
Ian Craggs 6ab27fb404 Package AppVeyor artifacts attempt 1 2018-02-16 17:46:01 +00:00
Ian Craggs 74bff662c0 Create /usr/local/include if it doesn't exist #275 2018-02-16 15:09:19 +00:00
Ian Craggs 81fba83b89 Remove 373 test from Makefile... add the test source for posterity #416 2018-02-13 22:21:27 +00:00
Ian Craggs 6eb1daab0b Add doc for token in ResponseOptions #411 2018-02-13 15:37:16 +00:00
Andrew Toulouse 5cb425a6d6 Add missing string.h include to SSLSocket.c
Signed-off-by: Andrew Toulouse <andrew@atoulou.se>
2018-01-07 02:33:31 -08:00
Ian Craggs 7fb29737a3 Try AppVeyor config again 2018-01-02 21:58:20 +00:00
Ian Craggs 9337e39dea Update AppVeyor config for latest test broker updates 2018-01-02 21:47:28 +00:00
Juergen Kosel 3bdd5b5d92 Merge branch 'develop' into 373
* 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>
2017-12-18 09:01:57 +01:00
Ian Craggs c027e9cc93 Move ListRemove after where qe is used #339 2017-12-15 19:21:48 +00:00
Ian Craggs b18f5ee73d
Merge pull request #390 from nsjodk/develop
Remove shadow warn. (MQTTAsync_completeConnection)
2017-12-15 14:59:57 +00:00
Ian Craggs abecbdc8ca Remove reference to internal Heap functions for now 2017-12-15 12:16:18 +00:00
Ian Craggs bc1399a63b Merge branch '373' into develop 2017-12-15 12:05:10 +00:00
Ian Craggs edab27ad63 Some cleanup of testing code 2017-12-15 12:04:15 +00:00
Ian Craggs 6aa07f575b
Merge pull request #383 from LeoonLee/master
fixd: when restore command, "topics" no malloc.
2017-12-15 10:46:54 +00:00
Ian Craggs e46c0419ee Add call to AppVeyor env setup 2017-12-14 16:46:53 +00:00
Ian Craggs 3c7b8d582c Do we need spaces? 2017-12-14 14:05:23 +00:00
Ian Craggs fc447cb867 Try again... 2017-12-14 14:04:15 +00:00
Ian Craggs 7e59a6250e Change vcvars syntax 2017-12-14 14:00:06 +00:00
Ian Craggs 0c78af4e22 Check visual studio env var 2017-12-14 13:58:44 +00:00
Ian Craggs 18a05fce10 Correct vcvarsall location 2017-12-14 13:47:22 +00:00
Ian Craggs 398b89a749 Add Visual Studio 2013 build as well as 2015 2017-12-14 13:38:12 +00:00