Merge pull request #16 from OCAAlliance/property-change-subscription

Property change subscription
OCAAlliance · Nov 11, 2020 · 7460092 · 7460092
2 parents 5a1e03c + 67edb6d
commit 7460092
Show file tree

Hide file tree

Showing 199 changed files with 2,083 additions and 5,292 deletions.
diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/Aes70CompliancyTestTool.vcxproj b/OCACompliancyTestTool/Aes70CompliancyTestTool/Aes70CompliancyTestTool.vcxproj
@@ -104,7 +104,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
@@ -127,7 +127,7 @@ xcopy xml\*.xsd $(OutDir)xml /Y</Command>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
@@ -154,7 +154,7 @@ xcopy xml\*.xsd $(OutDir)xml /Y</Command>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x86/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>
@@ -181,7 +181,7 @@ xcopy xml\*.xsd $(OutDir)xml /Y</Command>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/OcaLite/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>WS2_32.lib;..\..\OCAMicro\OCAMicro\src/platform/common/BonjourSDK/x64/dnssd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
     </Link>

diff --git a/...yTestTool/Aes70CompliancyTestTool/HostInterface/OCA/OCP.1/ZeroConf/OcaLiteOcp1Service.cpp b/...yTestTool/Aes70CompliancyTestTool/HostInterface/OCA/OCP.1/ZeroConf/OcaLiteOcp1Service.cpp
@@ -8,7 +8,7 @@
 // ---- Include system wide include files ----
 #include <HostInterfaceLite/OCA/OCP.1/ZeroConf/IOcp1LiteService.h>
 #include <HostInterfaceLite/OCA/OCF/OcfLiteHostInterface.h>
-#include <../../platform/common/OcaLite/BonjourSDK/dns_sd.h>
+#include <../../platform/common/BonjourSDK/dns_sd.h>
 
 // ---- FileInfo Macro ----
 

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/TestFramework/BaseTestClass.cpp b/OCACompliancyTestTool/Aes70CompliancyTestTool/TestFramework/BaseTestClass.cpp
@@ -11,7 +11,7 @@ using namespace std;
 #include <stdarg.h>
 #include <algorithm>
 #include <HostInterfaceLite/OCA/OCF/OcfLiteHostInterface.h>
-#include <OCALite/OCP.1/Ocp1LiteConnectParameters.h>
+#include <OCP.1/Ocp1LiteConnectParameters.h>
 
 // ---- FileInfo Macro ----
 

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/TestFramework/TestContext.h b/OCACompliancyTestTool/Aes70CompliancyTestTool/TestFramework/TestContext.h
@@ -8,8 +8,8 @@
 #define TEST_CONTEXT_H
 
 // ---- Include system wide include files ----
-#include <OCALite/OCC/ControlDataTypes/OcaLiteBaseDataTypes.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteFrameworkDataTypes.h>
+#include <OCC/ControlDataTypes/OcaLiteBaseDataTypes.h>
+#include <OCC/ControlDataTypes/OcaLiteFrameworkDataTypes.h>
 #include <DNSSDResolver.h>
 
 // ---- Include local include files ----

diff --git a/...Aes70CompliancyTestTool/Tests/MinimumObjectCompliancyTest/MinimumObjectCompliancyTest.cpp b/...Aes70CompliancyTestTool/Tests/MinimumObjectCompliancyTest/MinimumObjectCompliancyTest.cpp
@@ -5,16 +5,16 @@
  */
 
 // ---- Include system wide include files ----
-#include <OCALite/Proxy/GeneralProxy.h>
-#include <OCALite/OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
-#include <OCALite/OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
-#include <OCALite/OCC/ControlClasses/Managers/OcaLiteMediaClockManager.h>
-#include <OCALite/OCC/ControlClasses/Agents/OcaLiteTimeSource.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteMethod.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteEvent.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteBlockMember.h>
-#include <OCALite/OCP.1/Ocp1LiteNetworkAddress.h>
+#include <Proxy/GeneralProxy.h>
+#include <OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
+#include <OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
+#include <OCC/ControlClasses/Managers/OcaLiteMediaClockManager.h>
+#include <OCC/ControlClasses/Agents/OcaLiteTimeSource.h>
+#include <OCC/ControlDataTypes/OcaLiteMethod.h>
+#include <OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
+#include <OCC/ControlDataTypes/OcaLiteEvent.h>
+#include <OCC/ControlDataTypes/OcaLiteBlockMember.h>
+#include <OCP.1/Ocp1LiteNetworkAddress.h>
 
 // ---- FileInfo Macro ----
 

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCC/ObjectCompliancyTest.cpp b/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCC/ObjectCompliancyTest.cpp
@@ -5,13 +5,13 @@
  */
 
 // ---- Include system wide include files ----
