Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
82f8948f
Commit
82f8948f
authored
Mar 14, 2021
by
topjohnwu
Committed by
John Wu
Mar 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Separate setting log functions and starting log daemon
parent
b9cdc755
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
daemon.cpp
native/jni/core/daemon.cpp
+11
-7
No files found.
native/jni/core/daemon.cpp
View file @
82f8948f
...
...
@@ -146,8 +146,6 @@ shortcut:
close
(
client
);
}
static
void
magisk_logging
();
static
int
switch_cgroup
(
const
char
*
cgroup
,
int
pid
)
{
char
buf
[
32
];
snprintf
(
buf
,
sizeof
(
buf
),
"%s/cgroup.procs"
,
cgroup
);
...
...
@@ -163,7 +161,12 @@ static int switch_cgroup(const char *cgroup, int pid) {
return
0
;
}
static
void
magisk_logging
();
static
void
start_log_daemon
();
[[
noreturn
]]
static
void
daemon_entry
()
{
magisk_logging
();
// Block all signals
sigset_t
block_set
;
sigfillset
(
&
block_set
);
...
...
@@ -182,11 +185,11 @@ static int switch_cgroup(const char *cgroup, int pid) {
if
(
fd
>
STDERR_FILENO
)
close
(
fd
);
magisk_logging
();
setsid
();
setcon
(
"u:r:"
SEPOL_PROC_DOMAIN
":s0"
);
start_log_daemon
();
LOGI
(
NAME_WITH_VER
(
Magisk
)
" daemon started
\n
"
);
// Escape from cgroup
...
...
@@ -261,7 +264,6 @@ int connect_daemon(bool create) {
exit
(
1
);
}
LOGD
(
"client: launching new main daemon process
\n
"
);
if
(
fork_dont_care
()
==
0
)
{
close
(
fd
);
daemon_entry
();
...
...
@@ -415,14 +417,16 @@ static int magisk_log(int prio, const char *fmt, va_list ap) {
return
len
-
1
;
}
#define mlog(prio) [](auto fmt, auto ap){ return magisk_log(ANDROID_LOG_##prio, fmt, ap); }
static
void
magisk_logging
()
{
static
void
start_log_daemon
()
{
int
fds
[
2
];
if
(
socketpair
(
AF_UNIX
,
SOCK_STREAM
|
SOCK_CLOEXEC
,
0
,
fds
)
==
0
)
{
log_sockfd
=
fds
[
0
];
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
.
i
=
mlog
(
INFO
);
log_cb
.
w
=
mlog
(
WARN
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment