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

Enable -Wconversion for ESP32 platform bits. #25373

Merged
merged 2 commits into from
Mar 1, 2023
Merged

Enable -Wconversion for ESP32 platform bits. #25373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5546c9e
Enable -Wconversion for ESP32 platform bits.
bzbarsky-apple Feb 28, 2023
1d57ec6
Address review comment.
bzbarsky-apple Mar 1, 2023
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
2 changes: 2 additions & 0 deletions src/platform/ESP32/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,6 @@ static_library("ESP32") {
"ESP32DeviceInfoProvider.h",
]
}

cflags = [ "-Wconversion" ]
}
13 changes: 12 additions & 1 deletion src/platform/ESP32/DiagnosticDataProviderImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,18 @@ CHIP_ERROR DiagnosticDataProviderImpl::GetNetworkInterfaces(NetworkInterface **
ifp->Ipv4AddressSpans[0] = ByteSpan(ifp->Ipv4AddressesBuffer[0], kMaxIPv4AddrSize);
ifp->IPv4Addresses = chip::app::DataModel::List<chip::ByteSpan>(ifp->Ipv4AddressSpans, 1);
}
ipv6_addr_count = esp_netif_get_all_ip6(ifa, ip6_addr);

static_assert(kMaxIPv6AddrCount <= UINT8_MAX, "Count might not fit in ipv6_addr_count");
static_assert(ArraySize(ip6_addr) >= LWIP_IPV6_NUM_ADDRESSES, "Not enough space for our addresses.");
auto addr_count = esp_netif_get_all_ip6(ifa, ip6_addr);
if (addr_count < 0)
{
ipv6_addr_count = 0;
}
else
{
ipv6_addr_count = static_cast<uint8_t>(min(addr_count, static_cast<int>(kMaxIPv6AddrCount)));
}
for (uint8_t idx = 0; idx < ipv6_addr_count; ++idx)
{
memcpy(ifp->Ipv6AddressesBuffer[idx], ip6_addr[idx].addr, kMaxIPv6AddrSize);
Expand Down
26 changes: 21 additions & 5 deletions src/platform/ESP32/NetworkCommissioningDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ CHIP_ERROR GetConfiguredNetwork(Network & network)
{
return chip::DeviceLayer::Internal::ESP32Utils::MapError(err);
}
uint8_t length = strnlen(reinterpret_cast<const char *>(ap_info.ssid), DeviceLayer::Internal::kMaxWiFiSSIDLength);
static_assert(chip::DeviceLayer::Internal::kMaxWiFiSSIDLength <= UINT8_MAX, "SSID length might not fit in length");
uint8_t length =
static_cast<uint8_t>(strnlen(reinterpret_cast<const char *>(ap_info.ssid), DeviceLayer::Internal::kMaxWiFiSSIDLength));
if (length > sizeof(network.networkID))
{
return CHIP_ERROR_INTERNAL;
Expand Down Expand Up @@ -75,8 +77,17 @@ CHIP_ERROR ESPWiFiDriver::Init(NetworkStatusChangeCallback * networkStatusChange
{
return CHIP_NO_ERROR;
}
mSavedNetwork.credentialsLen = credentialsLen;
mSavedNetwork.ssidLen = ssidLen;
if (!CanCastTo<uint8_t>(credentialsLen))
{
return CHIP_ERROR_INCORRECT_STATE;
}
mSavedNetwork.credentialsLen = static_cast<uint8_t>(credentialsLen);

if (!CanCastTo<uint8_t>(ssidLen))
{
return CHIP_ERROR_INCORRECT_STATE;
}
mSavedNetwork.ssidLen = static_cast<uint8_t>(ssidLen);

mStagingNetwork = mSavedNetwork;
mpScanCallback = nullptr;
Expand Down Expand Up @@ -359,9 +370,14 @@ void ESPWiFiDriver::OnNetworkStatusChange()
Status::kSuccess, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)), NullOptional);
return;
}

// The disconnect reason for networking status changes is allowed to have
// manufacturer-specific values, which is why it's an int32_t, even though
// we just store a uint16_t value in it.
int32_t lastDisconnectReason = GetLastDisconnectReason();
mpStatusChangeCallback->OnNetworkingStatusChange(
Status::kUnknownError, MakeOptional(ByteSpan(configuredNetwork.networkID, configuredNetwork.networkIDLen)),
MakeOptional(GetLastDisconnectReason()));
MakeOptional(lastDisconnectReason));
}

void ESPWiFiDriver::ScanNetworks(ByteSpan ssid, WiFiDriver::ScanCallback * callback)
Expand All @@ -386,7 +402,7 @@ CHIP_ERROR ESPWiFiDriver::SetLastDisconnectReason(const ChipDeviceEvent * event)
return CHIP_NO_ERROR;
}

int32_t ESPWiFiDriver::GetLastDisconnectReason()
uint16_t ESPWiFiDriver::GetLastDisconnectReason()
{
return mLastDisconnectedReason;
}
Expand Down
9 changes: 5 additions & 4 deletions src/platform/ESP32/NetworkCommissioningDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ class ESPScanResponseIterator : public Iterator<WiFiScanResponse>
}

