Release v2.3.0.

aws · Mar 26, 2018 · 8206cb2 · 8206cb2
1 parent 77f657e
commit 8206cb2
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,17 @@
 # Change Log
+## [2.3.0](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v2.3.0) (Mar 21, 2018)
+
+New Features:
+
+  - Add [AWS IoT Jobs](https://docs.aws.amazon.com/iot/latest/developerguide/iot-jobs.html) support.
+  - Use AWS IoT Core support for MQTT over port 443. MQTT connection now defaults to port 443.
+
+Pull requests:
+
+  - [#124](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/124) - Thing Shadow: Fix potential shadow buffer overflow
+  - [#135](https://github.com/aws/aws-iot-device-sdk-embedded-C/pull/135) - mbedtls_wrap: Fix unintialized variable usage
+  - Fix bugs in long-running integration tests.
+
 ## [2.2.1](https://github.com/aws/aws-iot-device-sdk-embedded-C/releases/tag/v2.2.1) (Dec 26, 2017)
 
 Bugfixes:

diff --git a/Makefile b/Makefile
@@ -55,11 +55,11 @@ TLS_LIB_DIR = $(TEMP_MBEDTLS_SRC_DIR)
 TLS_INCLUDE_DIR = -I $(TEMP_MBEDTLS_SRC_DIR)
 
 # Logging level control
-LOG_FLAGS += -DENABLE_IOT_DEBUG
+#LOG_FLAGS += -DENABLE_IOT_DEBUG
 #LOG_FLAGS += -DENABLE_IOT_TRACE
-LOG_FLAGS += -DENABLE_IOT_INFO
-LOG_FLAGS += -DENABLE_IOT_WARN
-LOG_FLAGS += -DENABLE_IOT_ERROR
+#LOG_FLAGS += -DENABLE_IOT_INFO
+#LOG_FLAGS += -DENABLE_IOT_WARN
+#LOG_FLAGS += -DENABLE_IOT_ERROR
 COMPILER_FLAGS += $(LOG_FLAGS)
 
 EXTERNAL_LIBS += -L$(CPPUTEST_BUILD_LIB)
@@ -128,4 +128,4 @@ clean:
 	$(RM) -rf build_output
 	$(RM) -rf gcov
 	$(RM) -rf objs
-	$(RM) -rf testLibs
+	$(RM) -rf testLibs
diff --git a/include/aws_iot_version.h b/include/aws_iot_version.h
@@ -35,11 +35,11 @@
 /**
  * @brief MINOR version when functionality is added in a backwards-compatible manner.
  */
-#define VERSION_MINOR 2
+#define VERSION_MINOR 3
 /**
  * @brief PATCH version when backwards-compatible bug fixes are made.
  */
-#define VERSION_PATCH 1
+#define VERSION_PATCH 0
 /**
  * @brief TAG is an (optional) tag appended to the version if a more descriptive verion is needed.
  */

diff --git a/src/aws_iot_mqtt_client_common_internal.c b/src/aws_iot_mqtt_client_common_internal.c
@@ -315,7 +315,7 @@ IoT_Error_t aws_iot_mqtt_internal_send_packet(AWS_IoT_Client *pClient, size_t le
 		FUNC_EXIT_RC(SUCCESS);
 	}
 
-	FUNC_EXIT_RC(FAILURE);
+	FUNC_EXIT_RC(rc) 
 }
 
 static IoT_Error_t _aws_iot_mqtt_internal_decode_packet_remaining_len(AWS_IoT_Client *pClient,

diff --git a/tests/integration/Makefile b/tests/integration/Makefile
@@ -31,9 +31,9 @@ LD_FLAG += -ldl $(TLS_LIB_DIR)/libmbedtls.a $(TLS_LIB_DIR)/libmbedcrypto.a $(TLS
 # Logging level control
 #LOG_FLAGS += -DENABLE_IOT_DEBUG
 #LOG_FLAGS += -DENABLE_IOT_TRACE
-LOG_FLAGS += -DENABLE_IOT_INFO
-LOG_FLAGS += -DENABLE_IOT_WARN
-LOG_FLAGS += -DENABLE_IOT_ERROR
+#LOG_FLAGS += -DENABLE_IOT_INFO
+#LOG_FLAGS += -DENABLE_IOT_WARN
+#LOG_FLAGS += -DENABLE_IOT_ERROR
 COMPILER_FLAGS += $(LOG_FLAGS)
 
 #IoT client directory
@@ -68,7 +68,7 @@ COMPILER_FLAGS += -g
 COMPILER_FLAGS += $(LOG_FLAGS)
 PRE_MAKE_CMDS += cd $(TEMP_MBEDTLS_SRC_DIR) && make
 
-MAKE_CMD = $(CC) $(SRC_FILES) $(COMPILER_FLAGS) -g3 -o $(APP_DIR)/$(APP_NAME) $(EXTERNAL_LIBS) $(LD_FLAG) $(INCLUDE_ALL_DIRS);
+MAKE_CMD =    $(CC) $(SRC_FILES) $(COMPILER_FLAGS)    -g3 -D_ENABLE_THREAD_SUPPORT_ -o $(APP_DIR)/$(APP_NAME) $(EXTERNAL_LIBS) $(LD_FLAG) $(INCLUDE_ALL_DIRS);
 MAKE_MT_CMD = $(CC) $(MT_SRC_FILES) $(COMPILER_FLAGS) -g3 -D_ENABLE_THREAD_SUPPORT_ -o $(APP_DIR)/$(MT_APP_NAME) $(EXTERNAL_LIBS) $(LD_FLAG) $(INCLUDE_ALL_DIRS);
 
 ifeq ($(CODE_SIZE_ENABLE),Y)
@@ -89,9 +89,19 @@ all:
 	./$(MT_APP_NAME)
 	$(POST_MAKE_CMDS)
 
+app:
+	$(PRE_MAKE_CMDS)
+	$(DEBUG)$(MAKE_CMD)
+	$(DEBUG)$(MAKE_MT_CMD)
+
+tests:
+	./$(APP_NAME)
+	./$(MT_APP_NAME)
+	$(POST_MAKE_CMDS)
+
 clean:
 	$(RM) -f $(APP_DIR)/$(APP_NAME)
 	$(RM) -f $(APP_DIR)/$(MT_APP_NAME)
 	$(CLEAN_CMD)
 
-ALL_TARGETS_CLEAN += test-integration-assert-clean
+ALL_TARGETS_CLEAN += test-integration-assert-clean
diff --git a/tests/integration/src/aws_iot_test_auto_reconnect.c b/tests/integration/src/aws_iot_test_auto_reconnect.c
@@ -145,10 +145,11 @@ int aws_iot_mqtt_tests_auto_reconnect() {
 		printf("Failure to invoke Disconnect Handler\n");
 		return -1;
 	}
-	aws_iot_mqtt_tests_unblock_tls_connect();
+
 	terminate_yield_with_rc_thread = true;
 	pthread_join(yield_thread, NULL);
-
+	aws_iot_mqtt_tests_unblock_tls_connect();
+
 	/*
 	 * Manual Reconnect Test
 	 */
@@ -175,7 +176,8 @@ int aws_iot_mqtt_tests_auto_reconnect() {
 		}
 	}
 	terminate_yield_with_rc_thread = true;
-
+	pthread_join(yield_thread, NULL);
+
 	/*
 	 * Auto Reconnect Test
 	 */
@@ -224,6 +226,10 @@ int aws_iot_mqtt_tests_auto_reconnect() {
 			return -6;
 		}
 	}
+
+	terminate_yield_with_rc_thread = true;
+	pthread_join(yield_thread, NULL);
+
 	if(true == aws_iot_mqtt_is_client_connected(&client)) {
 		printf("Success: is Mqtt connected api\n");
 	} else {