Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove exit: return idiom from src/inet and src/transport #6025

Merged
merged 5 commits into from
Apr 18, 2021
Merged

Remove exit: return idiom from src/inet and src/transport #6025

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39836bc
Remove `exit: return` idiom from src/inet and src/transport
kpschoedel Apr 9, 2021
8b252cd
Merge remote-tracking branch 'origin/master' into error-macros-4
kpschoedel Apr 15, 2021
303dd47
Do sanity check before casting, not after.
bzbarsky-apple Apr 18, 2021
b7acf5e
Fix restyle issue
bzbarsky-apple Apr 18, 2021
e0f413b
Fix restyle issue
bzbarsky-apple Apr 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions src/inet/InetInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2020 Project CHIP Authors
* Copyright (c) 2020-2021 Project CHIP Authors
* Copyright (c) 2019 Google LLC.
* Copyright (c) 2013-2017 Nest Labs, Inc.
*
Expand Down Expand Up @@ -573,26 +573,23 @@ InterfaceId InterfaceIterator::GetInterfaceId(void)
*/
INET_ERROR InterfaceIterator::GetInterfaceName(char * nameBuf, size_t nameBufSize)
{
INET_ERROR err = INET_ERROR_NOT_IMPLEMENTED;

VerifyOrExit(HasCurrent(), err = INET_ERROR_INCORRECT_STATE);
VerifyOrReturnError(HasCurrent(), INET_ERROR_INCORRECT_STATE);

#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
VerifyOrExit(strlen(mIntfArray[mCurIntf].if_name) < nameBufSize, err = INET_ERROR_NO_MEMORY);
VerifyOrReturnError(strlen(mIntfArray[mCurIntf].if_name) < nameBufSize, INET_ERROR_NO_MEMORY);
strncpy(nameBuf, mIntfArray[mCurIntf].if_name, nameBufSize);
err = INET_NO_ERROR;
return INET_NO_ERROR;
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS

#if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
err = ::chip::Inet::GetInterfaceName(mCurrentId, nameBuf, nameBufSize);
return ::chip::Inet::GetInterfaceName(mCurrentId, nameBuf, nameBufSize);
#endif // CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF

#if CHIP_SYSTEM_CONFIG_USE_LWIP
err = ::chip::Inet::GetInterfaceName(mCurNetif, nameBuf, nameBufSize);
return ::chip::Inet::GetInterfaceName(mCurNetif, nameBuf, nameBufSize);
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP

exit:
return err;
return INET_ERROR_NOT_IMPLEMENTED;
}

/**
Expand Down Expand Up @@ -1005,22 +1002,19 @@ InterfaceId InterfaceAddressIterator::GetInterfaceId()
*/
INET_ERROR InterfaceAddressIterator::GetInterfaceName(char * nameBuf, size_t nameBufSize)
{
INET_ERROR err = INET_ERROR_NOT_IMPLEMENTED;

VerifyOrExit(HasCurrent(), err = INET_ERROR_INCORRECT_STATE);
VerifyOrReturnError(HasCurrent(), INET_ERROR_INCORRECT_STATE);

#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
VerifyOrExit(strlen(mCurAddr->ifa_name) < nameBufSize, err = INET_ERROR_NO_MEMORY);
VerifyOrReturnError(strlen(mCurAddr->ifa_name) < nameBufSize, INET_ERROR_NO_MEMORY);
strncpy(nameBuf, mCurAddr->ifa_name, nameBufSize);
err = INET_NO_ERROR;
return INET_NO_ERROR;
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS

#if CHIP_SYSTEM_CONFIG_USE_LWIP || CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
err = mIntfIter.GetInterfaceName(nameBuf, nameBufSize);
return mIntfIter.GetInterfaceName(nameBuf, nameBufSize);
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP || CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF

exit:
return err;
return INET_ERROR_NOT_IMPLEMENTED;
}

