projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replace : iotivity -> iotivity-sec
[platform/upstream/iotivity.git]
/
resource
/
csdk
/
security
/
src
/
pconfresource.c
diff --git
a/resource/csdk/security/src/pconfresource.c
b/resource/csdk/security/src/pconfresource.c
index
ab89e3c
..
da0b9c0
100644
(file)
--- a/
resource/csdk/security/src/pconfresource.c
+++ b/
resource/csdk/security/src/pconfresource.c
@@
-25,7
+25,11
@@
#include "logger.h"
#include "oic_malloc.h"
#include "oic_string.h"
#include "logger.h"
#include "oic_malloc.h"
#include "oic_string.h"
+#if defined (__TIZENRT__)
+#include <apps/netutils/cJSON.h>
+#else
#include "cJSON.h"
#include "cJSON.h"
+#endif
#include "base64.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
#include "base64.h"
#include "ocpayload.h"
#include "ocpayloadcbor.h"
@@
-818,6
+822,7
@@
static OCEntityHandlerResult HandlePconfGetRequest (const OCEntityHandlerRequest
{
uint8_t* payload = NULL;
size_t size = 0;
{
uint8_t* payload = NULL;
size_t size = 0;
+ const OicSecDoxm_t *m_doxm = NULL;
OCEntityHandlerResult ehRet = OC_EH_OK;
OicSecPconf_t pconf;
OCEntityHandlerResult ehRet = OC_EH_OK;
OicSecPconf_t pconf;
@@
-825,7
+830,13
@@
static OCEntityHandlerResult HandlePconfGetRequest (const OCEntityHandlerRequest
OIC_LOG (DEBUG, TAG, "Pconf EntityHandle processing GET request");
OIC_LOG (DEBUG, TAG, "Pconf EntityHandle processing GET request");
- if (true == GetDoxmResourceData()->dpc)
+ m_doxm = GetDoxmResourceData();
+ if (NULL == m_doxm)
+ {
+ OIC_LOG (DEBUG, TAG, "Doxm resource Data is NULL");
+ }
+
+ if ((m_doxm) && (true == m_doxm->dpc))
{
//Making response elements for Get request
if( (true == gPconf->edp) &&
{
//Making response elements for Get request
if( (true == gPconf->edp) &&