TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-16 12:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use magiskd to setup files

Browse Source
This commit is contained in:
topjohnwu
2021-08-18 03:44:32 -07:00
parent 003fea52b1
commit 9b3efffba9
6 changed files with 118 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
native/jni/core/daemon.cpp
View File

@@ -68,6 +68,9 @@ static void handle_request_async(int client, int code, ucred cred) {
close(client);
reboot();
break;
case ZYGISK_REQUEST:
zygisk_handler(client, &cred);
break;
default:
close(client);
break;
@@ -116,6 +119,7 @@ static void handle_request(int client) {
case BOOT_COMPLETE:
case SQLITE_CMD:
case GET_PATH:
case MAGISKHIDE:
if (!is_root) {
write_int(client, ROOT_REQUIRED);
goto done;
@@ -127,9 +131,9 @@ static void handle_request(int client) {
goto done;
}
break;
case MAGISKHIDE: // accept hide request from zygote
if (!is_root && !is_zygote) {
write_int(client, ROOT_REQUIRED);
case ZYGISK_REQUEST:
if (!is_zygote) {
write_int(client, DAEMON_ERROR);
goto done;
}
break;
@@ -260,7 +264,7 @@ int connect_daemon(bool create) {
if (connect(fd, (sockaddr*) &sun, len)) {
if (!create || getuid() != UID_ROOT) {
LOGE("No daemon is currently running!\n");
exit(1);
return 1;
}
if (fork_dont_care() == 0) {

10
native/jni/core/logging.cpp
View File

@@ -158,6 +158,16 @@ void magisk_logging() {
log_cb.ex = nop_ex;
}
#define alog(prio) [](auto fmt, auto ap){ \
return __android_log_vprint(ANDROID_LOG_##prio, "Magisk", fmt, ap); }
void android_logging() {
log_cb.d = alog(DEBUG);
log_cb.i = alog(INFO);
log_cb.w = alog(WARN);
log_cb.e = alog(ERROR);
log_cb.ex = nop_ex;
}
void start_log_daemon() {
int fds[2];
if (pipe2(fds, O_CLOEXEC) == 0) {