#include "global.h"
#include "cainterface.h"
#include "cacommon.h"
-#include "ocstackinternal.h"
#include "payload_logging.h"
#include "ocpayload.h"
{
OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result));
OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber);
- OC_LOG_PAYLOAD(INFO, TAG, clientResponse->payload);
+ OC_LOG_PAYLOAD(INFO, clientResponse->payload);
if ((OCSecurityPayload*)clientResponse->payload)
{
OC_LOG_V(INFO, TAG, "=============> Put Response",
{
OC_LOG_V(INFO, TAG, "StackResult: %s", getResult(clientResponse->result));
OC_LOG_V(INFO, TAG, "SEQUENCE NUMBER: %d", clientResponse->sequenceNumber);
- OC_LOG_PAYLOAD(INFO, TAG, clientResponse->payload);
+ OC_LOG_PAYLOAD(INFO, clientResponse->payload);
if ((OCSecurityPayload*)clientResponse->payload)
{
OC_LOG(INFO, TAG, PCF("=============> Get Response"));
if (clientResponse->result == OC_STACK_OK)
{
- OC_LOG_PAYLOAD(INFO, TAG, clientResponse->payload);
+ OC_LOG_PAYLOAD(INFO, clientResponse->payload);
ocConnType = clientResponse->connType;
parseClientResponse(clientResponse);
}
--- /dev/null
+# //******************************************************************
+# //
+# // Copyright 2015 Samsung Electronics All Rights Reserved.
+# //
+# //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+# //
+# // Licensed under the Apache License, Version 2.0 (the "License");
+# // you may not use this file except in compliance with the License.
+# // You may obtain a copy of the License at
+# //
+# // http://www.apache.org/licenses/LICENSE-2.0
+# //
+# // Unless required by applicable law or agreed to in writing, software
+# // distributed under the License is distributed on an "AS IS" BASIS,
+# // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# // See the License for the specific language governing permissions and
+# // limitations under the License.
+# //
+# //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+#
+
+Import('env')
+
+provisioning_env = env.Clone()
+
+######################################################################
+# Build flags
+######################################################################
+provisioning_env.AppendUnique(CPPPATH = [
+ '../../../../stack/include',
+ '../../../../ocrandom/include',
+ '../../../../logger/include',
+ '../../../../security/include',
+ '../../../../../oc_logger/include',
+ '../../include',
+ '../../include/internal',
+ '../../../include',
+ '../../../include/internal',
+ '../../../../../../extlibs/tinydtls',
+ '../../../../../../extlibs/cjson',
+ '../../../../../../extlibs/asn1cert/',
+ '../../../../../../extlibs/tinydtls/ecc/',
+ '../../../../../../extlibs/tinydtls/sha2/',
+ '../../../../connectivity/inc',
+ '../../../../connectivity/inc/pkix/',
+ '../../../../connectivity/common/inc',
+ '../../../../connectivity/lib/libcoap-4.1.1',
+ '../../../../connectivity/api',
+ '../../../../../c_common/oic_malloc/include',
+ '../include',
+ '../../include/oxm'
+ ])
+
+provisioning_env.AppendUnique(CFLAGS = ['-D__WITH_DTLS__','-std=c99'])
+provisioning_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall', '-pthread', '-fpermissive'])
+provisioning_env.AppendUnique(RPATH = [env.get('BUILD_DIR')])
+provisioning_env.AppendUnique(LIBPATH = [env.get('BUILD_DIR')])
+provisioning_env.ParseConfig('pkg-config --libs glib-2.0');
+
+provisioning_env.PrependUnique(LIBS = ['ocpmapi','oc', 'oc_logger', 'ocsrm','m', 'octbstack', 'connectivity_abstraction', 'coap'])
+provisioning_env.AppendUnique(LIBS = ['CKManager'])
+provisioning_env.AppendUnique(LIBS = ['asn1'])
+
+if env.get('SECURED') == '1':
+ provisioning_env.AppendUnique(LIBS = ['tinydtls'])
+
+provisioning_env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+
+######################################################################
+# Source files and Targets
+######################################################################
+provisioning_client = provisioning_env.Program('provisioningclient', 'provisioningclient.c')
+light_server =provisioning_env.Program('light_server', 'Light_sample.cpp')
+door_server=provisioning_env.Program('door_server', 'Door_sample.cpp')
+
+Alias("samples", [provisioning_client, light_server, door_server])
+
+provisioning_env.AppendTarget('samples')
+
+src_dir = provisioning_env.get('SRC_DIR')
+sec_provisioning_src_dir = src_dir + '/resource/csdk/security/provisioning/ck_manager/sample/'
+sec_provisioning_build_dir = env.get('BUILD_DIR') +'/resource/csdk/security/provisioning/ck_manager/sample/'
+
+provisioning_env.Alias("install", provisioning_env.Install( sec_provisioning_build_dir,
+ sec_provisioning_src_dir + 'oic_svr_db_pt.json'))
+provisioning_env.Alias("install", provisioning_env.Install( sec_provisioning_build_dir,
+ sec_provisioning_src_dir + 'oic_svr_db_light.json'))
+provisioning_env.Alias("install", provisioning_env.Install( sec_provisioning_build_dir,
+ sec_provisioning_src_dir + 'oic_svr_db_door.json'))
+provisioning_env.Alias("install", provisioning_env.Install( sec_provisioning_build_dir,
+ sec_provisioning_src_dir + 'README.txt'))
static OicSecAcl_t *gAcl = NULL;
static OicSecCrl_t *gCrl = NULL;
static char PROV_TOOL_DB_FILE[] = "oic_svr_db_pt.json";
+static const char* PRVN_DB_FILE_NAME = "oic_prvn_mng.db";
static int gOwnershipState = 0;
typedef enum
OC_LOG(ERROR, TAG, "OCStack init error");
goto error;
}
+ if(OC_STACK_OK != OCInitPM(PRVN_DB_FILE_NAME))
+ {
+ OC_LOG(ERROR, TAG, "OC_PM init error");
+ goto error;
+ }
OCProvisionDev_t* pDeviceList = NULL;
res = OCDiscoverUnownedDevices(PREDEFINED_TIMEOUT, &pDeviceList);
PRINT_BYTE_ARRAY("gCrl = \n", gCrl->CrlData);
-
res = OCProvisionCRL(ctx, pOwnedDevices[Device2], gCrl, &ProvisionCrlCB);
if (OC_STACK_OK != res) OC_LOG_V(ERROR, TAG, "Failed to CRL provision Device 2 : %d", res);
error:
deleteACL(gAcl);
- OCDeleteDiscoveredDevices(&pDeviceList);
- OCDeleteDiscoveredDevices(&pOwnedList);
+ OCDeleteDiscoveredDevices(pDeviceList);
+ OCDeleteDiscoveredDevices(pOwnedList);
return 0;
}
OC_LOG(INFO, TAG, "In SRPProvisionCredentials");
- bool linkExisits = true;
- OCStackResult res = PDMIsLinkExists(&pDev1->doxm->deviceID, &pDev2->doxm->deviceID, &linkExisits);
- if (res != OC_STACK_OK)
- {
- OC_LOG(ERROR, TAG, "Internal error occured");
- return res;
- }
- if (linkExisits)
+ if (SYMMETRIC_PAIR_WISE_KEY == type)
{
- OC_LOG(ERROR, TAG, "Link already exists");
- return OC_STACK_INVALID_PARAM;
+ bool linkExisits = true;
+ OCStackResult res = PDMIsLinkExists(&pDev1->doxm->deviceID, &pDev2->doxm->deviceID, &linkExisits);
+
+ if (res != OC_STACK_OK)
+ {
+ OC_LOG(ERROR, TAG, "Internal error occured");
+ return res;
+ }
+ if (linkExisits)
+ {
+ OC_LOG(ERROR, TAG, "Link already exists");
+ return OC_STACK_INVALID_PARAM;
+ }
}
OicUuid_t provTooldeviceID = {{0,}};