mirrors/vanilla
1
0
Fork 0
mirror of https://github.com/vanilla-wiiu/vanilla.git synced 2025-01-22 08:11:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add additional way to exit pipe

Browse source
This commit is contained in:
itsmattkc 2024-08-13 12:26:46 -07:00
parent 1cc823c8ba
commit 98ac4e9d71
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/backend.cpp
View file

@ -143,12 +143,8 @@ void BackendPipe::receivedData()
void BackendPipe::quit()
{
if (m_process) {
// FIXME: Currently, terminate() appears to fail because of pkexec permission issues. Will have to find a workaround...
printf("terminate\n");
m_process->terminate();
printf("wait for finished\n");
m_process->write(QByteArrayLiteral("QUIT\n"));
m_process->waitForFinished();
printf("delete later\n");
m_process->deleteLater();
m_process = nullptr;
}

36
pipe/linux/wpa.c
View file

@ -295,6 +295,26 @@ void sigint_handler(int signum)
signal(signum, SIG_DFL);
}
void *read_stdin(void *)
{
char *line = NULL;
size_t size = 0;
ssize_t read_size = 0;
while ((read_size = getline(&line, &size, stdin)) != -1) {
if (read_size == 0) {
continue;
}
line[read_size-1] = '\0';
if (!strcasecmp(line, "quit") || !strcasecmp(line, "exit") || !strcasecmp(line, "bye")) {
quit_loop();
}
}
return NULL;
}
int wpa_setup_environment(const char *wireless_interface, const char *wireless_conf_file, ready_callback_t callback, void *callback_data)
{
int ret = VANILLA_ERROR;
@ -305,6 +325,9 @@ int wpa_setup_environment(const char *wireless_interface, const char *wireless_c
signal(SIGTERM, sigint_handler);
//install_interrupt_handler();
pthread_t stdin_thread;
pthread_create(&stdin_thread, NULL, read_stdin, NULL);
// Check status of interface with NetworkManager
int is_managed = 0;
if (is_networkmanager_managing_device(wireless_interface, &is_managed) != VANILLA_SUCCESS) {
@ -365,6 +388,11 @@ die_and_reenable_managed:
}
die:
// Interrupt our stdin thread
signal(SIGINT, SIG_DFL);
signal(SIGTERM, SIG_DFL);
pthread_kill(stdin_thread, SIGINT);
// Remove our custom sigint signal handler
//uninstall_interrupt_handler();
@ -648,7 +676,7 @@ int call_ip(const char **argv)
return VANILLA_SUCCESS;
}
void *read_stdin_udp(void *data)
void *read_client_control(void *data)
{
int skt = open_socket(VANILLA_PIPE_CMD_SERVER_PORT);
uint32_t control_code;
@ -728,12 +756,12 @@ int do_connect(struct wpa_ctrl *ctrl, const char *wireless_interface)
pthread_mutex_init(&client_address_mutex, NULL);
pthread_cond_init(&client_address_waitcond, NULL);
pthread_t stdin_thread;
pthread_create(&stdin_thread, NULL, read_stdin_udp, NULL);
pthread_t client_control_thread;
pthread_create(&client_control_thread, NULL, read_client_control, NULL);
create_all_relays();
pthread_join(stdin_thread, NULL);
pthread_join(client_control_thread, NULL);
pthread_cond_destroy(&client_address_waitcond);
pthread_mutex_destroy(&client_address_mutex);