Skip to content

Commit f356808

Browse files
committed
remove: non-working info in zygisk-ptraceXX info response
This commit removes information given in the response of info command of "zygisk-ptrace64" or "zygisk-ptrace32" that leads to failing builds, as it is not exported from monitor.cpp.
1 parent b1d118d commit f356808

2 files changed

Lines changed: 0 additions & 105 deletions

File tree

loader/src/ptracer/main.cpp

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -82,39 +82,6 @@ int main(int argc, char **argv) {
8282
}
8383
}
8484

85-
#ifdef __LP64__
86-
printf("Daemon64 running: %d\n", status64.daemon_running);
87-
printf("Zygote64 injected: %s\n", status64.zygote_injected ? "yes" : "no");
88-
#else
89-
printf("Daemon32 running: %s\n", status32.daemon_running ? "yes" : "no");
90-
printf("Zygote32 injected: %s\n", status32.zygote_injected ? "yes" : "no");
91-
#endif
92-
93-
switch (tracing_state) {
94-
case TRACING: {
95-
printf("Tracing state: TRACING\n");
96-
97-
break;
98-
}
99-
case STOPPING: {
100-
printf("Tracing state: STOPPING\n");
101-
printf("Stop reason: %s\n", monitor_stop_reason);
102-
103-
break;
104-
}
105-
case STOPPED: {
106-
printf("Tracing state: STOPPED\n");
107-
printf("Stop reason: %s\n", monitor_stop_reason);
108-
109-
break;
110-
}
111-
case EXITING: {
112-
printf("Tracing state: EXITING\n");
113-
114-
break;
115-
}
116-
}
117-
11885
if (info.modules->modules_count != 0) {
11986
printf("Modules: %zu\n", info.modules->modules_count);
12087

loader/src/ptracer/monitor.cpp

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -744,77 +744,6 @@ static void updateStatus() {
744744
fprintf(prop, "%s[%s] %s", pre_section, status_text, post_section);
745745

746746
fclose(prop);
747-
748-
struct zygote_info info;
749-
zygiskd::GetInfo(&info);
750-
751-
/* TODO: Perhaps change to binary reading and writing? */
752-
FILE *fd_state = fopen("/data/adb/rezygisk/state.json", "w");
753-
if (fd_state == NULL) {
754-
PLOGE("failed to open state.json");
755-
756-
return;
757-
}
758-
759-
fprintf(fd_state, "{\n"
760-
" \"tracing_state\": %d,\n"
761-
" \"status64\": {\n"
762-
" \"supported\": %d,\n"
763-
" \"zygote_injected\": %d,\n"
764-
" \"daemon_running\": %d,\n"
765-
" \"daemon_pid\": %d,\n"
766-
" \"daemon_info\": \"%s\",\n"
767-
" \"daemon_error_info\": \"%s\"\n"
768-
" },\n"
769-
" \"status32\": {\n"
770-
" \"supported\": %d,\n"
771-
" \"zygote_injected\": %d,\n"
772-
" \"daemon_running\": %d,\n"
773-
" \"daemon_pid\": %d,\n"
774-
" \"daemon_info\": \"%s\",\n"
775-
" \"daemon_error_info\": \"%s\"\n"
776-
" },\n"
777-
" \"modules_info\": {\n"
778-
" \"amount\": %d,\n",
779-
tracing_state,
780-
781-
status64.supported,
782-
status64.zygote_injected,
783-
status64.daemon_running,
784-
status64.daemon_pid,
785-
status64.daemon_info,
786-
status64.daemon_error_info,
787-
788-
status32.supported,
789-
status32.zygote_injected,
790-
status32.daemon_running,
791-
status32.daemon_pid,
792-
status32.daemon_info,
793-
status32.daemon_error_info,
794-
795-
info.modules->modules_count);
796-
797-
if (info.modules->modules_count != 0) {
798-
fprintf(fd_state, " \"modules\": [\n");
799-
800-
for (int i = 0; i < info.modules->modules_count; i++) {
801-
fprintf(fd_state, " \"%s\"%s\n",
802-
info.modules->modules[i],
803-
i == info.modules->modules_count - 1 ? "" : ",");
804-
805-
free(info.modules->modules[i]);
806-
}
807-
808-
fprintf(fd_state, " ]\n");
809-
810-
free(info.modules->modules);
811-
} else {
812-
fprintf(fd_state, " \"modules\": []\n");
813-
}
814-
815-
fprintf(fd_state, "}\n");
816-
817-
fclose(fd_state);
818747
}
819748

820749
static bool prepare_environment() {
@@ -850,7 +779,6 @@ static bool prepare_environment() {
850779

851780
/* TODO: See if ZYGISK_ENABLED flag is already set,
852781
if so, set a status saying to disable built-in Zygisk. */
853-
A
854782
updateStatus();
855783

856784
return true;

0 commit comments

Comments
 (0)