espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-21 01:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[tcp6] Endpoint and Listener to act as GetProvider (#7722)

Browse Source 
This commit updates `Tcp::Endpoint` and `Tcp::Listener` types to
inherit from `GetProvider` (which provides `Get<Type>()` methods
allowing them to directly access different components in an
OpenThread `Instance`).
This commit is contained in:
Abtin Keshavarzian
2022-05-19 10:51:47 -07:00
committed by GitHub
parent dbb8a5801f
commit 39ac118a03
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/net/tcp6.cpp
+16 -24
View File
@@ -123,11 +123,9 @@ exit:
return error;
}
Instance &Tcp::Endpoint::GetInstance(void)
Instance &Tcp::Endpoint::GetInstance(void) const
{
struct tcpcb &tp = GetTcb();
return AsCoreType(tp.instance);
return AsNonConst(AsCoreType(GetTcb().instance));
}
const SockAddr &Tcp::Endpoint::GetLocalAddress(void) const
@@ -160,7 +158,7 @@ Error Tcp::Endpoint::Bind(const SockAddr &aSockName)
struct tcpcb &tp = GetTcb();
VerifyOrExit(!AsCoreType(&aSockName.mAddress).IsUnspecified(), error = kErrorInvalidArgs);
VerifyOrExit(GetInstance().Get<Tcp>().CanBind(aSockName), error = kErrorInvalidState);
VerifyOrExit(Get<Tcp>().CanBind(aSockName), error = kErrorInvalidState);
memcpy(&tp.laddr, &aSockName.mAddress, sizeof(tp.laddr));
tp.lport = HostSwap16(aSockName.mPort);
@@ -275,9 +273,7 @@ Error Tcp::Endpoint::Deinitialize(void)
{
Error error;
Tcp &tcp = GetInstance().Get<Tcp>();
SuccessOrExit(error = tcp.mEndpoints.Remove(*this));
SuccessOrExit(error = Get<Tcp>().mEndpoints.Remove(*this));
SetNext(nullptr);
SuccessOrExit(error = Abort());
@@ -356,7 +352,7 @@ void Tcp::Endpoint::SetTimer(uint8_t aTimerFlag, uint32_t aDelay)
LogDebg("Endpoint %p set timer %u to %u ms", static_cast<void *>(this), static_cast<unsigned int>(timerIndex),
static_cast<unsigned int>(aDelay));
GetInstance().Get<Tcp>().mTimer.FireAtIfEarlier(newFireTime);
Get<Tcp>().mTimer.FireAtIfEarlier(newFireTime);
}
void Tcp::Endpoint::CancelTimer(uint8_t aTimerFlag)
@@ -451,7 +447,7 @@ void Tcp::Endpoint::PostCallbacksAfterSend(size_t aSent, size_t aBacklogBefore)
if (backlogAfter < aBacklogBefore + aSent && mForwardProgressCallback != nullptr)
{
mPendingCallbacks |= kForwardProgressCallbackFlag;
GetInstance().Get<Tcp>().mTasklet.Post();
Get<Tcp>().mTasklet.Post();
}
}
@@ -542,11 +538,9 @@ exit:
return error;
}
Instance &Tcp::Listener::GetInstance(void)
Instance &Tcp::Listener::GetInstance(void) const
{
struct tcpcb_listen *tpl = &GetTcbListen();
return AsCoreType(tpl->instance);
return AsNonConst(AsCoreType(GetTcbListen().instance));
}
Error Tcp::Listener::Listen(const SockAddr &aSockName)
@@ -555,7 +549,7 @@ Error Tcp::Listener::Listen(const SockAddr &aSockName)
uint16_t port = HostSwap16(aSockName.mPort);
struct tcpcb_listen *tpl = &GetTcbListen();
VerifyOrExit(GetInstance().Get<Tcp>().CanBind(aSockName), error = kErrorInvalidState);
VerifyOrExit(Get<Tcp>().CanBind(aSockName), error = kErrorInvalidState);
memcpy(&tpl->laddr, &aSockName.mAddress, sizeof(tpl->laddr));
tpl->lport = port;
@@ -580,9 +574,7 @@ Error Tcp::Listener::Deinitialize(void)
{
Error error;
Tcp &tcp = GetInstance().Get<Tcp>();
SuccessOrExit(error = tcp.mListeners.Remove(*this));
SuccessOrExit(error = Get<Tcp>().mListeners.Remove(*this));
SetNext(nullptr);
exit:
@@ -812,7 +804,7 @@ bool Tcp::AutoBind(const SockAddr &aPeer, SockAddr &aToBind, bool aBindAddress,
peerInfo.Clear();
peerInfo.SetPeerAddr(aPeer.GetAddress());
netifAddress = InstanceLocator::GetInstance().Get<Ip6>().SelectSourceAddress(peerInfo);
netifAddress = Get<Ip6>().SelectSourceAddress(peerInfo);
VerifyOrExit(netifAddress != nullptr, success = false);
aToBind.GetAddress() = netifAddress->GetAddress();
}
@@ -854,12 +846,12 @@ exit:
void Tcp::HandleTimer(Timer &aTimer)
{
OT_ASSERT(&aTimer == &aTimer.GetInstance().Get<Tcp>().mTimer);
OT_ASSERT(&aTimer == &aTimer.Get<Tcp>().mTimer);
LogDebg("Main TCP timer expired");
aTimer.GetInstance().Get<Tcp>().ProcessTimers();
aTimer.Get<Tcp>().ProcessTimers();
}
void Tcp::ProcessTimers()
void Tcp::ProcessTimers(void)
{
TimeMilli now = TimerMilli::GetNow();
bool pendingTimer;
@@ -1014,7 +1006,7 @@ void tcplp_sys_stop_timer(struct tcpcb *aTcb, uint8_t aTimerFlag)
struct tcpcb *tcplp_sys_accept_ready(struct tcpcb_listen *aTcbListen, struct in6_addr *aAddr, uint16_t aPort)
{
Tcp::Listener & listener = Tcp::Listener::FromTcbListen(*aTcbListen);
Tcp & tcp = listener.GetInstance().Get<Tcp>();
Tcp & tcp = listener.Get<Tcp>();
struct tcpcb * rv = (struct tcpcb *)-1;
otSockAddr addr;
otTcpEndpoint * endpointPtr;
@@ -1065,7 +1057,7 @@ bool tcplp_sys_accepted_connection(struct tcpcb_listen *aTcbListen,
{
Tcp::Listener &listener = Tcp::Listener::FromTcbListen(*aTcbListen);
Tcp::Endpoint &endpoint = Tcp::Endpoint::FromTcb(*aAccepted);
Tcp & tcp = endpoint.GetInstance().Get<Tcp>();
Tcp & tcp = endpoint.Get<Tcp>();
bool accepted = true;
if (listener.mAcceptDoneCallback != nullptr)
src/core/net/tcp6.hpp
+4 -4
View File
@@ -83,7 +83,7 @@ public:
* This class represents an endpoint of a TCP/IPv6 connection.
*
*/
class Endpoint : public otTcpEndpoint, public LinkedListEntry<Endpoint>
class Endpoint : public otTcpEndpoint, public LinkedListEntry<Endpoint>, public GetProvider<Endpoint>
{
friend class Tcp;
friend class LinkedList<Endpoint>;
@@ -118,7 +118,7 @@ public:
* @returns The Instance pointer associated with this Endpoint.
*
*/
Instance &GetInstance(void);
Instance &GetInstance(void) const;
/**
* Obtains the context pointer that was associated this Endpoint upon
@@ -402,7 +402,7 @@ public:
* This class represents a TCP/IPv6 listener.
*
*/
class Listener : public otTcpListener, public LinkedListEntry<Listener>
class Listener : public otTcpListener, public LinkedListEntry<Listener>, public GetProvider<Listener>
{
friend class LinkedList<Listener>;
@@ -436,7 +436,7 @@ public:
* @returns The otInstance pointer associated with this Listener.
*
*/
Instance &GetInstance(void);
Instance &GetInstance(void) const;
/**
* Obtains the context pointer that was associated with this Listener upon