commit c2309adfc8db21531e7f7335f5af4773271c7dae
author Maciej Żenczykowski <maze@google.com> Mon Jan 30 21:55:26 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 30 21:55:26 2023 +0000
tree da0b541964ac31610afa3a7705bc1e8e3be32fd7
parent 2ccdd91108d7340c1acd47093f2031beebf05a6f
parent 721f5344130c81540795a6ebf428c5e70ccd8f33

clat: just always set mark unconditionally, part 2 am: 8bf5967d1e am: 721f534413

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

Change-Id: Ie1b8a7ad1f5473374ee600c3caf3701e7b655175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/native/libs/libclat/clatutils.cpp

diff --git a/service/native/libs/libclat/clatutils.cpp b/service/native/libs/libclat/clatutils.cpp
index 64e5b91..c6a9781 100644
--- a/service/native/libs/libclat/clatutils.cpp
+++ b/service/native/libs/libclat/clatutils.cpp
@@ -29,9 +29,6 @@
 #include "checksum.h"
 }
 
-// Sync from system/netd/include/netid_client.h.
-#define MARK_UNSET 0u
-
 namespace android {
 namespace net {
 namespace clat {
@@ -128,7 +125,7 @@
 
     // Socket's mark affects routing decisions (network selection)
     // An fwmark is necessary for clat to bypass the VPN during initialization.
-    if ((mark != MARK_UNSET) && setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark))) {
+    if (setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark))) {
         int ret = errno;
         ALOGE("setsockopt(SOL_SOCKET, SO_MARK) failed: %s", strerror(errno));
         close(s);
@@ -176,7 +173,7 @@
     }
 
     // Socket's mark affects routing decisions (network selection)
-    if ((mark != MARK_UNSET) && setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark))) {
+    if (setsockopt(s, SOL_SOCKET, SO_MARK, &mark, sizeof(mark))) {
         int ret = errno;
         ALOGE("setsockopt(SOL_SOCKET, SO_MARK) failed: %s", strerror(errno));
         close(s);