Imported Upstream version 1.0.0

[platform/upstream/iotivity.git] / resource / csdk / security / src / resourcemanager.c

diff --git a/resource/csdk/security/src/resourcemanager.c b/resource/csdk/security/src/resourcemanager.c
index 615dae4..19fb099 100644 (file)
--- a/resource/csdk/security/src/resourcemanager.c
+++ b/resource/csdk/security/src/resourcemanager.c
@@ -24,13 +24,19 @@
 #include "pstatresource.h"
 #include "doxmresource.h"
 #include "credresource.h"
+#include "svcresource.h"
+#include "amaclresource.h"
 #include "oic_malloc.h"
 #include "oic_string.h"
 #include "logger.h"
 #include "utlist.h"
 #include <string.h>
 
-#define TAG PCF("SRM-RM")
+#define TAG "SRM-RM"
+
+#ifdef __WITH_X509__
+#include "crlresource.h"
+#endif // __WITH_X509__
 
 /**
  * This method is used by all secure resource modules to send responses to REST queries.
@@ -44,11 +50,11 @@
 OCStackResult SendSRMResponse(const OCEntityHandlerRequest *ehRequest,
         OCEntityHandlerResult ehRet, const char *rspPayload)
 {
-    OC_LOG (INFO, TAG, PCF("SRM sending SRM response"));
-    OCEntityHandlerResponse response = {};
+    OC_LOG (DEBUG, TAG, "SRM sending SRM response");
+    OCEntityHandlerResponse response = {.requestHandle = NULL};
     if (ehRequest)
     {
-        OCSecurityPayload ocPayload = {};
+        OCSecurityPayload ocPayload = {.base = {.type = PAYLOAD_TYPE_INVALID}};
 
         response.requestHandle = ehRequest->requestHandle;
         response.resourceHandle = ehRequest->resource;
@@ -91,6 +97,20 @@ OCStackResult InitSecureResources( )
     {
         ret = InitCredResource();
     }
+#ifdef __WITH_X509__
+    if(OC_STACK_OK == ret)
+    {
+        ret = InitCRLResource();
+    }
+#endif // __WITH_X509__
+    if(OC_STACK_OK == ret)
+    {
+        ret = InitSVCResource();
+       }
+       if(OC_STACK_OK == ret)
+    {
+        ret = InitAmaclResource();
+    }
     if(OC_STACK_OK != ret)
     {
         //TODO: Update the default behavior if one of the SVR fails
@@ -110,6 +130,11 @@ OCStackResult DestroySecureResources( )
     DeInitCredResource();
     DeInitDoxmResource();
     DeInitPstatResource();
+#ifdef __WITH_X509__
+    DeInitCRLResource();
+#endif // __WITH_X509__
+    DeInitSVCResource();
+    DeInitAmaclResource();
 
     return OC_STACK_OK;
 }