From a125e59577b388cab3a7950829e0ff7436d0f03e Mon Sep 17 00:00:00 2001 From: Charlie Lenahan Date: Thu, 26 Mar 2015 14:08:04 -0400 Subject: [PATCH] changes to build csdk for os x(darwin) resolves conflict with ERR_SUCCESS on os x. rename ERR_????? to OC_ERR_??? Change-Id: I991b1e0aab5fa271c6bfca0a69f8bbbb98ccf610 Signed-off-by: Charlie Lenahan Reviewed-on: https://gerrit.iotivity.org/gerrit/581 Tested-by: jenkins-iotivity Reviewed-by: Erich Keane --- SConstruct | 10 ++- .../iotivityconfig/compiler/gcc_configuration.py | 2 + resource/SConscript | 4 + resource/csdk/SConscript | 2 +- resource/csdk/libcoap-4.1.1/SConscript | 2 +- resource/csdk/libcoap-4.1.1/net.c | 4 +- resource/csdk/libcoap-4.1.1/sec/netdtls.c | 4 +- resource/csdk/logger/src/logger.c | 7 +- resource/csdk/occoap/src/occoap.c | 2 +- resource/csdk/ocrandom/src/ocrandom.c | 6 +- resource/csdk/ocsocket/include/ocsocket.h | 10 +-- resource/csdk/ocsocket/src/ocsocket.c | 50 ++++++------ resource/csdk/ocsocket/src/ocsocket_arduino.cpp | 34 ++++---- .../csdk/ocsocket/src/ocsocket_arduino_wifi.cpp | 26 +++---- .../csdk/ocsocket/test/android/ocsocket_gtest.cpp | 62 +++++++-------- .../csdk/ocsocket/test/arduino/ocsocket_test.cpp | 90 +++++++++++----------- .../ocsocket/test/arduino/ocsocket_wifi_test.cpp | 8 +- .../csdk/ocsocket/test/linux/ocsocket_gtest.cpp | 74 +++++++++--------- .../samples/linux/SimpleClientServer/occlient.cpp | 2 +- .../linux/SimpleClientServer/occlientbasicops.cpp | 2 +- .../linux/SimpleClientServer/occlientcoll.cpp | 2 +- .../linux/SimpleClientServer/occlientslow.cpp | 2 +- .../samples/linux/SimpleClientServer/ocserver.cpp | 2 +- .../linux/SimpleClientServer/ocserverbasicops.cpp | 2 +- .../linux/SimpleClientServer/ocservercoll.cpp | 2 +- .../linux/SimpleClientServer/ocserverslow.cpp | 2 +- .../samples/linux/secure/occlientbasicops.cpp | 2 +- .../samples/linux/secure/ocserverbasicops.cpp | 2 +- .../SampleApp/linux/notificationManager/main.c | 2 +- 29 files changed, 213 insertions(+), 206 deletions(-) diff --git a/SConstruct b/SConstruct index ee3c0f9..fb1bef0 100644 --- a/SConstruct +++ b/SConstruct @@ -6,7 +6,7 @@ import os # List of targets that only support the IoTivity C SDK. -targets_csdk_only = ['arduino'] +targets_csdk_only = ['arduino','darwin'] # Load common build config SConscript('build_common/SConscript', exports = 'targets_csdk_only') @@ -14,14 +14,16 @@ SConscript('build_common/SConscript', exports = 'targets_csdk_only') Import('env') target_os = env.get('TARGET_OS') -if target_os == 'arduino': - SConscript('arduino.scons') -else: + +if target_os not in targets_csdk_only: # Prepare libraries env.PrepareLib('cereal') env.PrepareLib('expat') env.PrepareLib('boost', 'boost_thread', os.path.join(env.get('SRC_DIR'), 'extlibs', 'boost')) env.PrepareLib('boost', 'boost_system', os.path.join(env.get('SRC_DIR'), 'extlibs', 'boost')) +else: + if target_os == 'arduino': + SConscript('arduino.scons') # By default, src_dir is current dir, the build_dir is: # ./out//// diff --git a/build_common/iotivityconfig/compiler/gcc_configuration.py b/build_common/iotivityconfig/compiler/gcc_configuration.py index ded43a7..fbc8f38 100644 --- a/build_common/iotivityconfig/compiler/gcc_configuration.py +++ b/build_common/iotivityconfig/compiler/gcc_configuration.py @@ -35,9 +35,11 @@ class GccConfiguration(Configuration): def_config = DefaultConfiguration(self._context) return """ +#ifndef __clang__ #pragma GCC diagnostic error "-Wall" #pragma GCC diagnostic error "-Werror" #pragma GCC diagnostic error "-pedantic" +#endif """ + def_config._c99_test_program() # ------------------------------------------------------------- diff --git a/resource/SConscript b/resource/SConscript index 8472f5d..f7b95f6 100644 --- a/resource/SConscript +++ b/resource/SConscript @@ -30,5 +30,9 @@ if target_os not in targets_csdk_only: if target_os == 'linux': # Build c samples SConscript('csdk/stack/samples/linux/SimpleClientServer/SConscript') +elif target_os == 'darwin': + # Build linux samples for now + SConscript('csdk/stack/samples/linux/SimpleClientServer/SConscript') elif target_os == 'arduino': + # Build c samples SConscript('csdk/stack/samples/arduino/SimpleClientServer/ocserver/SConscript') diff --git a/resource/csdk/SConscript b/resource/csdk/SConscript index 84f440f..7456313 100755 --- a/resource/csdk/SConscript +++ b/resource/csdk/SConscript @@ -65,7 +65,7 @@ liboctbstack_src = [ OCTBSTACK_SRC + 'ocsecurity.c', OCTBSTACK_SRC + 'oicgroup.c' ] -if target_os == 'arduino': +if target_os in ['arduino','darwin'] : static_liboctbstack = liboctbstack_env.StaticLibrary('octbstack', liboctbstack_src) liboctbstack_env.InstallTarget(static_liboctbstack, 'liboctbstack') else: diff --git a/resource/csdk/libcoap-4.1.1/SConscript b/resource/csdk/libcoap-4.1.1/SConscript index 1d13158..1d440f8 100644 --- a/resource/csdk/libcoap-4.1.1/SConscript +++ b/resource/csdk/libcoap-4.1.1/SConscript @@ -76,7 +76,7 @@ if target_os == 'arduino': else: libcoap_src.append(['../ocsocket/src/ocsocket.c']) -if target_os == 'arduino': +if target_os in ['arduino','darwin','ios']: static_libcoap = libcoap_env.StaticLibrary('libcoap', libcoap_src, OBJPREFIX='libcoap_') libcoap_env.InstallTarget(static_libcoap, 'libcoap') else: diff --git a/resource/csdk/libcoap-4.1.1/net.c b/resource/csdk/libcoap-4.1.1/net.c index 4acea0f..334c4d5 100644 --- a/resource/csdk/libcoap-4.1.1/net.c +++ b/resource/csdk/libcoap-4.1.1/net.c @@ -369,7 +369,7 @@ coap_new_context(uint8_t ipAddr[], uint16_t port) { #if defined(WITH_POSIX) || defined(WITH_ARDUINO) if (OCInitUDP((OCDevAddr *)listen_addr, - (int32_t *)&(c->sockfd), OC_SOCKET_REUSEADDR) != ERR_SUCCESS) { + (int32_t *)&(c->sockfd), OC_SOCKET_REUSEADDR) != OC_ERR_SUCCESS) { coap_free( c); return NULL; } @@ -453,7 +453,7 @@ int coap_join_wellknown_group(coap_context_t *ctx, const coap_address_t *multicast_addr) { #if defined(WITH_POSIX) || defined(WITH_ARDUINO) if (OCInitUDPMulticast((OCDevAddr *)multicast_addr, - (int32_t *)&(ctx->sockfd_wellknown)) != ERR_SUCCESS) { + (int32_t *)&(ctx->sockfd_wellknown)) != OC_ERR_SUCCESS) { return 1; } return 0; diff --git a/resource/csdk/libcoap-4.1.1/sec/netdtls.c b/resource/csdk/libcoap-4.1.1/sec/netdtls.c index e90e64b..ef5d762 100644 --- a/resource/csdk/libcoap-4.1.1/sec/netdtls.c +++ b/resource/csdk/libcoap-4.1.1/sec/netdtls.c @@ -381,10 +381,10 @@ int coap_dtls_init(coap_context_t *ctx, uint8_t ipAddr[]) { OCBuildIPv4Address(ipAddr[0], ipAddr[1], ipAddr[2], ipAddr[3], COAP_DTLS_DEFAULT_PORT, &dev_addr); - if (OCInitUDP((OCDevAddr *)&dev_addr, (int32_t *)&(ctx->sockfd_dtls), 0) != ERR_SUCCESS) { + if (OCInitUDP((OCDevAddr *)&dev_addr, (int32_t *)&(ctx->sockfd_dtls), 0) != OC_ERR_SUCCESS) { OCBuildIPv4Address(ipAddr[0], ipAddr[1], ipAddr[2], ipAddr[3], COAP_DTLS_RANDOM_PORT, &dev_addr); - if (OCInitUDP((OCDevAddr *)&dev_addr, (int32_t *)&(ctx->sockfd_dtls), 0) != ERR_SUCCESS) { + if (OCInitUDP((OCDevAddr *)&dev_addr, (int32_t *)&(ctx->sockfd_dtls), 0) != OC_ERR_SUCCESS) { goto exit; } } diff --git a/resource/csdk/logger/src/logger.c b/resource/csdk/logger/src/logger.c index ad9afd2..911d65f 100644 --- a/resource/csdk/logger/src/logger.c +++ b/resource/csdk/logger/src/logger.c @@ -33,7 +33,7 @@ static const uint16_t LINE_BUFFER_SIZE = (16 * 2) + 16 + 1; // Show 16 bytes, 2 // Convert LogLevel to platform-specific severity level. Store in PROGMEM on Arduino #ifdef __ANDROID__ static android_LogPriority LEVEL[] = {ANDROID_LOG_DEBUG, ANDROID_LOG_INFO, ANDROID_LOG_WARN, ANDROID_LOG_ERROR, ANDROID_LOG_FATAL}; -#elif defined __linux__ +#elif defined(__linux__) || defined(__APPLE__) static const char * LEVEL[] __attribute__ ((unused)) = {"DEBUG", "INFO", "WARNING", "ERROR", "FATAL"}; #elif defined ARDUINO #include @@ -70,7 +70,7 @@ void OCLogInit() { } void OCLogShutdown() { -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) if (logCtx && logCtx->destroy) { logCtx->destroy(logCtx); @@ -114,11 +114,10 @@ void OCLog(LogLevel level, const char * tag, const char * logStr) { #ifdef __ANDROID__ __android_log_write(LEVEL[level], tag, logStr); - #elif defined __linux__ + #elif defined(__linux__) || defined(__APPLE__) if (logCtx && logCtx->write_level) { logCtx->write_level(logCtx, LEVEL_XTABLE[level], logStr); - } else { diff --git a/resource/csdk/occoap/src/occoap.c b/resource/csdk/occoap/src/occoap.c index 63aa982..9a0fecb 100644 --- a/resource/csdk/occoap/src/occoap.c +++ b/resource/csdk/occoap/src/occoap.c @@ -954,7 +954,7 @@ OCStackResult OCGetResourceEndPointInfo (OCResource *resPtr, void *info) { sfd = (resPtr->resourceProperties & OC_SECURE) ? gCoAPCtx->sockfd_dtls : gCoAPCtx->sockfd; - if (OCGetSocketInfo(sfd, (uint16_t*)info) == ERR_SUCCESS) + if (OCGetSocketInfo(sfd, (uint16_t*)info) == OC_ERR_SUCCESS) result = OC_STACK_OK; exit: return result; diff --git a/resource/csdk/ocrandom/src/ocrandom.c b/resource/csdk/ocrandom/src/ocrandom.c index 8c2d0a4..648f72e 100644 --- a/resource/csdk/ocrandom/src/ocrandom.c +++ b/resource/csdk/ocrandom/src/ocrandom.c @@ -19,7 +19,7 @@ //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -#if defined(__ANDROID__) || defined(__linux__) +#if defined(__ANDROID__) || defined(__linux__) || defined(__APPLE__) #include "fcntl.h" #include "unistd.h" #endif @@ -62,7 +62,7 @@ uint8_t GetRandomBit() { #endif int8_t OCSeedRandom() { -#if defined(__ANDROID__) || defined(__linux__) +#if defined(__ANDROID__) || defined(__linux__) || defined(__APPLE__) int32_t fd = open("/dev/urandom", O_RDONLY); if (fd > 0) { uint32_t randomSeed; @@ -109,7 +109,7 @@ uint32_t OCGetRandom() { } uint8_t OCGetRandomByte(void) { -#if defined(__ANDROID__) || defined(__linux__) +#if defined(__ANDROID__) || defined(__linux__) || defined(__APPLE__) return rand() & 0x00FF; #elif defined ARDUINO return random(256) & 0x00FF; diff --git a/resource/csdk/ocsocket/include/ocsocket.h b/resource/csdk/ocsocket/include/ocsocket.h index 9bad9ed..86cf521 100644 --- a/resource/csdk/ocsocket/include/ocsocket.h +++ b/resource/csdk/ocsocket/include/ocsocket.h @@ -39,13 +39,13 @@ extern "C" { * This Socket interface needs to be implemented for every platform on * which CCF TB stack is expected to run. If some functionality is not * available on a platform, implement the method by returning error - * ERR_NOT_IMPLEMENTED. + * OC_ERR_NOT_IMPLEMENTED. */ -#define ERR_SUCCESS (0) -#define ERR_INVALID_INPUT (-900) -#define ERR_UNKNOWN (-901) -#define ERR_NOT_IMPLEMENTED (-903) +#define OC_ERR_SUCCESS (0) +#define OC_ERR_INVALID_INPUT (-900) +#define OC_ERR_UNKNOWN (-901) +#define OC_ERR_NOT_IMPLEMENTED (-903) /** This would need to be modified for specific platforms and specific diff --git a/resource/csdk/ocsocket/src/ocsocket.c b/resource/csdk/ocsocket/src/ocsocket.c index 1593d94..1f3b93b 100644 --- a/resource/csdk/ocsocket/src/ocsocket.c +++ b/resource/csdk/ocsocket/src/ocsocket.c @@ -45,7 +45,7 @@ #define MOD_NAME ("ocsocket") /// Macro to verify the validity of input argument -#define VERIFY_NON_NULL(arg) { if (!arg) {OC_LOG(FATAL, MOD_NAME, #arg " is NULL"); return ERR_INVALID_INPUT;} } +#define VERIFY_NON_NULL(arg) { if (!arg) {OC_LOG(FATAL, MOD_NAME, #arg " is NULL"); return OC_ERR_INVALID_INPUT;} } /// Builds a socket interface address using IP address and port number int32_t OCBuildIPv4Address(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint16_t port, OCDevAddr *ipAddr) @@ -69,7 +69,7 @@ int32_t OCBuildIPv4Address(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint16_t sa->sin_addr.s_addr = htonl(ip); sa->sin_port = htons(port); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } #ifdef __ANDROID__ @@ -77,17 +77,17 @@ int32_t OCBuildIPv4Address(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint16_t int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addrType, uint8_t *addr, uint32_t addrLen) { - int32_t ret = ERR_UNKNOWN; + int32_t ret = OC_ERR_UNKNOWN; int32_t sfd = 0xFFFFFFFF; struct ifreq ifr; VERIFY_NON_NULL(addr); VERIFY_NON_NULL(ifName); if (ifNameLen > (IFNAMSIZ - 1) ) { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } if (addrType != AF_INET) { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } sfd = socket(addrType, SOCK_DGRAM, 0); @@ -108,7 +108,7 @@ int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addr strncpy((char *)addr, inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr), addrLen); - ret = ERR_SUCCESS; + ret = OC_ERR_SUCCESS; exit: if (sfd >= 0) { @@ -123,12 +123,12 @@ int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addr uint8_t *addr, uint32_t addrLen) { struct ifaddrs *myaddrs = NULL, *ifa = NULL; - int32_t ret = ERR_UNKNOWN; + int32_t ret = OC_ERR_UNKNOWN; VERIFY_NON_NULL(addr); if (addrType != AF_INET) { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } if(getifaddrs(&myaddrs) != 0) { @@ -154,7 +154,7 @@ int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addr { struct sockaddr_in *s4 = (struct sockaddr_in *)ifa->ifa_addr; if(inet_ntop(AF_INET, &(s4->sin_addr), (char *)addr, addrLen)) - ret = ERR_SUCCESS; + ret = OC_ERR_SUCCESS; goto exit; } @@ -174,7 +174,7 @@ exit: /// Creates a BSD socket and binds it specified port for UDP int32_t OCInitUDP(OCDevAddr* ipAddr, int32_t *sockfd, OC_SOCKET_OPTION sockoption) { - int32_t ret = ERR_UNKNOWN; + int32_t ret = OC_ERR_UNKNOWN; int32_t sfd = 0xFFFFFFFF; int set_option_on = 1; @@ -205,10 +205,10 @@ int32_t OCInitUDP(OCDevAddr* ipAddr, int32_t *sockfd, OC_SOCKET_OPTION sockoptio } *sockfd = sfd; - ret = ERR_SUCCESS; + ret = OC_ERR_SUCCESS; exit: - if ((ret != ERR_SUCCESS) && (sfd >= 0)) { + if ((ret != OC_ERR_SUCCESS) && (sfd >= 0)) { close(sfd); } @@ -221,7 +221,7 @@ exit: /// Creates a BSD socket and binds the specified port for UDP multicast. int32_t OCInitUDPMulticast(OCDevAddr* ipmcastaddr, int32_t* sockfd) { - int32_t ret = ERR_UNKNOWN; + int32_t ret = OC_ERR_UNKNOWN; int32_t sfd = 0xFFFFFFFF; char loopch=1; int set_option_on = 1; @@ -274,10 +274,10 @@ int32_t OCInitUDPMulticast(OCDevAddr* ipmcastaddr, int32_t* sockfd) goto exit; } - ret = ERR_SUCCESS; + ret = OC_ERR_SUCCESS; exit: - if (ret == ERR_SUCCESS) { + if (ret == OC_ERR_SUCCESS) { *sockfd = sfd; } else { close(sfd); @@ -329,7 +329,7 @@ int32_t OCRecvFrom(int32_t sockfd, uint8_t* buf, uint32_t bufLen, uint32_t flags return ret; } if (!FD_ISSET(sockfd, &reads)) { - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } // Read available data. @@ -361,16 +361,16 @@ int32_t OCDevAddrToString(OCDevAddr* addr, char* stringAddress) { if (!stringAddress) { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } snprintf(stringAddress, DEV_ADDR_SIZE_MAX, "%u.%u.%u.%u", a, b, c, d); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } else { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } } @@ -383,7 +383,7 @@ int32_t OCDevAddrToIPv4Addr(OCDevAddr *ipAddr, uint8_t *a, uint8_t *b, if ( !ipAddr || !a || !b || !c || !d ) { OC_LOG(FATAL, MOD_NAME, "Invalid argument"); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } sa = (struct sockaddr_in*)ipAddr->addr; @@ -393,7 +393,7 @@ int32_t OCDevAddrToIPv4Addr(OCDevAddr *ipAddr, uint8_t *a, uint8_t *b, *b = *((uint8_t*)&ip + 2); *a = *((uint8_t*)&ip + 3); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -403,19 +403,19 @@ int32_t OCDevAddrToPort(OCDevAddr *ipAddr, uint16_t *port) struct sockaddr_in *sa; if ( !ipAddr || !port ) { OC_LOG(FATAL, MOD_NAME, "Invalid argument"); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } sa = (struct sockaddr_in*)ipAddr->addr; *port = ntohs(sa->sin_port); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } /// Retrieve the port to which socket is bound int32_t OCGetSocketInfo(int32_t sockfd, uint16_t *port) { - int32_t ret = ERR_SUCCESS; + int32_t ret = OC_ERR_SUCCESS; struct sockaddr_in sa; socklen_t salen = sizeof(sa); @@ -424,7 +424,7 @@ int32_t OCGetSocketInfo(int32_t sockfd, uint16_t *port) } else { OC_LOG_V(FATAL, MOD_NAME, "getsockname API failed with errno \ %s", strerror(errno)); - ret = ERR_UNKNOWN; + ret = OC_ERR_UNKNOWN; } return ret; } diff --git a/resource/csdk/ocsocket/src/ocsocket_arduino.cpp b/resource/csdk/ocsocket/src/ocsocket_arduino.cpp index ed51f79..400dfb1 100644 --- a/resource/csdk/ocsocket/src/ocsocket_arduino.cpp +++ b/resource/csdk/ocsocket/src/ocsocket_arduino.cpp @@ -35,7 +35,7 @@ /// Macro to verify the validity of input argument #define VERIFY_NON_NULL(arg) { if (!arg) {OC_LOG_V(FATAL, MOD_NAME, "%s is NULL", #arg); \ - return ERR_INVALID_INPUT;} } + return OC_ERR_INVALID_INPUT;} } /// Length of the IP address decimal notation string #define IPNAMESIZE (16) @@ -67,7 +67,7 @@ int32_t OCBuildIPv4Address(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint16_t ardAddr-> d = d; ardAddr-> port = port; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -80,18 +80,18 @@ int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addr VERIFY_NON_NULL(addr); if (addrLen < IPNAMESIZE) { OC_LOG(FATAL, MOD_NAME, PCF("OCGetInterfaceAddress: addrLen MUST be atleast 16")); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } if (addrType != AF_INET) { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } W5100.getIPAddress(rawIPAddr); snprintf((char *)addr, addrLen, "%d.%d.%d.%d", rawIPAddr[0], rawIPAddr[1], rawIPAddr[2], rawIPAddr[3]); OC_LOG_BUFFER(INFO, MOD_NAME, addr, addrLen); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } /// Retrieves a empty socket and bind it for UDP with the input port @@ -115,16 +115,16 @@ int32_t OCInitUDP(OCDevAddr* ipAddr, int32_t* sockfd, OC_SOCKET_OPTION sockoptio } if ( *sockfd == -1) { - return ERR_UNKNOWN; + return OC_ERR_UNKNOWN; } //Create a datagram socket on which to recv/send. if (!socket(*sockfd, SnMR::UDP, ardAddr->port, 0)) { - return ERR_UNKNOWN; + return OC_ERR_UNKNOWN; } OC_LOG(DEBUG, MOD_NAME, PCF("OCInitUDP End")); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -151,7 +151,7 @@ int32_t OCInitUDPMulticast(OCDevAddr* ipMcastMacAddr, int32_t* sockfd) } if ( *sockfd == -1) { - return ERR_UNKNOWN; + return OC_ERR_UNKNOWN; } //Calculate Multicast MAC address @@ -164,11 +164,11 @@ int32_t OCInitUDPMulticast(OCDevAddr* ipMcastMacAddr, int32_t* sockfd) //Create a datagram socket on which to recv/send. if (!socket(*sockfd, SnMR::UDP, ardAddr->port, SnMR::MULTI)) { - return ERR_UNKNOWN; + return OC_ERR_UNKNOWN; } OC_LOG(DEBUG, MOD_NAME, PCF("OCInitUDPMulticast End")); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -222,7 +222,7 @@ int32_t OCRecvFrom(int32_t sockfd, uint8_t* buf, uint32_t bufLen, uint32_t flags int32_t OCClose(int32_t sockfd) { close(sockfd); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -234,7 +234,7 @@ int32_t OCDevAddrToIPv4Addr(OCDevAddr *ipAddr, uint8_t *a, uint8_t *b, if ( !ardAddr || !a || !b || !c || !d ) { OC_LOG(FATAL, MOD_NAME, PCF("Invalid argument")); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } *a = ardAddr->a; @@ -242,7 +242,7 @@ int32_t OCDevAddrToIPv4Addr(OCDevAddr *ipAddr, uint8_t *a, uint8_t *b, *c = ardAddr->c; *d = ardAddr->d; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -253,16 +253,16 @@ int32_t OCDevAddrToPort(OCDevAddr *ipAddr, uint16_t *port) if ( !ardAddr || !port ) { OC_LOG(FATAL, MOD_NAME, PCF("Invalid argument")); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } *port = ardAddr->port; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } /// Retrieve the port to which socket is bound int32_t OCGetSocketInfo(int32_t sockfd, uint16_t *port) { - return ERR_NOT_IMPLEMENTED; + return OC_ERR_NOT_IMPLEMENTED; } diff --git a/resource/csdk/ocsocket/src/ocsocket_arduino_wifi.cpp b/resource/csdk/ocsocket/src/ocsocket_arduino_wifi.cpp index 37f5fe9..c8440be 100644 --- a/resource/csdk/ocsocket/src/ocsocket_arduino_wifi.cpp +++ b/resource/csdk/ocsocket/src/ocsocket_arduino_wifi.cpp @@ -31,7 +31,7 @@ /// Macro to verify the validity of input argument #define VERIFY_NON_NULL(arg) { if (!arg) {OC_LOG_V(FATAL, MOD_NAME, "%s is NULL", #arg); \ - return ERR_INVALID_INPUT;} } + return OC_ERR_INVALID_INPUT;} } /// Length of the IP address decimal notation string #define IPNAMESIZE (16) @@ -75,7 +75,7 @@ int32_t OCBuildIPv4Address(uint8_t a, uint8_t b, uint8_t c, uint8_t d, uint16_t ardAddr-> d = d; ardAddr-> port = port; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -88,11 +88,11 @@ int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addr VERIFY_NON_NULL(addr); if (addrLen < IPNAMESIZE) { OC_LOG(FATAL, MOD_NAME, PCF("OCGetInterfaceAddress: addrLen MUST be at least 16")); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } if (addrType != AF_INET) { - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } IPAddress ip = WiFi.localIP(); @@ -100,7 +100,7 @@ int32_t OCGetInterfaceAddress(uint8_t* ifName, uint32_t ifNameLen, uint16_t addr OC_LOG_BUFFER(INFO, MOD_NAME, addr, addrLen); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } /// Retrieves a empty socket and bind it for UDP with the input port @@ -126,11 +126,11 @@ int32_t OCInitUDP(OCDevAddr* ipAddr, int32_t* sockfd, OC_SOCKET_OPTION sockoptio if (*sockfd == -1) { - return ERR_UNKNOWN; + return OC_ERR_UNKNOWN; } OC_LOG(DEBUG, MOD_NAME, PCF("OCInitUDP End")); - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -260,7 +260,7 @@ int32_t OCClose(int32_t sockfd) WiFiClass::_server_port[sockfd] = 0; WiFiClass::_state[sockfd] = NA_STATE; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -272,7 +272,7 @@ int32_t OCDevAddrToIPv4Addr(OCDevAddr *ipAddr, uint8_t *a, uint8_t *b, if ( !ardAddr || !a || !b || !c || !d ) { OC_LOG(FATAL, MOD_NAME, PCF("Invalid argument")); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } *a = ardAddr->a; @@ -280,7 +280,7 @@ int32_t OCDevAddrToIPv4Addr(OCDevAddr *ipAddr, uint8_t *a, uint8_t *b, *c = ardAddr->c; *d = ardAddr->d; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } @@ -291,16 +291,16 @@ int32_t OCDevAddrToPort(OCDevAddr *ipAddr, uint16_t *port) if ( !ardAddr || !port ) { OC_LOG(FATAL, MOD_NAME, PCF("Invalid argument")); - return ERR_INVALID_INPUT; + return OC_ERR_INVALID_INPUT; } *port = ardAddr->port; - return ERR_SUCCESS; + return OC_ERR_SUCCESS; } /// Retrieve the port to which socket is bound int32_t OCGetSocketInfo(int32_t sockfd, uint16_t *port) { - return ERR_NOT_IMPLEMENTED; + return OC_ERR_NOT_IMPLEMENTED; } diff --git a/resource/csdk/ocsocket/test/android/ocsocket_gtest.cpp b/resource/csdk/ocsocket/test/android/ocsocket_gtest.cpp index 1c90e0b..61dcde8 100644 --- a/resource/csdk/ocsocket/test/android/ocsocket_gtest.cpp +++ b/resource/csdk/ocsocket/test/android/ocsocket_gtest.cpp @@ -83,13 +83,13 @@ unsigned int buf2_len = sizeof(buf2); TEST(BuildIPv4, Positive) { OCDevAddr ipaddr; - EXPECT_EQ(ERR_SUCCESS, OCBuildIPv4Address(224,0,0,251,5353, &ipaddr)); + EXPECT_EQ(OC_ERR_SUCCESS, OCBuildIPv4Address(224,0,0,251,5353, &ipaddr)); } TEST(BuildIPv4, InvalidInput) { - EXPECT_EQ(ERR_INVALID_INPUT, OCBuildIPv4Address(24,24,24,24,2424, NULL)); - EXPECT_EQ(ERR_INVALID_INPUT, OCBuildIPv4Address(-24,24,-24,24,2424, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCBuildIPv4Address(24,24,24,24,2424, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCBuildIPv4Address(-24,24,-24,24,2424, NULL)); } @@ -98,9 +98,9 @@ TEST(DevAddrToIPv4Addr, Positive) { uint8_t a,b,c,d; uint16_t port; OCBuildIPv4Address(1,2,3,4,5353, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCDevAddrToIPv4Addr(&ipaddr, &a, &b, &c, &d )); + EXPECT_EQ(OC_ERR_SUCCESS, OCDevAddrToIPv4Addr(&ipaddr, &a, &b, &c, &d )); EXPECT_TRUE((a == 1) && (b == 2) && (c == 3) && (d ==4)); - EXPECT_EQ(ERR_SUCCESS, OCDevAddrToPort(&ipaddr, &port )); + EXPECT_EQ(OC_ERR_SUCCESS, OCDevAddrToPort(&ipaddr, &port )); EXPECT_TRUE(port == 5353); } @@ -110,20 +110,20 @@ TEST(DevAddrToIPv4Addr, InvalidInput) { uint8_t a,b,c,d; uint16_t port; OCBuildIPv4Address(1,2,3,4,5353, &ipaddr); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, &a, &b, &c, &d )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(&ipaddr, NULL, &b, &c, &d )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, NULL, &b, &c, &d )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, &a, &b, &c, &d )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(&ipaddr, NULL, &b, &c, &d )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, NULL, &b, &c, &d )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToPort(NULL, &port )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToPort(&ipaddr, NULL )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToPort(NULL, NULL )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToPort(NULL, &port )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToPort(&ipaddr, NULL )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToPort(NULL, NULL )); } TEST(GetInterfaceAddress, Positive) { uint8_t addr[20]; uint8_t ifname[] = "wlan0"; - EXPECT_EQ(ERR_SUCCESS, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_SUCCESS, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); OC_LOG_V(INFO, MOD_NAME, "IPv4 Address: %s\n", addr); //On Android, it is MUST to provide interface name //EXPECT_EQ(0, get_ipv4addr( NULL, 0, addr, sizeof(addr))); @@ -132,11 +132,11 @@ TEST(GetInterfaceAddress, Positive) { TEST(GetInterfaceAddress, Negative) { uint8_t addr[20]; uint8_t ifname[] = "ethxx"; - EXPECT_EQ(ERR_INVALID_INPUT, OCGetInterfaceAddress( NULL, 0, AF_INET, addr, sizeof(addr))); - EXPECT_EQ(ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); - EXPECT_EQ(ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, NULL, sizeof(addr))); - EXPECT_EQ(ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, 0)); - EXPECT_EQ(ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET6, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCGetInterfaceAddress( NULL, 0, AF_INET, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, NULL, sizeof(addr))); + EXPECT_EQ(OC_ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, 0)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET6, addr, sizeof(addr))); } TEST(InitUDP, Positive) { @@ -147,17 +147,17 @@ TEST(InitUDP, Positive) { uint8_t a,b,c,d; OCBuildIPv4Address(0,0,0,0, 0, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); OCClose(sockfd); OCBuildIPv4Address(0,0,0,0, 5678, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); OCClose(sockfd); OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr)); sscanf((const char*)addr, "%d.%d.%d.%d", (int*)&a, (int*)&b, (int*)&c, (int*)&d); OCBuildIPv4Address(a,b,c,d, TEST_PORT_NUM, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); OCClose(sockfd); } @@ -167,9 +167,9 @@ TEST(InitUDP, Negative) { int32_t sockfd; OCBuildIPv4Address(0,0,0,0, 0, &ipaddr); - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDP(NULL, &sockfd)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDP(NULL, &sockfd)); - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDP(&ipaddr, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDP(&ipaddr, NULL)); } @@ -179,7 +179,7 @@ TEST(InitUDPMulticast, Positive) { int32_t sfd; OCBuildIPv4Address(224, 0, 0, 251, 5353, &ipaddr1); //address to which MEMBERSHIP needs to be added - EXPECT_EQ(ERR_SUCCESS, OCInitUDPMulticast(&ipaddr1, &sfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDPMulticast(&ipaddr1, &sfd)); OCClose(sfd); } @@ -189,8 +189,8 @@ TEST(InitUDPMulticast, Negative) { int32_t sfd; OCBuildIPv4Address(224, 0, 0, 251, 5353, &ipaddr1); //address to which MEMBERSHIP needs to be added - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDPMulticast(NULL, &sfd)); - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDPMulticast(&ipaddr1, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDPMulticast(NULL, &sfd)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDPMulticast(&ipaddr1, NULL)); } @@ -221,7 +221,7 @@ TEST(SendToRecvfromUnicast, Positive) { ipaddr3.size = sizeof(ipaddr3.addr); //EXPECT_EQ(buf1_len, OCRecvFrom(rsfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - //EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); + //EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); //Test 2 -- Send 1 byte //Send the packet to ipaddr2(myself:TEST_PORT_NUM) @@ -230,7 +230,7 @@ TEST(SendToRecvfromUnicast, Positive) { ipaddr3.size = sizeof(ipaddr3.addr); //EXPECT_EQ( 1, OCRecvFrom(rsfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - //EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, 1)); + //EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, 1)); //Test 3 -- Send 320 byte //Send the packet to ipaddr2(myself:TEST_PORT_NUM) @@ -239,7 +239,7 @@ TEST(SendToRecvfromUnicast, Positive) { ipaddr3.size = sizeof(ipaddr3.addr); //EXPECT_EQ(buf2_len, OCRecvFrom(rsfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - //EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); + //EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); OCClose(ssfd); OCClose(rsfd); @@ -266,7 +266,7 @@ TEST(SendToRecvfromMulticast, Positive) { ipaddr4.size = sizeof(ipaddr4.addr); EXPECT_EQ(buf1_len, OCRecvFrom(ssfd, tmp1, sizeof(tmp1), 0, &ipaddr4)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); //Test 2 -- Send 1 byte EXPECT_EQ( 1, OCSendTo(ssfd, buf1, 1, 0, &ipaddr3)); @@ -274,7 +274,7 @@ TEST(SendToRecvfromMulticast, Positive) { ipaddr4.size = sizeof(ipaddr4.addr); EXPECT_EQ( 1, OCRecvFrom(ssfd, tmp1, sizeof(tmp1), 0, &ipaddr4)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, 1)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, 1)); //Test 3 -- Send 320 byte EXPECT_EQ(buf2_len, OCSendTo(ssfd, buf2, buf2_len, 0, &ipaddr3)); @@ -282,7 +282,7 @@ TEST(SendToRecvfromMulticast, Positive) { ipaddr4.size = sizeof(ipaddr4.addr); EXPECT_EQ(buf2_len, OCRecvFrom(ssfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); OCClose(ssfd); } diff --git a/resource/csdk/ocsocket/test/arduino/ocsocket_test.cpp b/resource/csdk/ocsocket/test/arduino/ocsocket_test.cpp index 1271143..8a60bd0 100644 --- a/resource/csdk/ocsocket/test/arduino/ocsocket_test.cpp +++ b/resource/csdk/ocsocket/test/arduino/ocsocket_test.cpp @@ -91,20 +91,20 @@ unsigned int TEST_BUF_LEN = sizeof(TEST_BUF); //OCGetInterfaceAddress tests void test10() { char strAddr[16] = ""; - VERIFY_SUCCESS(OCGetInterfaceAddress(NULL, 0, AF_INET, (uint8_t*)strAddr, 16), ERR_SUCCESS); + VERIFY_SUCCESS(OCGetInterfaceAddress(NULL, 0, AF_INET, (uint8_t*)strAddr, 16), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("My IP address :")); OC_LOG_BUFFER(INFO, MOD_NAME, (uint8_t*)strAddr, sizeof(strAddr)); delay(15000); - VERIFY_SUCCESS(OCGetInterfaceAddress(NULL, 0, AF_INET, NULL, 16), ERR_INVALID_INPUT); - VERIFY_SUCCESS(OCGetInterfaceAddress(NULL, 0, AF_INET, (uint8_t*)strAddr, 10), ERR_INVALID_INPUT); + VERIFY_SUCCESS(OCGetInterfaceAddress(NULL, 0, AF_INET, NULL, 16), OC_ERR_INVALID_INPUT); + VERIFY_SUCCESS(OCGetInterfaceAddress(NULL, 0, AF_INET, (uint8_t*)strAddr, 10), OC_ERR_INVALID_INPUT); OC_LOG(DEBUG, MOD_NAME, PCF("test10 - Completed")); } //OCBuildIPv4Address tests void test20() { OCDevAddr ipAddr; - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, NULL), ERR_INVALID_INPUT); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, NULL), OC_ERR_INVALID_INPUT); OC_LOG(DEBUG, MOD_NAME, PCF("test20 - Completed")); } @@ -114,20 +114,20 @@ void test30() { OCDevAddr ipAddr; uint8_t a, b, c, d; uint16_t port; - VERIFY_SUCCESS(OCBuildIPv4Address( 1, 2, 3, 4, TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCDevAddrToIPv4Addr( &ipAddr, &a, &b, &c, &d), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 1, 2, 3, 4, TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCDevAddrToIPv4Addr( &ipAddr, &a, &b, &c, &d), OC_ERR_SUCCESS); if ((a != 1) || (b != 2) || (c !=3) || (d !=4)) { OC_LOG(DEBUG, MOD_NAME, PCF("test30 - Failed !!!")); return; } - VERIFY_SUCCESS(OCDevAddrToPort( &ipAddr, &port), ERR_SUCCESS); + VERIFY_SUCCESS(OCDevAddrToPort( &ipAddr, &port), OC_ERR_SUCCESS); if (port != TEST_PORT_NUM) { OC_LOG(DEBUG, MOD_NAME, PCF("test30 - Failed !!!")); return; } - VERIFY_SUCCESS(OCDevAddrToIPv4Addr( NULL, &a, &b, &c, &d), ERR_INVALID_INPUT); - VERIFY_SUCCESS(OCDevAddrToPort( &ipAddr, NULL), ERR_INVALID_INPUT); + VERIFY_SUCCESS(OCDevAddrToIPv4Addr( NULL, &a, &b, &c, &d), OC_ERR_INVALID_INPUT); + VERIFY_SUCCESS(OCDevAddrToPort( &ipAddr, NULL), OC_ERR_INVALID_INPUT); OC_LOG(DEBUG, MOD_NAME, PCF("test30 - Completed")); } @@ -137,29 +137,29 @@ void test40() { int32_t sfd1, sfd2, sfd3, sfd4, sfd5; //We should be able to successfully open 4 sockets. - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd1), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd1), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 1, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd2), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 1, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd2), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 2, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd3), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 2, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd3), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 3, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd4), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 3, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd4), OC_ERR_SUCCESS); //5th socket creation call should FAIL - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 4, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd5), ERR_UNKNOWN); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 4, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd5), OC_ERR_UNKNOWN); - VERIFY_SUCCESS(OCClose( sfd4), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd5), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd4), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd5), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCClose( sfd1), ERR_SUCCESS); - VERIFY_SUCCESS(OCClose( sfd2), ERR_SUCCESS); - VERIFY_SUCCESS(OCClose( sfd3), ERR_SUCCESS); - VERIFY_SUCCESS(OCClose( sfd5), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd1), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd2), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd3), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd5), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("test40 - Completed")); } @@ -170,14 +170,14 @@ void test50() { int32_t sfd1, sfd2; VERIFY_SUCCESS(OCBuildIPv4Address( MULTICAST_IP_ADDR[0], MULTICAST_IP_ADDR[1], - MULTICAST_IP_ADDR[2], MULTICAST_IP_ADDR[3], TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDPMulticast( &ipAddr, &sfd1), ERR_SUCCESS); + MULTICAST_IP_ADDR[2], MULTICAST_IP_ADDR[3], TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDPMulticast( &ipAddr, &sfd1), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 1, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd2), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM + 1, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd2), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCClose( sfd1), ERR_SUCCESS); - VERIFY_SUCCESS(OCClose( sfd2), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd1), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd2), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("test50 - Completed")); } @@ -187,18 +187,18 @@ void test60() { OCDevAddr ipAddr, peerAddr; int32_t sfd; - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); VERIFY_SUCCESS(OCBuildIPv4Address(PEER_IP_ADDR[0], PEER_IP_ADDR[0], - PEER_IP_ADDR[0], PEER_IP_ADDR[0], TEST_PORT_NUM, &peerAddr), ERR_SUCCESS); + PEER_IP_ADDR[0], PEER_IP_ADDR[0], TEST_PORT_NUM, &peerAddr), OC_ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd), OC_ERR_SUCCESS); for (int i = 2; i < 300; ) { VERIFY_SUCCESS(OCSendTo(sfd, TEST_BUF, i, 0, &peerAddr), i); i = i + 12; delay(100); } - VERIFY_SUCCESS(OCClose( sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("test60 - Completed")); } @@ -209,15 +209,15 @@ void test70() { int32_t sfd; VERIFY_SUCCESS(OCBuildIPv4Address( MULTICAST_IP_ADDR[0], MULTICAST_IP_ADDR[1], - MULTICAST_IP_ADDR[2], MULTICAST_IP_ADDR[3], TEST_PORT_NUM, &ipAddrMcast), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDPMulticast( &ipAddrMcast, &sfd), ERR_SUCCESS); + MULTICAST_IP_ADDR[2], MULTICAST_IP_ADDR[3], TEST_PORT_NUM, &ipAddrMcast), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDPMulticast( &ipAddrMcast, &sfd), OC_ERR_SUCCESS); for (int i = 2; i < 300; ) { VERIFY_SUCCESS(OCSendTo(sfd, TEST_BUF, i, 0, &ipAddrMcast), i); i = i + 12; delay(100); } - VERIFY_SUCCESS(OCClose( sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("test70 - Completed")); } @@ -233,8 +233,8 @@ void test80() { uint8_t pktrecv = 0; //Unicast - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd), OC_ERR_SUCCESS); do { recvLen = OCRecvFrom(sfd, buf, MAX_BUF_SIZE, 0, &peerAddr); @@ -252,7 +252,7 @@ void test80() { delay(500); //delay secs } while (pktrecv < TEST_NUM_PKTS); - VERIFY_SUCCESS(OCClose(sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose(sfd), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("test80 - Completed")); } @@ -268,8 +268,8 @@ void test90() { //Multicast VERIFY_SUCCESS(OCBuildIPv4Address( MULTICAST_IP_ADDR[0], MULTICAST_IP_ADDR[1], - MULTICAST_IP_ADDR[2], MULTICAST_IP_ADDR[3], TEST_PORT_NUM, &ipAddrMcast), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDPMulticast( &ipAddrMcast, &sfd), ERR_SUCCESS); + MULTICAST_IP_ADDR[2], MULTICAST_IP_ADDR[3], TEST_PORT_NUM, &ipAddrMcast), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDPMulticast( &ipAddrMcast, &sfd), OC_ERR_SUCCESS); do { @@ -288,7 +288,7 @@ void test90() { delay(500); //delay secs } while (pktrecv < TEST_NUM_PKTS); - VERIFY_SUCCESS(OCClose(sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose(sfd), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("test90 - Completed")); } diff --git a/resource/csdk/ocsocket/test/arduino/ocsocket_wifi_test.cpp b/resource/csdk/ocsocket/test/arduino/ocsocket_wifi_test.cpp index 0138afb..014ed35 100644 --- a/resource/csdk/ocsocket/test/arduino/ocsocket_wifi_test.cpp +++ b/resource/csdk/ocsocket/test/arduino/ocsocket_wifi_test.cpp @@ -101,10 +101,10 @@ void SendReceiveTest() uint8_t buf[MAX_BUF_SIZE]; uint16_t recvPort; - VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), ERR_SUCCESS); + VERIFY_SUCCESS(OCBuildIPv4Address( 0, 0, 0, 0, TEST_PORT_NUM, &ipAddr), OC_ERR_SUCCESS); VERIFY_SUCCESS(OCBuildIPv4Address(PEER_IP_ADDR[0], PEER_IP_ADDR[1], - PEER_IP_ADDR[2], PEER_IP_ADDR[3], TEST_PORT_NUM, &peerAddr), ERR_SUCCESS); - VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd), ERR_SUCCESS); + PEER_IP_ADDR[2], PEER_IP_ADDR[3], TEST_PORT_NUM, &peerAddr), OC_ERR_SUCCESS); + VERIFY_SUCCESS(OCInitUDP( &ipAddr, &sfd), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("Peer Addr :")); OC_LOG_BUFFER(INFO, MOD_NAME, peerAddr.addr, peerAddr.size); for (int i = 0; i < 300; i++) @@ -149,7 +149,7 @@ void SendReceiveTest() } } - VERIFY_SUCCESS(OCClose( sfd), ERR_SUCCESS); + VERIFY_SUCCESS(OCClose( sfd), OC_ERR_SUCCESS); OC_LOG(DEBUG, MOD_NAME, PCF("WifiTest - Completed")); } diff --git a/resource/csdk/ocsocket/test/linux/ocsocket_gtest.cpp b/resource/csdk/ocsocket/test/linux/ocsocket_gtest.cpp index b6c9872..77226fb 100644 --- a/resource/csdk/ocsocket/test/linux/ocsocket_gtest.cpp +++ b/resource/csdk/ocsocket/test/linux/ocsocket_gtest.cpp @@ -82,13 +82,13 @@ unsigned int buf2_len = sizeof(buf2); TEST(BuildIPv4, Positive) { OCDevAddr ipaddr; - EXPECT_EQ(ERR_SUCCESS, OCBuildIPv4Address(224,0,0,251,5353, &ipaddr)); + EXPECT_EQ(OC_ERR_SUCCESS, OCBuildIPv4Address(224,0,0,251,5353, &ipaddr)); } TEST(BuildIPv4, InvalidInput) { - EXPECT_EQ(ERR_INVALID_INPUT, OCBuildIPv4Address(24,24,24,24,2424, NULL)); - EXPECT_EQ(ERR_INVALID_INPUT, OCBuildIPv4Address(-24,24,-24,24,2424, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCBuildIPv4Address(24,24,24,24,2424, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCBuildIPv4Address(-24,24,-24,24,2424, NULL)); } TEST(DevAddrToIPv4Addr, Positive) { @@ -96,9 +96,9 @@ TEST(DevAddrToIPv4Addr, Positive) { uint8_t a,b,c,d; uint16_t port; OCBuildIPv4Address(1,2,3,4,5353, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCDevAddrToIPv4Addr(&ipaddr, &a, &b, &c, &d )); + EXPECT_EQ(OC_ERR_SUCCESS, OCDevAddrToIPv4Addr(&ipaddr, &a, &b, &c, &d )); EXPECT_TRUE((a == 1) && (b == 2) && (c == 3) && (d ==4)); - EXPECT_EQ(ERR_SUCCESS, OCDevAddrToPort(&ipaddr, &port )); + EXPECT_EQ(OC_ERR_SUCCESS, OCDevAddrToPort(&ipaddr, &port )); EXPECT_TRUE(port == 5353); } @@ -108,13 +108,13 @@ TEST(DevAddrToIPv4Addr, InvalidInput) { uint8_t a,b,c,d; uint16_t port; OCBuildIPv4Address(1,2,3,4,5353, &ipaddr); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, &a, &b, &c, &d )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(&ipaddr, NULL, &b, &c, &d )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, NULL, &b, &c, &d )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, &a, &b, &c, &d )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(&ipaddr, NULL, &b, &c, &d )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToIPv4Addr(NULL, NULL, &b, &c, &d )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToPort(NULL, &port )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToPort(&ipaddr, NULL )); - EXPECT_EQ(ERR_INVALID_INPUT, OCDevAddrToPort(NULL, NULL )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToPort(NULL, &port )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToPort(&ipaddr, NULL )); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCDevAddrToPort(NULL, NULL )); } @@ -123,19 +123,19 @@ TEST(DevAddrToIPv4Addr, InvalidInput) { TEST(GetInterfaceAddress, Positive) { uint8_t addr[20]; uint8_t ifname[] = "eth0"; - EXPECT_EQ(ERR_SUCCESS, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_SUCCESS, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); printf("IPv4 Address: %s\n", addr); - EXPECT_EQ(ERR_SUCCESS, OCGetInterfaceAddress( NULL, 0, AF_INET, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_SUCCESS, OCGetInterfaceAddress( NULL, 0, AF_INET, addr, sizeof(addr))); printf("IPv4 Address: %s\n", addr); } TEST(GetInterfaceAddress, Negative) { uint8_t addr[20]; uint8_t ifname[] = "ethxx"; - EXPECT_EQ(ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); - EXPECT_EQ(ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, NULL, sizeof(addr))); - EXPECT_EQ(ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, 0)); - EXPECT_EQ(ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET6, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr))); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, NULL, sizeof(addr))); + EXPECT_EQ(OC_ERR_UNKNOWN, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, 0)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET6, addr, sizeof(addr))); } TEST(InitUDP, Positive) { @@ -146,17 +146,17 @@ TEST(InitUDP, Positive) { uint8_t a,b,c,d; OCBuildIPv4Address(0,0,0,0, 0, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); OCClose(sockfd); OCBuildIPv4Address(0,0,0,0, 5678, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); OCClose(sockfd); OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr)); sscanf((const char*)addr, "%d.%d.%d.%d", (int*)&a, (int*)&b, (int*)&c, (int*)&d); OCBuildIPv4Address(a,b,c,d, TEST_PORT_NUM, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); OCClose(sockfd); } @@ -166,9 +166,9 @@ TEST(InitUDP, Negative) { int32_t sockfd; OCBuildIPv4Address(0,0,0,0, 0, &ipaddr); - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDP(NULL, &sockfd)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDP(NULL, &sockfd)); - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDP(&ipaddr, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDP(&ipaddr, NULL)); } @@ -178,7 +178,7 @@ TEST(InitUDPMulticast, Positive) { int32_t sfd; OCBuildIPv4Address(224, 0, 0, 251, 5353, &ipaddr1); //address to which MEMBERSHIP needs to be added - EXPECT_EQ(ERR_SUCCESS, OCInitUDPMulticast(&ipaddr1, &sfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDPMulticast(&ipaddr1, &sfd)); OCClose(sfd); } @@ -188,8 +188,8 @@ TEST(InitUDPMulticast, Negative) { int32_t sfd; OCBuildIPv4Address(224, 0, 0, 251, 5353, &ipaddr1); //address to which MEMBERSHIP needs to be added - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDPMulticast(NULL, &sfd)); - EXPECT_EQ(ERR_INVALID_INPUT, OCInitUDPMulticast(&ipaddr1, NULL)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDPMulticast(NULL, &sfd)); + EXPECT_EQ(OC_ERR_INVALID_INPUT, OCInitUDPMulticast(&ipaddr1, NULL)); } @@ -221,7 +221,7 @@ TEST(SendToRecvfromUnicast, Positive) { ipaddr3.size = sizeof(ipaddr3.addr); EXPECT_EQ(buf1_len, OCRecvFrom(rsfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); //Test 2 -- Send 1 byte //Send the packet to ipaddr2(myself:TEST_PORT_NUM) @@ -230,7 +230,7 @@ TEST(SendToRecvfromUnicast, Positive) { ipaddr3.size = sizeof(ipaddr3.addr); EXPECT_EQ( 1, OCRecvFrom(rsfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, 1)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, 1)); //Test 3 -- Send 320 byte //Send the packet to ipaddr2(myself:TEST_PORT_NUM) @@ -239,7 +239,7 @@ TEST(SendToRecvfromUnicast, Positive) { ipaddr3.size = sizeof(ipaddr3.addr); EXPECT_EQ(buf2_len, OCRecvFrom(rsfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); OCClose(ssfd); OCClose(rsfd); @@ -265,7 +265,7 @@ TEST(SendToRecvfromMulticast, Positive) { ipaddr4.size = sizeof(ipaddr4.addr); EXPECT_EQ(buf1_len, OCRecvFrom(ssfd, tmp1, sizeof(tmp1), 0, &ipaddr4)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, buf1_len)); //Test 2 -- Send 1 byte EXPECT_EQ( 1, OCSendTo(ssfd, buf1, 1, 0, &ipaddr3)); @@ -273,7 +273,7 @@ TEST(SendToRecvfromMulticast, Positive) { ipaddr4.size = sizeof(ipaddr4.addr); EXPECT_EQ( 1, OCRecvFrom(ssfd, tmp1, sizeof(tmp1), 0, &ipaddr4)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf1, 1)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf1, 1)); //Test 3 -- Send 320 byte EXPECT_EQ(buf2_len, OCSendTo(ssfd, buf2, buf2_len, 0, &ipaddr3)); @@ -281,7 +281,7 @@ TEST(SendToRecvfromMulticast, Positive) { ipaddr4.size = sizeof(ipaddr4.addr); EXPECT_EQ(buf2_len, OCRecvFrom(ssfd, tmp1, sizeof(tmp1), 0, &ipaddr3)); //Compare the received buffer with send buffer - EXPECT_EQ(ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); + EXPECT_EQ(OC_ERR_SUCCESS, memcmp(tmp1, buf2, buf2_len)); OCClose(ssfd); } @@ -295,14 +295,14 @@ TEST(GetSocketInfo, Positive) { uint8_t a,b,c,d; OCBuildIPv4Address(0,0,0,0, 0, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); - EXPECT_EQ(ERR_SUCCESS, OCGetSocketInfo(sockfd, &port)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCGetSocketInfo(sockfd, &port)); OC_LOG_V(DEBUG, MOD_NAME, "Port %d", port); OCClose(sockfd); OCBuildIPv4Address(0,0,0,0, 5678, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); - EXPECT_EQ(ERR_SUCCESS, OCGetSocketInfo(sockfd, &port)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCGetSocketInfo(sockfd, &port)); OC_LOG_V(DEBUG, MOD_NAME, "Port %d", port); EXPECT_TRUE(port == 5678); OCClose(sockfd); @@ -310,8 +310,8 @@ TEST(GetSocketInfo, Positive) { OCGetInterfaceAddress( ifname, sizeof(ifname), AF_INET, addr, sizeof(addr)); sscanf((const char*)addr, "%d.%d.%d.%d", (int*)&a, (int*)&b, (int*)&c, (int*)&d); OCBuildIPv4Address(a,b,c,d, TEST_PORT_NUM, &ipaddr); - EXPECT_EQ(ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); - EXPECT_EQ(ERR_SUCCESS, OCGetSocketInfo(sockfd, &port)); + EXPECT_EQ(OC_ERR_SUCCESS, OCInitUDP(&ipaddr, &sockfd)); + EXPECT_EQ(OC_ERR_SUCCESS, OCGetSocketInfo(sockfd, &port)); OC_LOG_V(DEBUG, MOD_NAME, "Port %d", port); EXPECT_TRUE(port == TEST_PORT_NUM); OCClose(sockfd); diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp index 9965a22..5157646 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlient.cpp @@ -638,7 +638,7 @@ int main(int argc, char* argv[]) { /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting occlient on address %s",addr); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp index a526935..f940048 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientbasicops.cpp @@ -310,7 +310,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting occlient on address %s",addr); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp index e8db15a..cfcae34 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientcoll.cpp @@ -351,7 +351,7 @@ int main(int argc, char* argv[]) { /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting occlient on address %s",addr); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp index 689b015..40e7cb0 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/occlientslow.cpp @@ -234,7 +234,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting occlient on address %s",addr); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp index 6131cd0..f10ef0a 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserver.cpp @@ -787,7 +787,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting ocserver on address %s:%d",addr,port); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp index bcd741c..a328ef6 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverbasicops.cpp @@ -300,7 +300,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting ocserver on address %s:%d",addr,port); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp index 75124bb..7f79556 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocservercoll.cpp @@ -469,7 +469,7 @@ int main(int argc, char* argv[]) /*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*/ if (OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting ocserver on address %s:%d",addr,port); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp index e1184e1..3d5f85c 100644 --- a/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp +++ b/resource/csdk/stack/samples/linux/SimpleClientServer/ocserverslow.cpp @@ -283,7 +283,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting ocserver on address %s:%d",addr,port); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp index e4125d2..ec66972 100644 --- a/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp +++ b/resource/csdk/stack/samples/linux/secure/occlientbasicops.cpp @@ -290,7 +290,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting occlient on address %s",addr); paddr = addr; diff --git a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp index b6d579c..2487d59 100644 --- a/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp +++ b/resource/csdk/stack/samples/linux/secure/ocserverbasicops.cpp @@ -307,7 +307,7 @@ int main(int argc, char* argv[]) /*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*/ if ( OCGetInterfaceAddress(ifname, sizeof(ifname), AF_INET, addr, - sizeof(addr)) == ERR_SUCCESS) + sizeof(addr)) == OC_ERR_SUCCESS) { OC_LOG_V(INFO, TAG, "Starting ocserver on address %s:%d",addr,port); paddr = addr; diff --git a/service/notification-manager/SampleApp/linux/notificationManager/main.c b/service/notification-manager/SampleApp/linux/notificationManager/main.c index ce1debb..8948a74 100644 --- a/service/notification-manager/SampleApp/linux/notificationManager/main.c +++ b/service/notification-manager/SampleApp/linux/notificationManager/main.c @@ -41,7 +41,7 @@ int main() printf("OCResourceHosting is starting...\n"); if ( OCGetInterfaceAddress(interfaceName, sizeof(interfaceName), AF_INET, interfaceAddress, - sizeof(interfaceAddress)) == ERR_SUCCESS) + sizeof(interfaceAddress)) == OC_ERR_SUCCESS) { printf("Starting OIC resource hosting on address %s\n", interfaceAddress); coordinatingAddress = interfaceAddress; -- 2.7.4