Add check for filetype id before doing version check (#174)

aws · Feb 22, 2021 · e60dda9 · e60dda9
1 parent 78b53c6
commit e60dda9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/source/include/ota_config_defaults.h b/source/include/ota_config_defaults.h
@@ -210,6 +210,19 @@
     #define otaconfigAllowDowngrade    0U
 #endif
 
+/**
+ * @brief The file type id received in the job document.
+ *
+ * @note The file type id received in the job document that allows devices
+ * to identify the type of file received from the cloud. This configuration
+ * defines the file type id used for firmware updates. If this is changed
+ * then the updated value must be used while creating firmware update jobs.
+ *
+ */
+#ifndef configOTA_FIRMWARE_UPDATE_FILE_TYPE_ID
+    #define configOTA_FIRMWARE_UPDATE_FILE_TYPE_ID    0U
+#endif
+
 /**
  * @brief The protocol selected for OTA control operations.
  *

diff --git a/source/ota.c b/source/ota.c
@@ -1860,7 +1860,7 @@ static OtaErr_t validateUpdateVersion( const OtaFileContext_t * pFileContext )
     ( void ) newVersion; /* For suppressing compiler-warning: unused variable. */
 
     /* Only check for versions if the target is self */
-    if( otaAgent.serverFileID == 0U )
+    if( ( otaAgent.serverFileID == 0U ) && ( otaAgent.fileContext.fileType == configOTA_FIRMWARE_UPDATE_FILE_TYPE_ID ) )
     {
         /* Check if version reported is the same as the running version. */
         if( pFileContext->updaterVersion == appFirmwareVersion.u.unsignedVersion32 )