Updated TB Stack Unittest source code and makefile to be up to date with current...

diff --git a/csdk/stack/test/linux/Makefile b/csdk/stack/test/linux/Makefile
index 08a88aa..375005c 100644 (file)
--- a/csdk/stack/test/linux/Makefile
+++ b/csdk/stack/test/linux/Makefile
@@ -5,19 +5,17 @@ PLATFORM=linux
 
 #peg_ccfl-core
 ROOT_DIR = ../../..
-LIBCOAP_DIR = $(ROOT_DIR)/libcoap-4.1.1
 OCSOCK_DIR = $(ROOT_DIR)/ocsocket
-OCCOAP_DIR = $(ROOT_DIR)/occoap
 OCSTACK_DIR = $(ROOT_DIR)/stack
 LOGGER_DIR = $(ROOT_DIR)/logger
 RANDOM_DIR = $(ROOT_DIR)/ocrandom
-JSON_DIR = $(ROOT_DIR)/../../ccf-utilities/tb/cJSON
 
 OBJ_DIR = ./
-INC_DIRS = -I$(LOGGER_DIR)/include/ -I$(OCCOAP_DIR)/include/ \
-    -I$(OCSTACK_DIR)/include/ -I$(OCSTACK_DIR)/include/internal \
-    -I$(LIBCOAP_DIR)/ -I$(OCSOCK_DIR)/include -I$(RANDOM_DIR)/include \
-    -I$(JSON_DIR)
+
+INC_DIRS := -I$(OCSTACK_DIR)/include
+INC_DIRS += -I$(OCSOCK_DIR)/include
+INC_DIRS += -I$(LOGGER_DIR)/include
+INC_DIRS += -I$(RANDOM_DIR)/include
 
 ifeq ($(PLATFORM),android)
     CCPLUS=arm-linux-androideabi-g++
@@ -35,16 +33,14 @@ else
    $(error Wrong value for PLATFORM !!)
 endif
 
-DEP_LIBS = $(LIBCOAP_DIR)/libcoap.a
+DEP_LIBS = $(ROOT_DIR)/liboctbstack.a
 
 CFLAGS += -Os -Wall -Wno-write-strings -ffunction-sections -fdata-sections -fno-exceptions \
     -Wextra -Wno-variadic-macros -pedantic -std=gnu99 -DWITH_POSIX -DTB_LOG
 
-VPATH = $(OCCOAP_DIR)/src:$(OCSTACK_DIR)/src
-
 PROGRAMS = ocserver occlient
 
-SOURCES:= occlient.c ocserver.c ocstack.c occoap.c occlientcb.c ocserverrequest.c occoaphelper.c
+SOURCES:= occlient.c ocserver.c
 
 OBJECTS:= $(patsubst %.c, %.o, $(SOURCES))
 
@@ -54,10 +50,10 @@ all: $(PROGRAMS)
        $(CC) -c $(CFLAGS) $(CFLAGS_ANDROID) $(INC_DIRS) $< -o $@
 
 ##Added -lm as needed by json calling floor()
-occlient: occlient.o ocstack.o occoap.o occlientcb.o ocserverrequest.o occoaphelper.o $(DEP_LIBS)
+occlient: occlient.o $(DEP_LIBS)
        $(CC) -Os -Wl,--gc-sections $(LDFLAGS_ANDROID) $^ -o $@ -lm
 
-ocserver: ocserver.o ocstack.o occoap.o occlientcb.o ocserverrequest.o occoaphelper.o $(DEP_LIBS)
+ocserver: ocserver.o $(DEP_LIBS)
        $(CC) -Os -Wl,--gc-sections $(LDFLAGS_ANDROID) $^ -o $@ -lm
 
 install: all

diff --git a/csdk/stack/test/linux/occlient.c b/csdk/stack/test/linux/occlient.c
index 9615c7e..41244a5 100644 (file)
--- a/csdk/stack/test/linux/occlient.c
+++ b/csdk/stack/test/linux/occlient.c
@@ -55,6 +55,7 @@ int main() {
     uint8_t addr[20];
     uint16_t port = USE_RANDOM_PORT;
     uint8_t ifname[] = "eth0";
+    OCDoHandle handle;
 
     /*Get Ip address on defined interface and initialize coap on it with random port number
      * this port number will be used as a source port in all coap communications*/
@@ -70,8 +71,8 @@ int main() {
     /* Start a discovery query*/
     char szQueryUri[64] = { 0 };
     strcpy(szQueryUri, OC_EXPLICIT_DEVICE_DISCOVERY_URI);
-    if (OCDoResource(OC_REST_GET, szQueryUri, 0, 0, OC_NON_CONFIRMABLE,
-            applicationDiscoverCB) != OC_STACK_OK) {
+    if (OCDoResource(&handle, OC_REST_GET, szQueryUri, 0, 0, OC_NON_CONFIRMABLE,
+            0) != OC_STACK_OK) {
         OC_LOG(ERROR, TAG, "OCStack resource error");
         return 0;
     }

diff --git a/csdk/stack/test/linux/ocserver.c b/csdk/stack/test/linux/ocserver.c
index 34119ff..9f80dc1 100644 (file)
--- a/csdk/stack/test/linux/ocserver.c
+++ b/csdk/stack/test/linux/ocserver.c
@@ -30,7 +30,7 @@
 #define TAG PCF("ocserver")
 
 int gQuitFlag = 0;
-void createLEDResource();
+OCStackResult createLEDResource();
 
 typedef struct LEDRESOURCE{
     OCResourceHandle handle;
@@ -64,7 +64,10 @@ int main() {
     /*
      * Declare and create the example resource: LED
      */
-    createLEDResource();
+    if(createLEDResource() != OC_STACK_OK) 
+    {
+        OC_LOG(ERROR, TAG, "OCStack cannot create resource...");
+    }
 
     // Break from loop with Ctrl-C
     OC_LOG(INFO, TAG, "Entering ocserver main loop...");
@@ -88,7 +91,7 @@ int main() {
     return 0;
 }
 
-void createLEDResource() {
+OCStackResult createLEDResource() {
     LED.power = false;
     OCStackResult res = OCCreateResource(&LED.handle,
                     "core.led",
@@ -96,4 +99,5 @@ void createLEDResource() {
                     "/a/led",
                     0,
                     OC_DISCOVERABLE|OC_OBSERVABLE);
+    return res;
 }