Merge branch 'develop' - 1.3.1 update

eclipse-paho · Aug 3, 2019 · 3d9af46 · 3d9af46
2 parents d631449 + 41b22e2
commit 3d9af46
Show file tree

Hide file tree

Showing 48 changed files with 1,776 additions and 198 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#  Copyright (c) 2015, 2018 logi.cals GmbH and others
+#  Copyright (c) 2015, 2019 logi.cals GmbH and others
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -28,7 +28,7 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 ## build settings
 SET(PAHO_VERSION_MAJOR 1)
 SET(PAHO_VERSION_MINOR 3)
-SET(PAHO_VERSION_PATCH 0)
+SET(PAHO_VERSION_PATCH 1)
 SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH})
 
 INCLUDE(GNUInstallDirs)

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 #*******************************************************************************
-#  Copyright (c) 2009, 2018 IBM Corp.
+#  Copyright (c) 2009, 2019 IBM Corp.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are made available under the terms of the Eclipse Public License v1.0
@@ -24,7 +24,7 @@ SHELL = /bin/sh
 .PHONY: clean, mkdir, install, uninstall, html
 
 ifndef release.version
-  release.version = 1.3.0
+  release.version = 1.3.1
 endif
 
 # determine current platform
@@ -285,7 +285,7 @@ install: build
 	ln -s lib$(MQTTLIB_CS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
 	ln -s lib$(MQTTLIB_A).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
 	ln -s lib$(MQTTLIB_AS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so
-	@if test ! -f $(DESTDIR)${blddir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_C).so.${VERSION} $(DESTDIR)${blddir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}; fi
+	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_C).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}; fi
 	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_CS).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}; fi
 	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_A).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}; fi
 	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_AS).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}; fi
@@ -318,7 +318,7 @@ uninstall:
 	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
 	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
 	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so
-	- rm $(DESTDIR)${blddir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}
 	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}
 	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}
 	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}

diff --git a/build.xml b/build.xml
@@ -1,5 +1,5 @@
 <!--****************************************************************************
-  Copyright (c) 2012, 2018 IBM Corp.
+  Copyright (c) 2012, 2019 IBM Corp.
 
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Public License v1.0
@@ -24,7 +24,7 @@
   </taskdef>
 
   <property name="output.folder" value="build/output" />
-  <property name="release.version" value="1.3.0" />
+  <property name="release.version" value="1.3.1" />
 
   <property name="libname" value="mqttv3c" />
   <property name="libname.ssl" value="mqttv3cs" />

diff --git a/cmake/modules/CMakeDebHelper.cmake b/cmake/modules/CMakeDebHelper.cmake
diff --git a/cmake/modules/CMakeDebHelperInstall.cmake b/cmake/modules/CMakeDebHelperInstall.cmake
diff --git a/conanfile.py b/conanfile.py
@@ -3,7 +3,7 @@
 
 class PahocConan(ConanFile):
     name = "paho.mqtt.c"
-    version = "1.3.0"
+    version = "1.3.1"
     license = "Eclipse Public License - v 1.0"
     url = "https://github.com/eclipse/paho.mqtt.c"
     description = """The Eclipse Paho project provides open-source client implementations of MQTT

diff --git a/src/Clients.h b/src/Clients.h
@@ -79,6 +79,7 @@ typedef struct
 	int socket;
 	time_t lastSent;
 	time_t lastReceived;
+	time_t lastPing;
 #if defined(OPENSSL)
 	SSL* ssl;
 	SSL_CTX* ctx;

diff --git a/src/Log.c b/src/Log.c
@@ -162,7 +162,7 @@ int Log_initialize(Log_nameValue* info)
 			trace_settings.trace_level = TRACE_MAXIMUM;
 		else if (strcmp(envval, "MEDIUM") == 0 || strcmp(envval, "TRACE_MEDIUM") == 0)
 			trace_settings.trace_level = TRACE_MEDIUM;
-		else if (strcmp(envval, "MINIMUM") == 0 || strcmp(envval, "TRACE_MEDIUM") == 0)
+		else if (strcmp(envval, "MINIMUM") == 0 || strcmp(envval, "TRACE_MINIMUM") == 0)
 			trace_settings.trace_level = TRACE_MINIMUM;
 		else if (strcmp(envval, "PROTOCOL") == 0  || strcmp(envval, "TRACE_PROTOCOL") == 0)
 			trace_output_level = TRACE_PROTOCOL;