#define CAIPS_GET_ERROR \
strerror(errno)
#endif
-static CAIPExceptionCallback g_exceptionCallback;
+static CAIPErrorHandleCallback g_ipErrorHandler = NULL;
-static CAIPPacketReceivedCallback g_packetReceivedCallback;
+static CAIPPacketReceivedCallback g_packetReceivedCallback = NULL;
-static void CAHandleNetlink();
static void CAFindReadyMessage();
#if !defined(WSA_WAIT_EVENT_0)
static void CASelectReturned(fd_set *readFds, int ret);
#else
-static void CAEventReturned(HANDLE);
+static void CAEventReturned(CASocketFd_t socket);
#endif
static void CAProcessNewInterface(CAInterface_t *ifchanged);
-static CAResult_t CAReceiveMessage(int fd, CATransportFlags_t flags);
+static CAResult_t CAReceiveMessage(CASocketFd_t fd, CATransportFlags_t flags);
static void CAReceiveHandler(void *data)
{
#if !defined(WSA_WAIT_EVENT_0)
#define CLOSE_SOCKET(TYPE) \
- if (caglobals.ip.TYPE.fd != -1) \
+ if (caglobals.ip.TYPE.fd != OC_INVALID_SOCKET) \
{ \
close(caglobals.ip.TYPE.fd); \
- caglobals.ip.TYPE.fd = -1; \
+ caglobals.ip.TYPE.fd = OC_INVALID_SOCKET; \
}
#define SET(TYPE, FDS) \
- if (caglobals.ip.TYPE.fd != -1) \
+ if (caglobals.ip.TYPE.fd != OC_INVALID_SOCKET) \
{ \
FD_SET(caglobals.ip.TYPE.fd, FDS); \
}
#define ISSET(TYPE, FDS, FLAGS) \
- if (caglobals.ip.TYPE.fd != -1 && FD_ISSET(caglobals.ip.TYPE.fd, FDS)) \
+ if (caglobals.ip.TYPE.fd != OC_INVALID_SOCKET && FD_ISSET(caglobals.ip.TYPE.fd, FDS)) \
{ \
fd = caglobals.ip.TYPE.fd; \
flags = FLAGS; \
{
FD_SET(caglobals.ip.shutdownFds[0], &readFds);
}
- if (caglobals.ip.netlinkFd != -1)
+ if (caglobals.ip.netlinkFd != OC_INVALID_SOCKET)
{
FD_SET(caglobals.ip.netlinkFd, &readFds);
}
static void CASelectReturned(fd_set *readFds, int ret)
{
(void)ret;
- int fd = -1;
+ CASocketFd_t fd = OC_INVALID_SOCKET;
CATransportFlags_t flags = CA_DEFAULT_FLAGS;
while (!caglobals.ip.terminate)
else ISSET(m6s, readFds, CA_MULTICAST | CA_IPV6 | CA_SECURE)
else ISSET(m4, readFds, CA_MULTICAST | CA_IPV4)
else ISSET(m4s, readFds, CA_MULTICAST | CA_IPV4 | CA_SECURE)
- else if ((caglobals.ip.netlinkFd != -1) && FD_ISSET(caglobals.ip.netlinkFd, readFds))
+ else if ((caglobals.ip.netlinkFd != OC_INVALID_SOCKET) && FD_ISSET(caglobals.ip.netlinkFd, readFds))
{
CAInterface_t *ifchanged = CAFindInterfaceChange();
if (ifchanged)
#else // if defined(WSA_WAIT_EVENT_0)
#define CLOSE_SOCKET(TYPE) \
- if (caglobals.ip.TYPE.fd != -1) \
+ if (caglobals.ip.TYPE.fd != OC_INVALID_SOCKET) \
{ \
closesocket(caglobals.ip.TYPE.fd); \
- caglobals.ip.TYPE.fd = -1; \
+ caglobals.ip.TYPE.fd = OC_INVALID_SOCKET; \
}
#define PUSH_HANDLE(HANDLE, ARRAY, INDEX) \
// Turn handle into WSAEvent and push to ARRAY
#define PUSH_SOCKET(SOCKET, ARRAY, INDEX) \
- if (SOCKET != -1) \
+ if (SOCKET != OC_INVALID_SOCKET) \
{ \
WSAEVENT NewEvent; \
NewEvent = WSACreateEvent(); \
}\
}
-#define INSERT_FD(FD, ARRAY, INDEX) \
+#define INSERT_SOCKET(FD, ARRAY, INDEX) \
{ \
- if (-1 != FD) \
+ if (OC_INVALID_SOCKET != FD) \
{ \
ARRAY[INDEX] = FD; \
} \
}
-// Inserts the FD into the FD_ARRAY and pushes the socket event into ARRAY
-#define PUSH_IP_SOCKET(TYPE, ARRAY, FD_ARRAY, INDEX) \
+// Inserts the socket into the SOCKET_ARRAY and pushes the socket event into EVENT_ARRAY
+#define PUSH_IP_SOCKET(TYPE, EVENT_ARRAY, SOCKET_ARRAY, INDEX) \
{ \
- if (-1 != caglobals.ip.TYPE.fd) \
+ if (OC_INVALID_SOCKET != caglobals.ip.TYPE.fd) \
{ \
- INSERT_FD(caglobals.ip.TYPE.fd, FD_ARRAY, INDEX); \
- PUSH_SOCKET(caglobals.ip.TYPE.fd, ARRAY, INDEX); \
+ INSERT_SOCKET(caglobals.ip.TYPE.fd, SOCKET_ARRAY, INDEX); \
+ PUSH_SOCKET(caglobals.ip.TYPE.fd, EVENT_ARRAY, INDEX); \
} \
}
-#define IS_MATCHING_IP_HANDLE(TYPE, HANDLE, FLAGS) \
- if ((caglobals.ip.TYPE.fd != -1) && (caglobals.ip.TYPE.fd == HANDLE)) \
+#define IS_MATCHING_IP_SOCKET(TYPE, SOCKET, FLAGS) \
+ if ((caglobals.ip.TYPE.fd != OC_INVALID_SOCKET) && (caglobals.ip.TYPE.fd == SOCKET)) \
{ \
fd = caglobals.ip.TYPE.fd; \
flags = FLAGS; \
static void CAFindReadyMessage()
{
- int fdArray[EVENT_ARRAY_SIZE];
+ CASocketFd_t socketArray[EVENT_ARRAY_SIZE];
HANDLE eventArray[EVENT_ARRAY_SIZE];
int arraySize = 0;
int eventIndex;
- // fdArray and eventArray should have same number of elements
- OC_STATIC_ASSERT(_countof(fdArray) == _countof(eventArray), "Arrays should have same number of elements");
+ // socketArray and eventArray should have same number of elements
+ OC_STATIC_ASSERT(_countof(socketArray) == _countof(eventArray), "Arrays should have same number of elements");
- PUSH_IP_SOCKET(u6, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(u6s, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(u4, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(u4s, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(m6, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(m6s, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(m4, eventArray, fdArray, arraySize);
- PUSH_IP_SOCKET(m4s, eventArray, fdArray, arraySize);
+ PUSH_IP_SOCKET(u6, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(u6s, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(u4, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(u4s, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(m6, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(m6s, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(m4, eventArray, socketArray, arraySize);
+ PUSH_IP_SOCKET(m4s, eventArray, socketArray, arraySize);
if (-1 != caglobals.ip.shutdownEvent)
{
- INSERT_FD(caglobals.ip.shutdownEvent, fdArray, arraySize);
+ INSERT_SOCKET(OC_INVALID_SOCKET, socketArray, arraySize);
PUSH_HANDLE(caglobals.ip.shutdownEvent, eventArray, arraySize);
}
/** @todo Support netlink events */
// Should not have overflowed buffer
- assert(arraySize <= (_countof(fdArray)));
+ assert(arraySize <= (_countof(socketArray)));
// Timeout is unnecessary on Windows
assert(-1 == caglobals.ip.selectTimeout);
{
OIC_LOG_V(ERROR, TAG, "WSAResetEvent failed 0x%08x", WSAGetLastError());
}
- CAEventReturned(fdArray[eventIndex]);
+
+ // Break out if shutdownEvent is triggered
+ if ((caglobals.ip.shutdownEvent != -1) &&
+ (caglobals.ip.shutdownEvent == eventArray[eventIndex]))
+ {
+ break;
+ }
+ CAEventReturned(socketArray[eventIndex]);
}
else
{
OIC_LOG_V(ERROR, TAG, "WSACloseEvent (Index %i) failed 0x%08x", arraySize, WSAGetLastError());
}
}
+
+ if (caglobals.ip.terminate)
+ {
+ caglobals.ip.shutdownEvent = -1;
+ WSACleanup();
+ }
}
-static void CAEventReturned(HANDLE handle)
+static void CAEventReturned(CASocketFd_t socket)
{
- int fd = -1;
+ CASocketFd_t fd = OC_INVALID_SOCKET;
CATransportFlags_t flags = CA_DEFAULT_FLAGS;
while (!caglobals.ip.terminate)
{
- IS_MATCHING_IP_HANDLE(u6, handle, CA_IPV6)
- else IS_MATCHING_IP_HANDLE(u6s, handle, CA_IPV6 | CA_SECURE)
- else IS_MATCHING_IP_HANDLE(u4, handle, CA_IPV4)
- else IS_MATCHING_IP_HANDLE(u4s, handle, CA_IPV4 | CA_SECURE)
- else IS_MATCHING_IP_HANDLE(m6, handle, CA_MULTICAST | CA_IPV6)
- else IS_MATCHING_IP_HANDLE(m6s, handle, CA_MULTICAST | CA_IPV6 | CA_SECURE)
- else IS_MATCHING_IP_HANDLE(m4, handle, CA_MULTICAST | CA_IPV4)
- else IS_MATCHING_IP_HANDLE(m4s, handle, CA_MULTICAST | CA_IPV4 | CA_SECURE)
- else if ((caglobals.ip.shutdownEvent != -1) && (caglobals.ip.shutdownEvent == handle))
- {
- break;
- }
+ IS_MATCHING_IP_SOCKET(u6, socket, CA_IPV6)
+ else IS_MATCHING_IP_SOCKET(u6s, socket, CA_IPV6 | CA_SECURE)
+ else IS_MATCHING_IP_SOCKET(u4, socket, CA_IPV4)
+ else IS_MATCHING_IP_SOCKET(u4s, socket, CA_IPV4 | CA_SECURE)
+ else IS_MATCHING_IP_SOCKET(m6, socket, CA_MULTICAST | CA_IPV6)
+ else IS_MATCHING_IP_SOCKET(m6s, socket, CA_MULTICAST | CA_IPV6 | CA_SECURE)
+ else IS_MATCHING_IP_SOCKET(m4, socket, CA_MULTICAST | CA_IPV4)
+ else IS_MATCHING_IP_SOCKET(m4s, socket, CA_MULTICAST | CA_IPV4 | CA_SECURE)
else
{
break;
}
- (void)CAReceiveMessage(handle, flags);
- // We will never get more than one match per handle, so always break.
+ (void)CAReceiveMessage(socket, flags);
+ // We will never get more than one match per socket, so always break.
break;
}
-
- if (caglobals.ip.terminate)
- {
- if (-1 != caglobals.ip.shutdownEvent)
- {
- // We presume the shutdownEvent will be closed in CAFindReadyMessage
- caglobals.ip.shutdownEvent = -1;
- WSACleanup();
- }
- }
}
#endif
CLOSE_SOCKET(m4);
CLOSE_SOCKET(m4s);
- if (caglobals.ip.netlinkFd != -1)
+ if (caglobals.ip.netlinkFd != OC_INVALID_SOCKET)
{
#ifdef _WIN32
closesocket(caglobals.ip.netlinkFd);
#else
close(caglobals.ip.netlinkFd);
#endif
- caglobals.ip.netlinkFd = -1;
+ caglobals.ip.netlinkFd = OC_INVALID_SOCKET;
}
}
-static CAResult_t CAReceiveMessage(int fd, CATransportFlags_t flags)
+static CAResult_t CAReceiveMessage(CASocketFd_t fd, CATransportFlags_t flags)
{
- char recvBuffer[COAP_MAX_PDU_SIZE];
+ char recvBuffer[COAP_MAX_PDU_SIZE] = {0};
size_t len;
int level, type, namelen;
.msg_controllen = CMSG_SPACE(len) };
ssize_t recvLen = recvmsg(fd, &msg, flags);
- if (-1 == recvLen)
+ if (OC_SOCKET_ERROR == recvLen)
{
OIC_LOG_V(ERROR, TAG, "Recvfrom failed %s", strerror(errno));
return CA_STATUS_FAILED;
uint32_t recvLen = 0;
uint32_t ret = caglobals.ip.wsaRecvMsg(fd, &msg, &recvLen, 0,0);
OIC_LOG_V(DEBUG, TAG, "WSARecvMsg recvd %u bytes", recvLen);
- if (SOCKET_ERROR == ret)
+ if (OC_SOCKET_ERROR == ret)
{
OIC_LOG_V(ERROR, TAG, "WSARecvMsg failed %i", WSAGetLastError());
}
OIC_LOG(DEBUG, TAG, "OUT");
}
-static int CACreateSocket(int family, uint16_t *port)
+static CASocketFd_t CACreateSocket(int family, uint16_t *port, bool isMulticast)
{
int socktype = SOCK_DGRAM;
#ifdef SOCK_CLOEXEC
socktype |= SOCK_CLOEXEC;
#endif
- int fd = socket(family, socktype, IPPROTO_UDP);
- if (-1 == fd)
+ CASocketFd_t fd = socket(family, socktype, IPPROTO_UDP);
+ if (OC_INVALID_SOCKET == fd)
{
OIC_LOG_V(ERROR, TAG, "create socket failed: %s", CAIPS_GET_ERROR);
- return -1;
+ return OC_INVALID_SOCKET;
}
#if !defined(SOCK_CLOEXEC) && defined(FD_CLOEXEC)
{
OIC_LOG_V(ERROR, TAG, "set FD_CLOEXEC failed: %s", strerror(errno));
close(fd);
- return -1;
+ return OC_INVALID_SOCKET;
}
#endif
struct sockaddr_storage sa = { .ss_family = family };
{
int on = 1;
- if (-1 == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, OPTVAL_T(&on), sizeof (on)))
+ if (OC_SOCKET_ERROR == setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, OPTVAL_T(&on), sizeof (on)))
{
OIC_LOG_V(ERROR, TAG, "IPV6_V6ONLY failed: %s", CAIPS_GET_ERROR);
}
- if (*port) // only do this for multicast ports
+ if (isMulticast && *port) // only do this for multicast ports
{
#if defined(IPV6_RECVPKTINFO)
- if (-1 == setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof (on)))
+ if (OC_SOCKET_ERROR == setsockopt(fd, IPPROTO_IPV6, IPV6_RECVPKTINFO, &on, sizeof (on)))
#else
- if (-1 == setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, OPTVAL_T(&on), sizeof (on)))
+ if (OC_SOCKET_ERROR == setsockopt(fd, IPPROTO_IPV6, IPV6_PKTINFO, OPTVAL_T(&on), sizeof (on)))
#endif
{
OIC_LOG_V(ERROR, TAG, "IPV6_RECVPKTINFO failed: %s",CAIPS_GET_ERROR);
}
else
{
- if (*port) // only do this for multicast ports
+ if (isMulticast && *port) // only do this for multicast ports
{
int on = 1;
- if (-1 == setsockopt(fd, IPPROTO_IP, IP_PKTINFO, OPTVAL_T(&on), sizeof (on)))
+ if (OC_SOCKET_ERROR == setsockopt(fd, IPPROTO_IP, IP_PKTINFO, OPTVAL_T(&on), sizeof (on)))
{
OIC_LOG_V(ERROR, TAG, "IP_PKTINFO failed: %s", CAIPS_GET_ERROR);
}
socklen = sizeof (struct sockaddr_in);
}
- if (*port) // use the given port
+ if (isMulticast && *port) // use the given port
{
int on = 1;
- if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof (on)))
+ if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, OPTVAL_T(&on), sizeof (on)))
{
OIC_LOG_V(ERROR, TAG, "SO_REUSEADDR failed: %s", CAIPS_GET_ERROR);
#ifdef _WIN32
#else
close(fd);
#endif
- return -1;
+ return OC_INVALID_SOCKET;
}
}
- if (-1 == bind(fd, (struct sockaddr *)&sa, socklen))
+ if (OC_SOCKET_ERROR == bind(fd, (struct sockaddr *)&sa, socklen))
{
OIC_LOG_V(ERROR, TAG, "bind socket failed: %s", CAIPS_GET_ERROR);
#ifdef _WIN32
#else
close(fd);
#endif
- return -1;
+ return OC_INVALID_SOCKET;
}
if (!*port) // return the assigned port
{
- if (-1 == getsockname(fd, (struct sockaddr *)&sa, &socklen))
+ if (OC_SOCKET_ERROR == getsockname(fd, (struct sockaddr *)&sa, &socklen))
{
OIC_LOG_V(ERROR, TAG, "getsockname failed: %s", CAIPS_GET_ERROR);
#ifdef _WIN32
#else
close(fd);
#endif
- return -1;
+ return OC_INVALID_SOCKET;
}
*port = ntohs(family == AF_INET6 ?
((struct sockaddr_in6 *)&sa)->sin6_port :
#define CHECKFD(FD) \
if (FD > caglobals.ip.maxfd) \
caglobals.ip.maxfd = FD;
-#define NEWSOCKET(FAMILY, NAME) \
- caglobals.ip.NAME.fd = CACreateSocket(FAMILY, &caglobals.ip.NAME.port); \
+#define NEWSOCKET(FAMILY, NAME, MULTICAST) \
+ caglobals.ip.NAME.fd = CACreateSocket(FAMILY, &caglobals.ip.NAME.port, MULTICAST); \
+ if (caglobals.ip.NAME.fd == OC_INVALID_SOCKET) \
+ { \
+ caglobals.ip.NAME.port = 0; \
+ caglobals.ip.NAME.fd = CACreateSocket(FAMILY, &caglobals.ip.NAME.port, MULTICAST); \
+ } \
CHECKFD(caglobals.ip.NAME.fd)
static void CAInitializeNetlink()
{
- caglobals.ip.netlinkFd = -1;
+ caglobals.ip.netlinkFd = OC_INVALID_SOCKET;
#ifdef __linux__
// create NETLINK fd for interface change notifications
struct sockaddr_nl sa = { AF_NETLINK, 0, 0, RTMGRP_LINK };
caglobals.ip.netlinkFd = socket(AF_NETLINK, SOCK_RAW|SOCK_CLOEXEC, NETLINK_ROUTE);
- if (caglobals.ip.netlinkFd == -1)
+ if (caglobals.ip.netlinkFd == OC_INVALID_SOCKET)
{
OIC_LOG_V(ERROR, TAG, "netlink socket failed: %s", strerror(errno));
}
{
OIC_LOG_V(ERROR, TAG, "netlink bind failed: %s", strerror(errno));
close(caglobals.ip.netlinkFd);
- caglobals.ip.netlinkFd = -1;
+ caglobals.ip.netlinkFd = OC_INVALID_SOCKET;
}
else
{
if (caglobals.ip.ipv6enabled)
{
- NEWSOCKET(AF_INET6, u6)
- NEWSOCKET(AF_INET6, u6s)
- NEWSOCKET(AF_INET6, m6)
- NEWSOCKET(AF_INET6, m6s)
+ NEWSOCKET(AF_INET6, u6, false)
+ NEWSOCKET(AF_INET6, u6s, false)
+ NEWSOCKET(AF_INET6, m6, true)
+ NEWSOCKET(AF_INET6, m6s, true)
OIC_LOG_V(INFO, TAG, "IPv6 unicast port: %u", caglobals.ip.u6.port);
}
if (caglobals.ip.ipv4enabled)
{
- NEWSOCKET(AF_INET, u4)
- NEWSOCKET(AF_INET, u4s)
- NEWSOCKET(AF_INET, m4)
- NEWSOCKET(AF_INET, m4s)
+ NEWSOCKET(AF_INET, u4, false)
+ NEWSOCKET(AF_INET, u4s, false)
+ NEWSOCKET(AF_INET, m4, true)
+ NEWSOCKET(AF_INET, m4s, true)
OIC_LOG_V(INFO, TAG, "IPv4 unicast port: %u", caglobals.ip.u4.port);
}
// receive thread will stop in SELECT_TIMEOUT seconds.
}
#else
+ // receive thread will stop immediately.
if (!WSASetEvent(caglobals.ip.shutdownEvent))
{
OIC_LOG_V(DEBUG, TAG, "set shutdown event failed: %#08X", GetLastError());
#endif
int ret = setsockopt(caglobals.ip.m4.fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, OPTVAL_T(&mreq), sizeof (mreq));
- if (-1 == ret)
+ if (OC_SOCKET_ERROR == ret)
{
#if !defined(WSAEINVAL)
if (EADDRINUSE != errno)
OIC_LOG_V(ERROR, TAG, " IPv4 IP_ADD_MEMBERSHIP failed: %s", CAIPS_GET_ERROR);
}
}
- ret = setsockopt(caglobals.ip.m4s.fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof (mreq));
- if (-1 == ret)
+ ret = setsockopt(caglobals.ip.m4s.fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, OPTVAL_T(&mreq), sizeof (mreq));
+ if (OC_SOCKET_ERROR == ret)
{
#if !defined(WSAEINVAL)
if (EADDRINUSE != errno)
{
struct ipv6_mreq mreq = {.ipv6mr_multiaddr = *addr,
.ipv6mr_interface = ifindex };
- int ret = setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, &mreq, sizeof (mreq));
- if (-1 == ret)
+ int ret = setsockopt(fd, IPPROTO_IPV6, IPV6_JOIN_GROUP, OPTVAL_T(&mreq), sizeof (mreq));
+ if (OC_SOCKET_ERROR == ret)
{
#if !defined(_WIN32)
if (EADDRINUSE != errno)
g_packetReceivedCallback = callback;
}
-void CAIPSetExceptionCallback(CAIPExceptionCallback callback)
-{
- g_exceptionCallback = callback;
-}
-
void CAIPSetConnectionStateChangeCallback(CAIPConnectionStateChangeCallback callback)
{
CAIPSetNetworkMonitorCallback(callback);
if (!endpoint)
{
OIC_LOG(DEBUG, TAG, "endpoint is null");
+ if (g_ipErrorHandler)
+ {
+ g_ipErrorHandler(endpoint, data, dlen, CA_STATUS_INVALID_PARAM);
+ }
return;
}
char *secure = (endpoint->flags & CA_SECURE) ? "secure " : "";
- (void)secure; // eliminates release warning
- (void)cast;
+ (void)cast; // eliminates release warning
(void)fam;
struct sockaddr_storage sock;
}
#if !defined(_WIN32)
ssize_t len = sendto(fd, data, dlen, 0, (struct sockaddr *)&sock, socklen);
- if (-1 == len)
+ if (OC_SOCKET_ERROR == len)
{
+ // If logging is not defined/enabled.
+ if (g_ipErrorHandler)
+ {
+ g_ipErrorHandler(endpoint, data, dlen, CA_SEND_FAILED);
+ }
OIC_LOG_V(ERROR, TAG, "%s%s %s sendTo failed: %s", secure, cast, fam, strerror(errno));
}
else
int sent = 0;
do {
len = sendto(fd, ((char*)data) + sent, dlen - sent, 0, (struct sockaddr *)&sock, socklen);
- if (SOCKET_ERROR == len)
+ if (OC_SOCKET_ERROR == len)
{
err = WSAGetLastError();
if ((WSAEWOULDBLOCK != err) && (WSAENOBUFS != err))
{
+ // If logging is not defined/enabled.
+ if (g_ipErrorHandler)
+ {
+ g_ipErrorHandler(endpoint, data, dlen, CA_SEND_FAILED);
+ }
+
OIC_LOG_V(ERROR, TAG, "%s%s %s sendTo failed: %i", secure, cast, fam, err);
}
}
secure, cast, fam, len);
}
}
- } while ((SOCKET_ERROR == len) && ((WSAEWOULDBLOCK == err) || (WSAENOBUFS == err)) || (sent < dlen));
+ } while ((OC_SOCKET_ERROR == len) && ((WSAEWOULDBLOCK == err) || (WSAENOBUFS == err)) || (sent < dlen));
#endif
}
endpoint->port = isSecure ? CA_SECURE_COAP : CA_COAP;
}
- int fd;
+ CASocketFd_t fd;
if (caglobals.ip.ipv6enabled && (endpoint->flags & CA_IPV6))
{
fd = isSecure ? caglobals.ip.u6s.fd : caglobals.ip.u6.fd;
return CA_STATUS_OK;
}
+
+void CAIPSetErrorHandler(CAIPErrorHandleCallback errorHandleCallback)
+{
+ g_ipErrorHandler = errorHandleCallback;
+}
projects / platform / upstream / iotivity.git / blobdiff