LDFLAGS := -L$(libcoap_build_dir) -L$(libtiny_lib_dir)
LDLIBS := -lcoap -ltinydtls
else
-LDFLAGS := -L$(libcoap_build_dir)
-LDLIBS := -lcoap
+LDFLAGS := -L$(libcoap_build_dir)
+LDLIBS := -lcoap
endif
BUILD_FLAG.debug = $(DEFINE_FLAG) $(DEBUG_FLAG)
##
## compiler flags
##
-CFLAGS = -g -c -Wall -fPIC `pkg-config --cflags glib-2.0`
+#TODO-CA Remove -fstack-protector-all before merging to master
+CFLAGS = -g -c -Wall -fstack-protector-all -fPIC `pkg-config --cflags glib-2.0`
LFLAGS = -ldl -lpthread `pkg-config --libs glib-2.0`
IFLAGS = -I$(PROJECT_COMMON_INC_PATH) \
-I$(PROJECT_API_PATH) \
-I$(WIFI_ADAPTER_PATH) \
-I$(BT_ADAPTER_PATH) \
-I$(BLE_ADAPTER_PATH) \
- -I$(libcoap_build_dir)
+ -I$(libcoap_build_dir)
ifeq ($(DTLS),1)
IFLAGS += -I$(libtiny_lib_dir)
clone->info.token = temp;
}
- if (rep->info.options != NULL)
+ if (rep->info.options != NULL && rep->info.numOptions)
{
// save the options
clone->info.options = (CAHeaderOption_t *) OICMalloc(sizeof(CAHeaderOption_t));
extern OCResource *headResource;
static const char * VIRTUAL_RSRCS[] = {
-// TODO-CA We will use the regular path once CA fixes this issue
-#ifdef CA_INT
- "oc/core",
- "oc/core/d",
- "oc/core/types/d",
- #ifdef WITH_PRESENCE
- "oc/presence"
- #endif
-#else
"/oc/core",
"/oc/core/d",
"/oc/core/types/d",
#ifdef WITH_PRESENCE
"/oc/presence"
#endif
-#endif
};
//-----------------------------------------------------------------------------