-#include <OCALite/Proxy/GeneralProxy.h>
-#include <OCALite/OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteMethod.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteEvent.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteBlockMember.h>
-#include <OCALite/OCP.1/Ocp1LiteNetworkAddress.h>
+#include <Proxy/GeneralProxy.h>
+#include <OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
+#include <OCC/ControlDataTypes/OcaLiteMethod.h>
+#include <OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
+#include <OCC/ControlDataTypes/OcaLiteEvent.h>
+#include <OCC/ControlDataTypes/OcaLiteBlockMember.h>
+#include <OCP.1/Ocp1LiteNetworkAddress.h>
 
 // ---- FileInfo Macro ----
 

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/DeviceResetTest.cpp b/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/DeviceResetTest.cpp
@@ -9,10 +9,10 @@
 #include <fstream>
 #include <vector>
 #include <HostInterfaceLite/OCA/OCF/Timer/IOcfLiteTimer.h>
-#include <OCALite/Proxy/GeneralProxy.h>
-#include <OCALite/OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
-#include <OCALite/OCP.1/Ocp1LiteNetworkAddress.h>
-#include <OCALite/OCP.1/Ocp1LiteNetwork.h>
+#include <Proxy/GeneralProxy.h>
+#include <OCC/ControlClasses/Managers/OcaLiteNetworkManager.h>
+#include <OCP.1/Ocp1LiteNetworkAddress.h>
+#include <OCP.1/Ocp1LiteNetwork.h>
 #include <rapidxml/rapidxml.hpp>
 using namespace rapidxml;
 using namespace std;

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/DeviceServiceDiscoveryTest.cpp b/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/DeviceServiceDiscoveryTest.cpp
@@ -6,11 +6,11 @@
 
 // ---- Include system wide include files ----
 #include <DNSSDResolver.h>
-#include <OCALite/OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteBlockMember.h>
-#include <OCALite/OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
-#include <OCALite/OCP.1/Ocp1LiteConnectParameters.h>
-#include <OCALite/Proxy/GeneralProxy.h>
+#include <OCC/ControlClasses/Workers/BlocksAndMatrices/OcaLiteBlock.h>
+#include <OCC/ControlDataTypes/OcaLiteBlockMember.h>
+#include <OCC/ControlDataTypes/OcaLiteManagerDescriptor.h>
+#include <OCP.1/Ocp1LiteConnectParameters.h>
+#include <Proxy/GeneralProxy.h>
 
 // ---- FileInfo Macro ----
 

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/KeepAliveTest.cpp b/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/KeepAliveTest.cpp
@@ -5,7 +5,7 @@
  */
 
 // ---- Include system wide include files ----
-#include <OCALite/OCP.1/Ocp1LiteConnectParameters.h>
+#include <OCP.1/Ocp1LiteConnectParameters.h>
 #include <HostInterfaceLite/OCA/OCF/Timer/IOcfLiteTimer.h>
 
 // ---- FileInfo Macro ----

diff --git a/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/KeepAliveTest.h b/OCACompliancyTestTool/Aes70CompliancyTestTool/Tests/OCP.1/KeepAliveTest.h
@@ -11,7 +11,7 @@
 
 // ---- Include local include files ----
 #include "../../TestFramework/BaseTestClass.h"
-#include <OCALite/OCF/OcaLiteCommandHandlerController.h>
+#include <OCF/OcaLiteCommandHandlerController.h>
 
 // ---- Referenced classes and types ----
 

diff --git a/OCACompliancyTestTool/DNSSDResolver/DNSSDResolver.h b/OCACompliancyTestTool/DNSSDResolver/DNSSDResolver.h
@@ -10,7 +10,7 @@
 // ---- Include system wide include files ----
 #include <PlatformDataTypes.h>
 #define _WINSOCKAPI_