/**
Expand Down
149 changes: 56 additions & 93 deletions src/inet/InetLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
*
* Copyright (c) 2020 Project CHIP Authors
* Copyright (c) 2020-2021 Project CHIP Authors
* Copyright (c) 2013-2017 Nest Labs, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -445,91 +445,70 @@ bool InetLayer::IsIdleTimerRunning()
*/
INET_ERROR InetLayer::GetLinkLocalAddr(InterfaceId link, IPAddress * llAddr)
{
INET_ERROR err = INET_NO_ERROR;
VerifyOrReturnError(llAddr != nullptr, INET_ERROR_BAD_ARGS);

#if CHIP_SYSTEM_CONFIG_USE_LWIP
#if !LWIP_IPV6
err = INET_ERROR_NOT_IMPLEMENTED;
goto exit;
return INET_ERROR_NOT_IMPLEMENTED;
#endif //! LWIP_IPV6
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP

if (llAddr == nullptr)
{
err = INET_ERROR_BAD_ARGS;
goto exit;
}

#if CHIP_SYSTEM_CONFIG_USE_LWIP
for (struct netif * intf = netif_list; intf != NULL; intf = intf->next)
{
if ((link != NULL) && (link != intf))
continue;
int j;
for (j = 0; j < LWIP_IPV6_NUM_ADDRESSES; ++j)
for (int j = 0; j < LWIP_IPV6_NUM_ADDRESSES; ++j)
{
if (ip6_addr_isvalid(netif_ip6_addr_state(intf, j)) && ip6_addr_islinklocal(netif_ip6_addr(intf, j)))
{
(*llAddr) = IPAddress::FromIPv6(*netif_ip6_addr(intf, j));
goto exit;
return INET_NO_ERROR;
}
}
if (link != NULL)
{
err = INET_ERROR_ADDRESS_NOT_FOUND;
break;
return INET_ERROR_ADDRESS_NOT_FOUND;
}
}
#endif // CHIP_SYSTEM_CONFIG_USE_LWIP

#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
struct ifaddrs * ifaddr;
int rv;
rv = getifaddrs(&ifaddr);
if (rv != -1)
const int rv = getifaddrs(&ifaddr);
if (rv == -1)
{
struct ifaddrs * ifaddr_iter = ifaddr;
while (ifaddr_iter != nullptr)
{
return INET_ERROR_ADDRESS_NOT_FOUND;
}

if (ifaddr_iter->ifa_addr != nullptr)
for (struct ifaddrs * ifaddr_iter = ifaddr; ifaddr_iter != nullptr; ifaddr_iter = ifaddr_iter->ifa_next)
{
if (ifaddr_iter->ifa_addr != nullptr)
{
if ((ifaddr_iter->ifa_addr->sa_family == AF_INET6) &&
((link == INET_NULL_INTERFACEID) || (if_nametoindex(ifaddr_iter->ifa_name) == link)))
{
if ((ifaddr_iter->ifa_addr->sa_family == AF_INET6) &&
((link == INET_NULL_INTERFACEID) || (if_nametoindex(ifaddr_iter->ifa_name) == link)))
struct in6_addr * sin6_addr = &(reinterpret_cast<struct sockaddr_in6 *>(ifaddr_iter->ifa_addr))->sin6_addr;
if (sin6_addr->s6_addr[0] == 0xfe && (sin6_addr->s6_addr[1] & 0xc0) == 0x80) // Link Local Address
{
struct in6_addr * sin6_addr = &(reinterpret_cast<struct sockaddr_in6 *>(ifaddr_iter->ifa_addr))->sin6_addr;
if (sin6_addr->s6_addr[0] == 0xfe && (sin6_addr->s6_addr[1] & 0xc0) == 0x80) // Link Local Address
{
(*llAddr) =
IPAddress::FromIPv6((reinterpret_cast<struct sockaddr_in6 *>(ifaddr_iter->ifa_addr))->sin6_addr);
break;
}
(*llAddr) = IPAddress::FromIPv6((reinterpret_cast<struct sockaddr_in6 *>(ifaddr_iter->ifa_addr))->sin6_addr);
break;
}
}
ifaddr_iter = ifaddr_iter->ifa_next;
}
freeifaddrs(ifaddr);
}
else
{
err = INET_ERROR_ADDRESS_NOT_FOUND;
}
freeifaddrs(ifaddr);
#endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS

#if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
net_if * iface;
in6_addr * ip6_addr;
net_if * const iface = (link == INET_NULL_INTERFACEID) ? net_if_get_default() : net_if_get_by_index(link);
VerifyOrReturnError(iface != nullptr, INET_ERROR_ADDRESS_NOT_FOUND);

iface = (link == INET_NULL_INTERFACEID) ? net_if_get_default() : net_if_get_by_index(link);
VerifyOrExit(iface != nullptr, err = INET_ERROR_ADDRESS_NOT_FOUND);

ip6_addr = net_if_ipv6_get_ll(iface, NET_ADDR_PREFERRED);
VerifyOrExit(ip6_addr != nullptr, err = INET_ERROR_ADDRESS_NOT_FOUND);
in6_addr * const ip6_addr = net_if_ipv6_get_ll(iface, NET_ADDR_PREFERRED);
VerifyOrReturnError(ip6_addr != nullptr, INET_ERROR_ADDRESS_NOT_FOUND);

*llAddr = IPAddress::FromIPv6(*ip6_addr);
#endif // CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF

exit:
return err;
return INET_NO_ERROR;
}

#if INET_CONFIG_ENABLE_RAW_ENDPOINT
Expand All @@ -556,25 +535,21 @@ INET_ERROR InetLayer::GetLinkLocalAddr(InterfaceId link, IPAddress * llAddr)
*/
INET_ERROR InetLayer::NewRawEndPoint(IPVersion ipVer, IPProtocol ipProto, RawEndPoint ** retEndPoint)
{
INET_ERROR err = INET_NO_ERROR;
*retEndPoint = nullptr;
*retEndPoint = nullptr;

VerifyOrExit(State == kState_Initialized, err = INET_ERROR_INCORRECT_STATE);
VerifyOrReturnError(State == kState_Initialized, INET_ERROR_INCORRECT_STATE);

*retEndPoint = RawEndPoint::sPool.TryCreate(*mSystemLayer);
if (*retEndPoint != nullptr)
{
(*retEndPoint)->Inet::RawEndPoint::Init(this, ipVer, ipProto);
SYSTEM_STATS_INCREMENT(chip::System::Stats::kInetLayer_NumRawEps);
}
else
if (*retEndPoint == nullptr)
{
ChipLogError(Inet, "%s endpoint pool FULL", "Raw");
err = INET_ERROR_NO_ENDPOINTS;
return INET_ERROR_NO_ENDPOINTS;
}

exit:
return err;
(*retEndPoint)->Inet::RawEndPoint::Init(this, ipVer, ipProto);
SYSTEM_STATS_INCREMENT(chip::System::Stats::kInetLayer_NumRawEps);

return INET_NO_ERROR;
}
#endif // INET_CONFIG_ENABLE_RAW_ENDPOINT

Expand All @@ -598,25 +573,21 @@ INET_ERROR InetLayer::NewRawEndPoint(IPVersion ipVer, IPProtocol ipProto, RawEnd
*/
INET_ERROR InetLayer::NewTCPEndPoint(TCPEndPoint ** retEndPoint)
{
INET_ERROR err = INET_NO_ERROR;
*retEndPoint = nullptr;
*retEndPoint = nullptr;

VerifyOrExit(State == kState_Initialized, err = INET_ERROR_INCORRECT_STATE);
VerifyOrReturnError(State == kState_Initialized, INET_ERROR_INCORRECT_STATE);

*retEndPoint = TCPEndPoint::sPool.TryCreate(*mSystemLayer);
if (*retEndPoint != nullptr)
{
(*retEndPoint)->Init(this);
SYSTEM_STATS_INCREMENT(chip::System::Stats::kInetLayer_NumTCPEps);
}
else
if (*retEndPoint == nullptr)
{
ChipLogError(Inet, "%s endpoint pool FULL", "TCP");
err = INET_ERROR_NO_ENDPOINTS;
return INET_ERROR_NO_ENDPOINTS;
}

exit:
return err;
(*retEndPoint)->Init(this);
SYSTEM_STATS_INCREMENT(chip::System::Stats::kInetLayer_NumTCPEps);

return INET_NO_ERROR;
}
#endif // INET_CONFIG_ENABLE_TCP_ENDPOINT

Expand All @@ -640,25 +611,21 @@ INET_ERROR InetLayer::NewTCPEndPoint(TCPEndPoint ** retEndPoint)
*/
INET_ERROR InetLayer::NewUDPEndPoint(UDPEndPoint ** retEndPoint)
{
INET_ERROR err = INET_NO_ERROR;
*retEndPoint = nullptr;
*retEndPoint = nullptr;

VerifyOrExit(State == kState_Initialized, err = INET_ERROR_INCORRECT_STATE);
VerifyOrReturnError(State == kState_Initialized, INET_ERROR_INCORRECT_STATE);

*retEndPoint = UDPEndPoint::sPool.TryCreate(*mSystemLayer);
if (*retEndPoint != nullptr)
{
(*retEndPoint)->Init(this);
SYSTEM_STATS_INCREMENT(chip::System::Stats::kInetLayer_NumUDPEps);
}
else
if (*retEndPoint == nullptr)
{
ChipLogError(Inet, "%s endpoint pool FULL", "UDP");
err = INET_ERROR_NO_ENDPOINTS;
return INET_ERROR_NO_ENDPOINTS;
}

exit:
return err;
(*retEndPoint)->Init(this);
SYSTEM_STATS_INCREMENT(chip::System::Stats::kInetLayer_NumUDPEps);

return INET_NO_ERROR;
}
#endif // INET_CONFIG_ENABLE_UDP_ENDPOINT

Expand Down Expand Up @@ -1049,10 +1016,7 @@ void InetLayer::HandleTCPInactivityTimer(chip::System::Layer * aSystemLayer, voi
chip::System::Error InetLayer::HandleInetLayerEvent(chip::System::Object & aTarget, chip::System::EventType aEventType,
uintptr_t aArgument)
{
chip::System::Error lReturn = CHIP_SYSTEM_NO_ERROR;
InetLayerBasis & lBasis = static_cast<InetLayerBasis &>(aTarget);

VerifyOrExit(INET_IsInetEvent(aEventType), lReturn = CHIP_SYSTEM_ERROR_UNEXPECTED_EVENT);
VerifyOrReturnError(INET_IsInetEvent(aEventType), CHIP_SYSTEM_ERROR_UNEXPECTED_EVENT);

// Dispatch the event according to its type.
switch (aEventType)
Expand Down Expand Up @@ -1101,20 +1065,19 @@ chip::System::Error InetLayer::HandleInetLayerEvent(chip::System::Object & aTarg
#endif // INET_CONFIG_ENABLE_DNS_RESOLVER

default:
lReturn = CHIP_SYSTEM_ERROR_UNEXPECTED_EVENT;
ExitNow();
return CHIP_SYSTEM_ERROR_UNEXPECTED_EVENT;
}

// If the event was droppable, record the fact that it has been dequeued.
if (IsDroppableEvent(aEventType))
{
InetLayer & lInetLayer = lBasis.Layer();
InetLayerBasis & lBasis = static_cast<InetLayerBasis &>(aTarget);
InetLayer & lInetLayer = lBasis.Layer();

lInetLayer.DroppableEventDequeued();
}

exit:
return lReturn;
return CHIP_SYSTEM_NO_ERROR;
}

#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
Expand Down
Loading