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

Separate setting log functions and starting log daemon

Browse Source
This commit is contained in:
topjohnwu 2021-03-13 16:34:41 -08:00 committed by John Wu
parent b9cdc755d1
commit 82f8948fd4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,8 +146,6 @@ shortcut:
close(client); close(client);
} }
static void magisk_logging();
static int switch_cgroup(const char *cgroup, int pid) { static int switch_cgroup(const char *cgroup, int pid) {
char buf[32]; char buf[32];
snprintf(buf, sizeof(buf), "%s/cgroup.procs", cgroup); snprintf(buf, sizeof(buf), "%s/cgroup.procs", cgroup);
@ -163,7 +161,12 @@ static int switch_cgroup(const char *cgroup, int pid) {
return 0; return 0;
} }
static void magisk_logging();
static void start_log_daemon();
[[noreturn]] static void daemon_entry() { [[noreturn]] static void daemon_entry() {
magisk_logging();
// Block all signals // Block all signals
sigset_t block_set; sigset_t block_set;
sigfillset(&block_set); sigfillset(&block_set);
@ -182,11 +185,11 @@ static int switch_cgroup(const char *cgroup, int pid) {
if (fd > STDERR_FILENO) if (fd > STDERR_FILENO)
close(fd); close(fd);
magisk_logging();
setsid(); setsid();
setcon("u:r:" SEPOL_PROC_DOMAIN ":s0"); setcon("u:r:" SEPOL_PROC_DOMAIN ":s0");
start_log_daemon();
LOGI(NAME_WITH_VER(Magisk) " daemon started\n"); LOGI(NAME_WITH_VER(Magisk) " daemon started\n");
// Escape from cgroup // Escape from cgroup
@ -261,7 +264,6 @@ int connect_daemon(bool create) {
exit(1); exit(1);
} }
LOGD("client: launching new main daemon process\n");
if (fork_dont_care() == 0) { if (fork_dont_care() == 0) {
close(fd); close(fd);
daemon_entry(); daemon_entry();
@ -415,14 +417,16 @@ static int magisk_log(int prio, const char *fmt, va_list ap) {
return len - 1; return len - 1;
} }
#define mlog(prio) [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_##prio, fmt, ap); } static void start_log_daemon() {
static void magisk_logging() {
int fds[2]; int fds[2];
if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, fds) == 0) { if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, fds) == 0) {
log_sockfd = fds[0]; log_sockfd = fds[0];
new_daemon_thread([=] { logfile_writer(fds[1]); }); new_daemon_thread([=] { logfile_writer(fds[1]); });
} }
}
#define mlog(prio) [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_##prio, fmt, ap); }
static void magisk_logging() {
log_cb.d = mlog(DEBUG); log_cb.d = mlog(DEBUG);
log_cb.i = mlog(INFO); log_cb.i = mlog(INFO);
log_cb.w = mlog(WARN); log_cb.w = mlog(WARN);