-#include <../platform/common/OcaLite/BonjourSDK/dns_sd.h>
+#include <../platform/common/BonjourSDK/dns_sd.h>
 
 // ---- Include local include files ----
 #include "ResolveResult.h"

diff --git a/.../OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Configuration/OcaLiteOcfConfiguration.cpp b/.../OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Configuration/OcaLiteOcfConfiguration.cpp
@@ -13,7 +13,8 @@
 #include <HostInterfaceLite/OCA/OCF/Configuration/IOcfLiteConfigure.h>
 #ifdef _WIN32
 #include <Winsock2.h>
-#else
+#elif __APPLE__
+#include <unistd.h>
 #endif
 
 // ---- FileInfo Macro ----

diff --git a/OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Logging/OcaLiteOcfLogger.cpp b/OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Logging/OcaLiteOcfLogger.cpp
@@ -46,8 +46,15 @@ void OcfLiteLogLogMessage(UINT8 logLevel, const char* type, const char* file, UI
         UINT32 messageLength(static_cast<UINT32>(::vsnprintf(NULL, 0, message, argList) + 1));
         if (messageLength <= MAX_FULL_MESSAGE_LENGTH)
         {
+            // For Apple this seems required to reset the argList after above vsnprintf function
+            va_start(argList, message);
+
+#ifdef _WIN32
             INT32 result(::vsprintf_s(m_fullLogMessage, message, argList));
-            bool bAddCarrageReturn = false;  
+#else
+            INT32 result(::vsprintf(m_fullLogMessage, message, argList));
+#endif
+            bool bAddCarrageReturn = false;
 
             if (static_cast<UINT32>(result) <= messageLength)
             {
@@ -72,11 +79,11 @@ void OcfLiteLogLogMessage(UINT8 logLevel, const char* type, const char* file, UI
 
                 if (m_fullLogMessage[0] == '.')
                 {
-                    printf("%s%s", &m_fullLogMessage[1], bAddCarrageReturn? "\r\n": "");
+                    printf("%s%s", &m_fullLogMessage[1], bAddCarrageReturn ? "\r\n" : "");
                 }
                 else
                 {
-                    printf("%*s%s%s", m_indent, "", m_fullLogMessage, bAddCarrageReturn? "\r\n": "");
+                    printf("%*s%s%s", m_indent, "", m_fullLogMessage, bAddCarrageReturn ? "\r\n" : "");
                 }
 
                 // Increase message indent
@@ -85,6 +92,14 @@ void OcfLiteLogLogMessage(UINT8 logLevel, const char* type, const char* file, UI
                     m_indent += 2;
                 }
             }
+            else 
+            {
+                printf("Buffer overflow in processing log message\r\n");
+            }
+        }
+        else 
+        {
+            printf("Buffer overflow in log message\r\n");
         }
         va_end(argList);
     }

diff --git a/OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Timer/OcaLiteOcfTimer.cpp b/OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCF/Timer/OcaLiteOcfTimer.cpp
@@ -9,7 +9,13 @@
  */
 
 // ---- Include system wide include files ----
+#ifdef _WIN32
 #include <Windows.h>
+#else
+#include <sys/time.h>
+#include <stdio.h>
+#include <unistd.h>
+#endif
 
 // ---- FileInfo Macro ----
 
@@ -21,5 +27,11 @@
 // Platform-specific implementation of static method 'GetTimerTickCount' of base class
 UINT32 OcfLiteTimerGetTimerTickCount(void)
 {
+#ifdef _WIN32
     return ::GetTickCount();
+#else
+    struct timeval start;
+    gettimeofday(&start, NULL);
+    return (UINT32)((start.tv_sec) * 1000 + start.tv_usec/1000.0);
+#endif
 }
diff --git a/OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCP.1/Network/OcaLiteOcp1Network.cpp b/OCAMicro/OCAMicro/Src/app/OCALite/HostInterface/OCA/OCP.1/Network/OcaLiteOcp1Network.cpp
@@ -28,6 +28,7 @@ bool Ocp1LiteNetworkInitialize()
 {
     if (!m_bInitialized)
     {
+#ifdef _WIN32
         int iResult;
         WSADATA wsaData;
         // Initialize Winsock
@@ -40,6 +41,9 @@ bool Ocp1LiteNetworkInitialize()
         {
             m_bInitialized = true;
         }
+#else
+        m_bInitialized = true;
+#endif
     }
 
     return true;