Improve logic for resetting g_last_failed_id

We only explicitly reset it to ~0 when the brigde approves the last connection.

Author: JingMatrix

zygisk/src/main/cpp/ipc_bridge.cpp

@@ -476,8 +476,11 @@ jboolean IPCBridge::ExecTransact_Replace(jboolean *res, JNIEnv *env, jobject obj
         if (*res == JNI_FALSE) {
             uint64_t caller_id = BinderCaller::GetId();
             if (caller_id != 0) {
+                // LOGV("Caller {} rejected by bridge service.", caller_id);
                 g_last_failed_id.store(caller_id, std::memory_order_relaxed);
             }
+        } else {
+            g_last_failed_id.store(~0, std::memory_order_relaxed);
         }
         return true;  // Return true to indicate we handled the call.
     }
@@ -486,21 +489,18 @@ jboolean IPCBridge::ExecTransact_Replace(jboolean *res, JNIEnv *env, jobject obj
 
 jboolean JNICALL IPCBridge::CallBooleanMethodV_Hook(JNIEnv *env, jobject obj, jmethodID methodId,
                                                     va_list args) {
-    uint64_t current_caller_id = BinderCaller::GetId();
-    if (current_caller_id != 0) {
-        uint64_t last_failed = g_last_failed_id.load(std::memory_order_relaxed);
-        // If this caller is the one that just failed,
-        // skip interception and go straight to the original function.
-        if (current_caller_id == last_failed) {
+    // Check if the method being called is the one we want to intercept: Binder.execTransact()
+    if (methodId == GetInstance().exec_transact_backup_method_id_) {
+        uint64_t current_caller_id = BinderCaller::GetId();
+
+        if (current_caller_id != 0 &&
+            current_caller_id == g_last_failed_id.load(std::memory_order_relaxed)) {
+            // If this caller is the one that just failed,
+            // skip interception and go straight to the original function.
+            // LOGV("Skip caller {} for bridge service.", current_caller_id);
             return GetInstance().call_boolean_method_v_backup_(env, obj, methodId, args);
-        } else if (last_failed != ~0) {
-            // Consume the failed state by resetting it, so the next call is not skipped.
-            g_last_failed_id.store(~0, std::memory_order_relaxed);
         }
-    }
 
-    // Check if the method being called is the one we want to intercept: Binder.execTransact()
-    if (methodId == GetInstance().exec_transact_backup_method_id_) {
         jboolean res = false;
         // Attempt to handle the transaction with our replacement logic.
         if (ExecTransact_Replace(&res, env, obj, args)) {