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

Receive path cleanup for PacketBufferHandle conversion #4128

Merged
merged 1 commit into from
Dec 9, 2020
Merged

Receive path cleanup for PacketBufferHandle conversion #4128

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
30 changes: 12 additions & 18 deletions src/inet/InetLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,12 +1066,10 @@ chip::System::Error InetLayer::HandleInetLayerEvent(chip::System::Object & aTarg
static_cast<TCPEndPoint &>(aTarget).HandleIncomingConnection(reinterpret_cast<TCPEndPoint *>(aArgument));
break;

case kInetEvent_TCPDataReceived: {
chip::System::PacketBufferHandle buf;
buf.Adopt(reinterpret_cast<chip::System::PacketBuffer *>(aArgument));
static_cast<TCPEndPoint &>(aTarget).HandleDataReceived(std::move(buf));
}
break;
case kInetEvent_TCPDataReceived:
static_cast<TCPEndPoint &>(aTarget).HandleDataReceived(
System::PacketBufferHandle::Create(reinterpret_cast<chip::System::PacketBuffer *>(aArgument)));
break;

case kInetEvent_TCPDataSent:
static_cast<TCPEndPoint &>(aTarget).HandleDataSent(static_cast<uint16_t>(aArgument));
Expand All @@ -1083,21 +1081,17 @@ chip::System::Error InetLayer::HandleInetLayerEvent(chip::System::Object & aTarg
#endif // INET_CONFIG_ENABLE_TCP_ENDPOINT

#if INET_CONFIG_ENABLE_RAW_ENDPOINT
case kInetEvent_RawDataReceived: {
chip::System::PacketBufferHandle buf;
buf.Adopt(reinterpret_cast<chip::System::PacketBuffer *>(aArgument));
static_cast<RawEndPoint &>(aTarget).HandleDataReceived(std::move(buf));
}
break;
case kInetEvent_RawDataReceived:
static_cast<RawEndPoint &>(aTarget).HandleDataReceived(
System::PacketBufferHandle::Create(reinterpret_cast<chip::System::PacketBuffer *>(aArgument)));
break;
#endif // INET_CONFIG_ENABLE_RAW_ENDPOINT

#if INET_CONFIG_ENABLE_UDP_ENDPOINT
case kInetEvent_UDPDataReceived: {
chip::System::PacketBufferHandle buf;
buf.Adopt(reinterpret_cast<chip::System::PacketBuffer *>(aArgument));
static_cast<UDPEndPoint &>(aTarget).HandleDataReceived(std::move(buf));
}
break;
case kInetEvent_UDPDataReceived:
static_cast<UDPEndPoint &>(aTarget).HandleDataReceived(
System::PacketBufferHandle::Create(reinterpret_cast<chip::System::PacketBuffer *>(aArgument)));
break;
#endif // INET_CONFIG_ENABLE_UDP_ENDPOINT

#if INET_CONFIG_ENABLE_DNS_RESOLVER
Expand Down
8 changes: 2 additions & 6 deletions src/platform/EFR32/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,12 +376,8 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)

case DeviceEventType::kCHIPoBLEWriteReceived: {
ChipLogProgress(DeviceLayer, "_OnPlatformEvent kCHIPoBLEWriteReceived");
{
System::PacketBufferHandle data_ForNow;
data_ForNow.Adopt(event->CHIPoBLEWriteReceived.Data);
HandleWriteReceived(event->CHIPoBLEWriteReceived.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_RX,
std::move(data_ForNow));
}
HandleWriteReceived(event->CHIPoBLEWriteReceived.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_RX,
PacketBufferHandle::Create(event->CHIPoBLEWriteReceived.Data));
}
break;

Expand Down
9 changes: 3 additions & 6 deletions src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,10 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleUnsubscribeReceived(event->CHIPoBLEUnsubscribe.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_TX);
break;

case DeviceEventType::kCHIPoBLEWriteReceived: {
System::PacketBufferHandle data_ForNow;
data_ForNow.Adopt(event->CHIPoBLEWriteReceived.Data);
case DeviceEventType::kCHIPoBLEWriteReceived:
HandleWriteReceived(event->CHIPoBLEWriteReceived.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_RX,
std::move(data_ForNow));
}
break;
PacketBufferHandle::Create(event->CHIPoBLEWriteReceived.Data));
break;

case DeviceEventType::kCHIPoBLEIndicateConfirm:
HandleIndicationConfirmation(event->CHIPoBLEIndicateConfirm.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_TX);
Expand Down
9 changes: 3 additions & 6 deletions src/platform/ESP32/nimble/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,10 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleUnsubscribeReceived(event->CHIPoBLEUnsubscribe.ConId, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_TX);
break;

case DeviceEventType::kCHIPoBLEWriteReceived: {
System::PacketBufferHandle data_ForNow;
data_ForNow.Adopt(event->CHIPoBLEWriteReceived.Data);
case DeviceEventType::kCHIPoBLEWriteReceived:
HandleWriteReceived(event->CHIPoBLEWriteReceived.ConId, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_RX,
std::move(data_ForNow));
}
break;
PacketBufferHandle::Create(event->CHIPoBLEWriteReceived.Data));
break;

case DeviceEventType::kCHIPoBLEIndicateConfirm:
HandleIndicationConfirmation(event->CHIPoBLEIndicateConfirm.ConId, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_TX);
Expand Down
9 changes: 3 additions & 6 deletions src/platform/Linux/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,10 @@ void BLEManagerImpl::_OnPlatformEvent(const ChipDeviceEvent * event)
HandleUnsubscribeReceived(event->CHIPoBLEUnsubscribe.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_TX);
break;

case DeviceEventType::kCHIPoBLEWriteReceived: {
System::PacketBufferHandle data_ForNow;
data_ForNow.Adopt(event->CHIPoBLEWriteReceived.Data);
case DeviceEventType::kCHIPoBLEWriteReceived:
HandleWriteReceived(event->CHIPoBLEWriteReceived.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_RX,
std::move(data_ForNow));
}
break;
PacketBufferHandle::Create(event->CHIPoBLEWriteReceived.Data));
break;

case DeviceEventType::kCHIPoBLEIndicateConfirm:
HandleIndicationConfirmation(event->CHIPoBLEIndicateConfirm.ConId, &CHIP_BLE_SVC_ID, &ChipUUID_CHIPoBLEChar_TX);
Expand Down
5 changes: 2 additions & 3 deletions src/platform/Zephyr/GenericBLEManagerImpl_Zephyr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,8 @@ CHIP_ERROR GenericBLEManagerImpl_Zephyr<ImplClass>::HandleRXCharWrite(const Chip
ChipLogDetail(DeviceLayer, "Write request received for CHIPoBLE RX characteristic (ConnId 0x%02" PRIx16 ")",
bt_conn_index(c1WriteEvent->BtConn));

PacketBufferHandle data_ForNow;
data_ForNow.Adopt(c1WriteEvent->Data);
HandleWriteReceived(c1WriteEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_RX, std::move(data_ForNow));
HandleWriteReceived(c1WriteEvent->BtConn, &CHIP_BLE_SVC_ID, &chipUUID_CHIPoBLEChar_RX,
PacketBufferHandle::Create(c1WriteEvent->Data));
bt_conn_unref(c1WriteEvent->BtConn);

return CHIP_NO_ERROR;
Expand Down