Merge "clat: just always set mark unconditionally" am: 5708b1c7df
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2392272
Change-Id: Ib2de7304943dc3663ade15050547e31b3588722c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
index 18d2311..2c56d6c 100644
--- a/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
+++ b/service/jni/com_android_server_connectivity_ClatCoordinator.cpp
@@ -36,9 +36,6 @@
#include "libclat/clatutils.h"
#include "nativehelper/scoped_utf_chars.h"
-// Sync from system/netd/include/netid_client.h
-#define MARK_UNSET 0u
-
// Sync from system/netd/server/NetdConstants.h
#define __INT_STRLEN(i) sizeof(#i)
#define _INT_STRLEN(i) __INT_STRLEN(i)
@@ -197,7 +194,7 @@
}
// TODO: check the mark validation
- if (mark != MARK_UNSET && setsockopt(sock, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)) < 0) {
+ if (setsockopt(sock, SOL_SOCKET, SO_MARK, &mark, sizeof(mark)) < 0) {
throwIOException(env, "could not set mark on raw socket", errno);
close(sock);
return -1;