joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Use uint_32 for UidOwnerMatchType" into main am: 17dd9e9fa8

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2965923

Change-Id: Idc94008030137905b6802e74fcd3f2cbb1b0bb4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski 2024-02-16 06:10:30 +00:00 • committed by Automerger Merge Worker
commit 0b98332ba3
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/native/utilities/firewall.cpp
View file

@ -71,14 +71,14 @@ Result<void> Firewall::addRule(uint32_t uid, UidOwnerMatchType match, uint32_t i
if (oldMatch.ok()) {
UidOwnerValue newMatch = {
.iif = iif ? iif : oldMatch.value().iif,
.rule = static_cast<uint8_t>(oldMatch.value().rule | match),
.rule = static_cast<uint32_t>(oldMatch.value().rule | match),
};
auto res = mUidOwnerMap.writeValue(uid, newMatch, BPF_ANY);
if (!res.ok()) return Errorf("Failed to update rule: {}", res.error().message());
} else {
UidOwnerValue newMatch = {
.iif = iif,
.rule = static_cast<uint8_t>(match),
.rule = static_cast<uint32_t>(match),
};
auto res = mUidOwnerMap.writeValue(uid, newMatch, BPF_ANY);
if (!res.ok()) return Errorf("Failed to add rule: {}", res.error().message());
@ -93,7 +93,7 @@ Result<void> Firewall::removeRule(uint32_t uid, UidOwnerMatchType match) {
UidOwnerValue newMatch = {
.iif = (match == IIF_MATCH) ? 0 : oldMatch.value().iif,
.rule = static_cast<uint8_t>(oldMatch.value().rule & ~match),
.rule = static_cast<uint32_t>(oldMatch.value().rule & ~match),
};
if (newMatch.rule == 0) {
auto res = mUidOwnerMap.deleteValue(uid);