From 39aa9952b59935539815e4452c98447d18e04dc8 Mon Sep 17 00:00:00 2001
From: tehcneko <7764726+tehcneko@users.noreply.github.com>
Date: Fri, 19 Mar 2021 21:21:11 +0800
Subject: [PATCH] [core] Print version to logcat (#375)

* [core] Print version to logcat

* [core] Check module id on init
---
 core/build.gradle.kts                                      | 3 ++-
 core/src/main/cpp/CMakeLists.txt                           | 1 +
 core/src/main/cpp/main/src/main.cpp                        | 7 ++++++-
 .../main/java/org/lsposed/lspd/service/ServiceManager.java | 4 ++++
 core/template_override/customize.sh                        | 5 +++--
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index 376e26e7..ee819989 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -95,7 +95,8 @@ android {
                 cFlags("-std=c11 -ffixed-x18 -Qunused-arguments -fno-rtti -fno-exceptions -fomit-frame-pointer -fpie -fPIC")
                 arguments("-DRIRU_MODULE_API_VERSION=$moduleMaxRiruApiVersion",
                         "-DRIRU_MODULE_VERSION=$verCode",
-                        "-DRIRU_MODULE_VERSION_NAME:STRING=\"$verName\"")
+                        "-DRIRU_MODULE_VERSION_NAME:STRING=\"$verName\"",
+                        "-DMODULE_NAME:STRING=riru_$riruModuleId")
                 targets("lspd")
             }
         }
diff --git a/core/src/main/cpp/CMakeLists.txt b/core/src/main/cpp/CMakeLists.txt
index 00cda415..eb3fa12f 100644
--- a/core/src/main/cpp/CMakeLists.txt
+++ b/core/src/main/cpp/CMakeLists.txt
@@ -35,6 +35,7 @@ add_definitions(-DRIRU_MODULE)
 add_definitions(-DRIRU_MODULE_API_VERSION=${RIRU_MODULE_API_VERSION})
 add_definitions(-DRIRU_MODULE_VERSION=${RIRU_MODULE_VERSION})
 add_definitions(-DRIRU_MODULE_VERSION_NAME=${RIRU_MODULE_VERSION_NAME})
+add_definitions(-DMODULE_NAME=${MODULE_NAME})
 
 add_subdirectory(main)
 add_subdirectory(external)
diff --git a/core/src/main/cpp/main/src/main.cpp b/core/src/main/cpp/main/src/main.cpp
index 15365d77..9f53a469 100644
--- a/core/src/main/cpp/main/src/main.cpp
+++ b/core/src/main/cpp/main/src/main.cpp
@@ -36,6 +36,7 @@ namespace lspd {
 
         void onModuleLoaded() {
             LOGI("onModuleLoaded: welcome to LSPosed!");
+            LOGI("onModuleLoaded: version %s (%d)", RIRU_MODULE_VERSION_NAME, RIRU_MODULE_VERSION);
             // rirud must be used in onModuleLoaded
             Context::GetInstance()->PreLoadDex(magiskPath + '/' + kDexPath);
             InitSymbolCache();
@@ -112,9 +113,13 @@ namespace lspd {
 }
 
 __attribute__((noinline)) RIRU_EXPORT RiruVersionedModuleInfo *init(Riru *riru) {
-    LOGD("Using riru %d", riru->riruApiVersion);
+    LOGD("using riru %d", riru->riruApiVersion);
     LOGD("module path: %s", riru->magiskModulePath);
     lspd::magiskPath = riru->magiskModulePath;
+    if (lspd::magiskPath.find(STRINGIFY(MODULE_NAME)) == std::string::npos) {
+        LOGE("who am i");
+        return nullptr;
+    }
     lspd::allowUnload = riru->allowUnload;
     return &lspd::module;
 }
diff --git a/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java b/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java
index 7c765b65..9b35c9c9 100644
--- a/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java
+++ b/core/src/main/java/org/lsposed/lspd/service/ServiceManager.java
@@ -20,10 +20,13 @@
 package org.lsposed.lspd.service;
 
 import android.content.Context;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.Looper;
 import android.util.Log;
 
+import org.lsposed.lspd.BuildConfig;
+
 public class ServiceManager {
     private static LSPosedService mainService = null;
     private static LSPModuleService moduleService = null;
@@ -49,6 +52,7 @@ public class ServiceManager {
     // call by ourselves
     public static void start() {
         Log.i(TAG, "starting server...");
+        Log.i(TAG, String.format("version %s (%s)", BuildConfig.VERSION_NAME, BuildConfig.VERSION_NAME));
 
         Thread.setDefaultUncaughtExceptionHandler((t, e) -> {
             Log.e(TAG, Log.getStackTraceString(e));
diff --git a/core/template_override/customize.sh b/core/template_override/customize.sh
index bc29f5c1..cbe2bad2 100644
--- a/core/template_override/customize.sh
+++ b/core/template_override/customize.sh
@@ -31,8 +31,9 @@ abortC() {
 POUNDS="*********************************************************"
 
 VERSION=$(grep_prop version "${TMPDIR}/module.prop")
+VERSION_CODE=$(grep_prop versionCode "${TMPDIR}/module.prop")
 
-ui_print "- LSPosed version ${VERSION}"
+ui_print "- LSPosed version ${VERSION} (${VERSION_CODE})"
 
 # Extract verify.sh
 ui_print "- Extracting verify.sh"
@@ -137,4 +138,4 @@ if [ ! -e /data/adb/lspd/config/verbose_log ]; then
 fi
 
 set_perm_recursive "${MODPATH}" 0 0 0755 0644
-ui_print "- Welcome to LSPosed ${VERSION}!"
+ui_print "- Welcome to LSPosed!"