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

Resurrect 'SetUdpListenPort' on 'ChipDeviceController' #4071

Merged
merged 1 commit into from
Dec 9, 2020
Merged

Resurrect 'SetUdpListenPort' on 'ChipDeviceController' #4071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/controller/CHIPDevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,10 +217,11 @@ CHIP_ERROR Device::LoadSecureSessionParameters(ResetTransport resetNeeded)

if (resetNeeded == ResetTransport::kYes)
{
err = mTransportMgr->ResetTransport(Transport::UdpListenParameters(mInetLayer).SetAddressType(kIPAddressType_IPv6)
err = mTransportMgr->ResetTransport(
Transport::UdpListenParameters(mInetLayer).SetAddressType(kIPAddressType_IPv6).SetListenPort(mListenPort)
#if INET_CONFIG_ENABLE_IPV4
,
Transport::UdpListenParameters(mInetLayer).SetAddressType(kIPAddressType_IPv4)
,
Transport::UdpListenParameters(mInetLayer).SetAddressType(kIPAddressType_IPv4).SetListenPort(mListenPort)
#endif
);
SuccessOrExit(err);
Expand Down
13 changes: 9 additions & 4 deletions src/controller/CHIPDevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,14 @@ class DLL_EXPORT Device
* @param[in] transportMgr Transport manager object pointer
* @param[in] sessionMgr Secure session manager object pointer
* @param[in] inetLayer InetLayer object pointer
* @param[in] listenPort Port on which controller is listening (typically CHIP_PORT)
*/
void Init(DeviceTransportMgr * transportMgr, SecureSessionMgr * sessionMgr, Inet::InetLayer * inetLayer)
void Init(DeviceTransportMgr * transportMgr, SecureSessionMgr * sessionMgr, Inet::InetLayer * inetLayer, uint16_t listenPort)
{
mTransportMgr = transportMgr;
mSessionManager = sessionMgr;
mInetLayer = inetLayer;
mListenPort = listenPort;
}

/**
Expand All @@ -125,14 +127,15 @@ class DLL_EXPORT Device
* @param[in] transportMgr Transport manager object pointer
* @param[in] sessionMgr Secure session manager object pointer
* @param[in] inetLayer InetLayer object pointer
* @param[in] listenPort Port on which controller is listening (typically CHIP_PORT)
* @param[in] deviceId Node ID of the device
* @param[in] devicePort Port on which device is listening (typically CHIP_PORT)
* @param[in] interfaceId Local Interface ID that should be used to talk to the device
*/
void Init(DeviceTransportMgr * transportMgr, SecureSessionMgr * sessionMgr, Inet::InetLayer * inetLayer, NodeId deviceId,
uint16_t devicePort, Inet::InterfaceId interfaceId)
void Init(DeviceTransportMgr * transportMgr, SecureSessionMgr * sessionMgr, Inet::InetLayer * inetLayer, uint16_t listenPort,
vivien-apple marked this conversation as resolved.
Show resolved Hide resolved
NodeId deviceId, uint16_t devicePort, Inet::InterfaceId interfaceId)
{
Init(transportMgr, sessionMgr, inetLayer);
Init(transportMgr, sessionMgr, inetLayer, mListenPort);
mDeviceId = deviceId;
mDevicePort = devicePort;
mInterface = interfaceId;
Expand Down Expand Up @@ -256,6 +259,8 @@ class DLL_EXPORT Device
* @param[in] resetNeeded Does the underlying network socket require a reset
*/
CHIP_ERROR LoadSecureSessionParameters(ResetTransport resetNeeded);

uint16_t mListenPort;
};

/**
Expand Down
27 changes: 20 additions & 7 deletions src/controller/CHIPDeviceController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ DeviceController::DeviceController()
mLocalDeviceId = 0;
mStorageDelegate = nullptr;
mPairedDevicesInitialized = false;
mListenPort = CHIP_PORT;
}

CHIP_ERROR DeviceController::Init(NodeId localDeviceId, PersistentStorageDelegate * storageDelegate, System::Layer * systemLayer,
Expand Down Expand Up @@ -126,10 +127,11 @@ CHIP_ERROR DeviceController::Init(NodeId localDeviceId, PersistentStorageDelegat
mTransportMgr = chip::Platform::New<DeviceTransportMgr>();
mSessionManager = chip::Platform::New<SecureSessionMgr>();

err = mTransportMgr->Init(Transport::UdpListenParameters(mInetLayer).SetAddressType(Inet::kIPAddressType_IPv6)
err = mTransportMgr->Init(
Transport::UdpListenParameters(mInetLayer).SetAddressType(Inet::kIPAddressType_IPv6).SetListenPort(mListenPort)
#if INET_CONFIG_ENABLE_IPV4
,
Transport::UdpListenParameters(mInetLayer).SetAddressType(Inet::kIPAddressType_IPv4)
,
Transport::UdpListenParameters(mInetLayer).SetAddressType(Inet::kIPAddressType_IPv4).SetListenPort(mListenPort)
#endif
);
SuccessOrExit(err);
Expand Down Expand Up @@ -190,6 +192,17 @@ CHIP_ERROR DeviceController::Shutdown()
return err;
}

CHIP_ERROR DeviceController::SetUdpListenPort(uint16_t listenPort)
{
if (mState == State::Initialized)
{
return CHIP_ERROR_INCORRECT_STATE;
}

mListenPort = listenPort;
return CHIP_NO_ERROR;
}

CHIP_ERROR DeviceController::GetDevice(NodeId deviceId, const SerializedDevice & deviceInfo, Device ** out_device)
{
CHIP_ERROR err = CHIP_NO_ERROR;
Expand All @@ -214,7 +227,7 @@ CHIP_ERROR DeviceController::GetDevice(NodeId deviceId, const SerializedDevice &
err = device->Deserialize(deviceInfo);
VerifyOrExit(err == CHIP_NO_ERROR, ReleaseDevice(device));

device->Init(mTransportMgr, mSessionManager, mInetLayer);
device->Init(mTransportMgr, mSessionManager, mInetLayer, mListenPort);
}

*out_device = device;
Expand Down Expand Up @@ -276,7 +289,7 @@ CHIP_ERROR DeviceController::GetDevice(NodeId deviceId, Device ** out_device)
err = device->Deserialize(deviceInfo);
VerifyOrExit(err == CHIP_NO_ERROR, ReleaseDevice(device));

device->Init(mTransportMgr, mSessionManager, mInetLayer);
device->Init(mTransportMgr, mSessionManager, mInetLayer, mListenPort);
}
}

Expand Down Expand Up @@ -490,7 +503,7 @@ CHIP_ERROR DeviceCommissioner::PairDevice(NodeId remoteDeviceId, RendezvousParam
err = mRendezvousSession->Init(params.SetLocalNodeId(mLocalDeviceId).SetRemoteNodeId(remoteDeviceId), mTransportMgr);
SuccessOrExit(err);

device->Init(mTransportMgr, mSessionManager, mInetLayer, remoteDeviceId, remotePort, interfaceId);
device->Init(mTransportMgr, mSessionManager, mInetLayer, mListenPort, remoteDeviceId, remotePort, interfaceId);

exit:
if (err != CHIP_NO_ERROR)
Expand Down Expand Up @@ -533,7 +546,7 @@ CHIP_ERROR DeviceCommissioner::PairTestDeviceWithoutSecurity(NodeId remoteDevice

testSecurePairingSecret->ToSerializable(device->GetPairing());

device->Init(mTransportMgr, mSessionManager, mInetLayer, remoteDeviceId, remotePort, interfaceId);
device->Init(mTransportMgr, mSessionManager, mInetLayer, mListenPort, remoteDeviceId, remotePort, interfaceId);

device->SetAddress(deviceAddr);

Expand Down
3 changes: 3 additions & 0 deletions src/controller/CHIPDeviceController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ class DLL_EXPORT DeviceController : public SecureSessionMgrDelegate, public Pers
*/
CHIP_ERROR GetDevice(NodeId deviceId, Device ** device);

CHIP_ERROR SetUdpListenPort(uint16_t listenPort);

virtual void ReleaseDevice(Device * device);

// ----- IO -----
Expand Down Expand Up @@ -188,6 +190,7 @@ class DLL_EXPORT DeviceController : public SecureSessionMgrDelegate, public Pers
PersistentStorageDelegate * mStorageDelegate;
Inet::InetLayer * mInetLayer;

uint16_t mListenPort;
uint16_t GetInactiveDeviceIndex();
uint16_t FindDeviceIndex(NodeId id);
void ReleaseDevice(uint16_t index);
Expand Down