resolves conflict with ERR_SUCCESS on os x.
rename ERR_????? to OC_ERR_???
Change-Id: I991b1e0aab5fa271c6bfca0a69f8bbbb98ccf610
Signed-off-by: Charlie Lenahan <charlie.lenahan@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/581
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Erich Keane <erich.keane@intel.com>
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')
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/<target_os>/<target_arch>/<release or debug>/
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()
# -------------------------------------------------------------
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')
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:
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:
#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;
}
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;
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;
}
}
// 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 <stdarg.h>
}
void OCLogShutdown() {
-#ifdef __linux__
+#if defined(__linux__) || defined(__APPLE__)
if (logCtx && logCtx->destroy)
{
logCtx->destroy(logCtx);
#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
{
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;
//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#if defined(__ANDROID__) || defined(__linux__)
+#if defined(__ANDROID__) || defined(__linux__) || defined(__APPLE__)
#include "fcntl.h"
#include "unistd.h"
#endif
#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;
}
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;
* 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
#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)
sa->sin_addr.s_addr = htonl(ip);
sa->sin_port = htons(port);
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
#ifdef __ANDROID__
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);
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) {
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) {
{
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;
}
/// 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;
}
*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);
}
/// 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;
goto exit;
}
- ret = ERR_SUCCESS;
+ ret = OC_ERR_SUCCESS;
exit:
- if (ret == ERR_SUCCESS) {
+ if (ret == OC_ERR_SUCCESS) {
*sockfd = sfd;
} else {
close(sfd);
return ret;
}
if (!FD_ISSET(sockfd, &reads)) {
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
// Read available data.
{
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;
}
}
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;
*b = *((uint8_t*)&ip + 2);
*a = *((uint8_t*)&ip + 3);
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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);
} else {
OC_LOG_V(FATAL, MOD_NAME, "getsockname API failed with errno \
%s", strerror(errno));
- ret = ERR_UNKNOWN;
+ ret = OC_ERR_UNKNOWN;
}
return ret;
}
/// 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)
ardAddr-> d = d;
ardAddr-> port = port;
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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
}
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;
}
}
if ( *sockfd == -1) {
- return ERR_UNKNOWN;
+ return OC_ERR_UNKNOWN;
}
//Calculate Multicast MAC address
//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;
}
int32_t OCClose(int32_t sockfd)
{
close(sockfd);
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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;
*c = ardAddr->c;
*d = ardAddr->d;
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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;
}
/// 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)
ardAddr-> d = d;
ardAddr-> port = port;
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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();
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
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;
}
WiFiClass::_server_port[sockfd] = 0;
WiFiClass::_state[sockfd] = NA_STATE;
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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;
*c = ardAddr->c;
*d = ardAddr->d;
- return ERR_SUCCESS;
+ return OC_ERR_SUCCESS;
}
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;
}
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));
}
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);
}
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)));
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) {
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);
}
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));
}
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);
}
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));
}
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)
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)
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);
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));
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));
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);
}
//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"));
}
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"));
}
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"));
}
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"));
}
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"));
}
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"));
}
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);
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"));
}
//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 {
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"));
}
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++)
}
}
- VERIFY_SUCCESS(OCClose( sfd), ERR_SUCCESS);
+ VERIFY_SUCCESS(OCClose( sfd), OC_ERR_SUCCESS);
OC_LOG(DEBUG, MOD_NAME, PCF("WifiTest - Completed"));
}
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) {
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);
}
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[] = "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) {
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);
}
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));
}
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);
}
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));
}
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)
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)
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);
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));
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));
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);
}
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);
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);
/*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;
/*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;
/*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;
/*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;
/*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;
/*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;
/*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;
/*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;
/*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;
/*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;
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;
projects / platform / upstream / iotivity.git / commitdiff