# TODO-CA Remove -fstack-protector-all before merging to master
CC_FLAGS.debug := -O0 -g3 -Wall -fstack-protector-all -ffunction-sections -fdata-sections -fno-exceptions \
- -std=c++0x -pedantic $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG
+ -std=c++0x -pedantic $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG -DCA_INT
# TODO-CA Remove -fstack-protector-all before merging to master
CC_FLAGS.release := -Os -Wall -fstack-protector-all -fdata-sections -Wl,--gc-sections -Wl,-s -fno-exceptions \
- -std=c++0x $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG
+ -std=c++0x $(INC_DIRS) -L$(ROOT_DIR)/linux/$(BUILD) -DTB_LOG -DCA_INT
LDLIBS += -loctbstack -lpthread -L$(CONNECTIVITY_DIR)/build/out -lconnectivity_abstraction
CPPFLAGS += $(CC_FLAGS.$(BUILD)) $(LDLIBS)
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ ret = OCDoResource(&handle, method, query.str().c_str(), 0,
+ (method == OC_REST_PUT) ? putPayload.c_str() : NULL,
+ (OC_WIFI), qos, &cbData, options, numOptions);
+#else
ret = OCDoResource(&handle, method, query.str().c_str(), 0,
(method == OC_REST_PUT) ? putPayload.c_str() : NULL,
qos, &cbData, options, numOptions);
+#endif
if (ret != OC_STACK_OK)
{
remoteIpAddr + 1, remoteIpAddr + 2, remoteIpAddr + 3);
OCDevAddrToPort((OCDevAddr *) clientResponse->addr, &remotePortNu);
+#ifdef CA_INT
+ OC_LOG_V(INFO, TAG,
+ "Device =============> Discovered %s @ %d.%d.%d.%d:%d",
+ clientResponse->resJSONPayload, remoteIpAddr[0], remoteIpAddr[1],
+ remoteIpAddr[2], remoteIpAddr[3], remotePortNu);
+#else
OC_LOG_V(INFO, TAG,
"Device =============> Discovered %s @ %d.%d.%d.%d:%d",
clientResponse->resJSONPayload, remoteIpAddr[0], remoteIpAddr[1],
remoteIpAddr[2], remoteIpAddr[3], remotePortNu);
+#endif
parseClientResponse(clientResponse);
(strlen(TEST_APP_MULTICAST_DEVICE_DISCOVERY_QUERY) + 1));
}
+#ifdef CA_INT
+ ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_ETHERNET | OC_WIFI | OC_LE),
+ OC_LOW_QOS, &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_LOW_QOS, &cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
cbData.cb = discoveryReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_ETHERNET | OC_WIFI | OC_LE),
+ OC_LOW_QOS, &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_LOW_QOS, &cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to WiFi but should be configurable - add as API param
+ ret = OCDoResource(&handle, method, query.str().c_str(), 0,
+ (method == OC_REST_PUT || method == OC_REST_POST) ? putPayload.c_str() : NULL,
+ OC_WIFI, qos, &cbData, options, numOptions);
+#else
ret = OCDoResource(&handle, method, query.str().c_str(), 0,
(method == OC_REST_PUT || method == OC_REST_POST) ? putPayload.c_str() : NULL,
qos, &cbData, options, numOptions);
+#endif
if (ret != OC_STACK_OK)
{
cbData.cb = discoveryReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to all but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_ETHERNET | OC_WIFI | OC_LE),
+ OC_LOW_QOS, &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_LOW_QOS, &cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to WiFi but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_GET, getQuery.str().c_str(), 0, 0, (OC_WIFI), OC_LOW_QOS,
+ &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, getQuery.str().c_str(), 0, 0, OC_LOW_QOS,
&cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.cd = NULL;
OC_LOG_V(INFO, TAG, "OBSERVE payload from client = %s ", putPayload.c_str());
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to WiFi but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_OBSERVE, obsReg.str().c_str(), 0, 0, OC_WIFI, OC_LOW_QOS,
+ &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_OBSERVE, obsReg.str().c_str(), 0, 0, OC_LOW_QOS,
&cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.cd = NULL;
OC_LOG_V(INFO, TAG, "PUT payload from client = %s ", putPayload.c_str());
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to WiFi but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_PUT, getQuery.str().c_str(), 0, putPayload.c_str(),
+ OC_WIFI, OC_LOW_QOS, &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_PUT, getQuery.str().c_str(), 0, putPayload.c_str(),
OC_LOW_QOS, &cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.cb = getReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to WiFi but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_GET, getQuery.str().c_str(), 0, 0, OC_WIFI, OC_LOW_QOS,
+ &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, getQuery.str().c_str(), 0, 0, OC_LOW_QOS,
&cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.cb = discoveryReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to all but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_ETHERNET | OC_WIFI | OC_LE),
+ OC_LOW_QOS,
+ &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_LOW_QOS,
&cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to WiFi but should be configurable - add as API param
ret = OCDoResource(&handle, method, query.str().c_str(), 0,
- NULL,
- qos, &cbData, options, numOptions);
+ NULL, OC_WIFI, qos, &cbData, options, numOptions);
+#else
+ ret = OCDoResource(&handle, method, query.str().c_str(), 0,
+ NULL, qos, &cbData, options, numOptions);
+#endif
if (ret != OC_STACK_OK)
{
cbData.cb = discoveryReqCB;
cbData.context = (void*)DEFAULT_CONTEXT_VALUE;
cbData.cd = NULL;
+#ifdef CA_INT
+ // TODO-CA: The adapter type is set to all but should be configurable - add as API param
+ ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, (OC_ETHERNET | OC_WIFI | OC_LE),
+ OC_LOW_QOS, &cbData, NULL, 0);
+#else
ret = OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_LOW_QOS, &cbData, NULL, 0);
+#endif
if (ret != OC_STACK_OK)
{
OC_LOG(ERROR, TAG, "OCStack resource error");
#CXX := clang
OUT_DIR := $(BUILD)
-CXX_FLAGS.debug := -O0 -g3 -std=c++0x -Wall -pthread
+#TODO-CA Remove the CA Flag later
+CXX_FLAGS.debug := -O0 -g3 -std=c++0x -Wall -pthread -DCA_INT
-CXX_FLAGS.release := -O3 -std=c++0x -Wall -pthread
+CXX_FLAGS.release := -O3 -std=c++0x -Wall -pthread -DCA_INT
CXX_INC := -I../include/
CXX_INC += -I../oc_logger/include
devicediscoveryclient: devicediscoveryclient.cpp
$(CXX) $(CXX_FLAGS.$(BUILD)) -o $(OUT_DIR)/$@ devicediscoveryclient.cpp $(CXX_INC) $(CXX_LIBS)
-
-
+
+
ocicuc_target:
cd ocicuc && $(MAKE) apps