item.security.SetRaw(mpScanResults[mIternum].authmode);
item.ssidLen =
strnlen(reinterpret_cast<const char *>(mpScanResults[mIternum].ssid), chip::DeviceLayer::Internal::kMaxWiFiSSIDLength);
static_assert(chip::DeviceLayer::Internal::kMaxWiFiSSIDLength <= UINT8_MAX, "SSID length might not fit in item.ssidLen");
item.ssidLen = static_cast<uint8_t>(
strnlen(reinterpret_cast<const char *>(mpScanResults[mIternum].ssid), chip::DeviceLayer::Internal::kMaxWiFiSSIDLength));
item.channel = mpScanResults[mIternum].primary;
item.wiFiBand = chip::DeviceLayer::NetworkCommissioning::WiFiBand::k2g4;
item.rssi = mpScanResults[mIternum].rssi;
Expand Down Expand Up @@ -115,7 +116,7 @@ class ESPWiFiDriver final : public WiFiDriver
void OnNetworkStatusChange();

CHIP_ERROR SetLastDisconnectReason(const ChipDeviceEvent * event);
int32_t GetLastDisconnectReason();
uint16_t GetLastDisconnectReason();

static ESPWiFiDriver & GetInstance()
{
Expand All @@ -132,7 +133,7 @@ class ESPWiFiDriver final : public WiFiDriver
ScanCallback * mpScanCallback;
ConnectCallback * mpConnectCallback;
NetworkStatusChangeCallback * mpStatusChangeCallback = nullptr;
int32_t mLastDisconnectedReason;
uint16_t mLastDisconnectedReason;
};

} // namespace NetworkCommissioning
Expand Down
21 changes: 13 additions & 8 deletions src/platform/ESP32/route_hook/ESP32RouteHook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ static void ra_recv_handler(struct netif * netif, const uint8_t * icmp_payload,
return;
}
icmp_payload += sizeof(struct ra_header);
payload_len -= sizeof(struct ra_header);
payload_len = (uint16_t)(payload_len - sizeof(struct ra_header));

while (payload_len >= 2)
{
uint8_t opt_type = icmp_payload[0];
uint8_t opt_len = icmp_payload[1] << 3;
uint8_t opt_len = (uint8_t)(icmp_payload[1] << 3);

if (opt_type == ND6_OPTION_TYPE_ROUTE_INFO && opt_len >= sizeof(route_option_t) - sizeof(ip6_addr_p_t) &&
!is_self_address(netif, src_addr) && payload_len >= opt_len)
Expand All @@ -75,9 +75,9 @@ static void ra_recv_handler(struct netif * netif, const uint8_t * icmp_payload,
{
break;
}
uint8_t prefix_len_bytes = (route_option.prefix_length + 7) / 8;
int8_t preference = -2 * ((route_option.preference >> 4) & 1) + (((route_option.preference) >> 3) & 1);
uint8_t rio_data_len = opt_len - sizeof(route_option) + sizeof(ip6_addr_p_t);
uint8_t prefix_len_bytes = (uint8_t)((route_option.prefix_length + 7) / 8);
int8_t preference = (int8_t)(-2 * ((route_option.preference >> 4) & 1) + (((route_option.preference) >> 3) & 1));
uint8_t rio_data_len = (uint8_t)(opt_len - sizeof(route_option) + sizeof(ip6_addr_p_t));

ESP_LOGI(TAG, "Received RIO");
if (rio_data_len >= prefix_len_bytes)
Expand All @@ -101,7 +101,7 @@ static void ra_recv_handler(struct netif * netif, const uint8_t * icmp_payload,
}
}
icmp_payload += opt_len;
payload_len -= opt_len;
payload_len = (uint16_t)(payload_len - opt_len);
}
}

Expand Down Expand Up @@ -136,7 +136,7 @@ static uint8_t icmp6_raw_recv_handler(void * arg, struct raw_pcb * pcb, struct p
return 0;
}

icmp_payload_len = p->tot_len - sizeof(struct ip6_hdr);
icmp_payload_len = (uint16_t)(p->tot_len - sizeof(struct ip6_hdr));
icmp_payload = p->payload + sizeof(struct ip6_hdr);

icmp6_header = (struct icmp6_hdr *) icmp_payload;
Expand All @@ -155,7 +155,12 @@ esp_err_t esp_route_hook_init(esp_netif_t * netif)
esp_err_t ret = ESP_OK;

ESP_RETURN_ON_FALSE(netif != NULL, ESP_ERR_INVALID_ARG, TAG, "Invalid network interface");
lwip_netif = netif_get_by_index(esp_netif_get_netif_impl_index(netif));
int netif_idx = esp_netif_get_netif_impl_index(netif);
if (netif_idx < 0 || netif_idx > UINT8_MAX)
{
return ESP_ERR_INVALID_SIZE;
}
lwip_netif = netif_get_by_index((uint8_t) netif_idx);
ESP_RETURN_ON_FALSE(lwip_netif != NULL, ESP_ERR_INVALID_ARG, TAG, "Invalid network interface");

for (esp_route_hook_t * iter = s_hooks; iter != NULL; iter++)
Expand Down