mirrors/ympd
1
0
Fork 0
mirror of https://github.com/SuperBFG7/ympd synced 2025-07-07 04:12:52 +00:00
Code Issues Releases Wiki Activity

Fix: improve cleanup

Browse Source
This commit is contained in:
jcorporation 2019-01-28 21:01:14 +00:00
parent ff0e9bfd6d
commit fe887084fc
2 changed files with 89 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
src/main.c
View File

@ -164,9 +164,34 @@ static int inihandler(void *user, const char *section, const char *name, const c
return 1; return 1;
} }
static void free_config(t_config *config) {
free(config->mpdhost);
free(config->mpdpass);
free(config->webport);
free(config->sslport);
free(config->sslcert);
free(config->sslkey);
free(config->user);
free(config->coverimagename);
free(config->taglist);
free(config->searchtaglist);
free(config->browsetaglist);
free(config->varlibdir);
free(config->etcdir);
free(config->streamurl);
free(config->backgroundcolor);
free(config);
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
s_signal_received = 0; s_signal_received = 0;
char testdirname[400]; char testdirname[400];
bool init_webserver = false;
bool init_thread_webserver = false;
bool init_thread_mpdclient = false;
bool init_thread_mympdapi = false;
int rc = EXIT_FAILURE;
mpd_client_queue = tiny_queue_create(); mpd_client_queue = tiny_queue_create();
mympd_api_queue = tiny_queue_create(); mympd_api_queue = tiny_queue_create();
web_server_queue = tiny_queue_create(); web_server_queue = tiny_queue_create();
@ -212,7 +237,7 @@ int main(int argc, char **argv) {
printf("Parsing config file: %s\n", argv[1]); printf("Parsing config file: %s\n", argv[1]);
if (ini_parse(argv[1], inihandler, config) < 0) { if (ini_parse(argv[1], inihandler, config) < 0) {
printf("Can't load config file \"%s\"\n", argv[1]); printf("Can't load config file \"%s\"\n", argv[1]);
return EXIT_FAILURE; goto cleanup;
} }
} }
else { else {
@ -224,7 +249,7 @@ int main(int argc, char **argv) {
MYMPD_VERSION, MYMPD_VERSION,
argv[0] argv[0]
); );
return EXIT_FAILURE; goto cleanup;
} }
#ifdef DEBUG #ifdef DEBUG
@ -242,7 +267,10 @@ int main(int argc, char **argv) {
//init webserver //init webserver
struct mg_mgr mgr; struct mg_mgr mgr;
if (!web_server_init(&mgr, config)) { if (!web_server_init(&mgr, config)) {
return EXIT_FAILURE; goto cleanup;
}
else {
init_webserver = true;
} }
//drop privileges //drop privileges
@ -250,33 +278,29 @@ int main(int argc, char **argv) {
printf("Droping privileges to %s\n", config->user); printf("Droping privileges to %s\n", config->user);
struct passwd *pw; struct passwd *pw;
if ((pw = getpwnam(config->user)) == NULL) { if ((pw = getpwnam(config->user)) == NULL) {
printf("getpwnam() failed, unknown user\n"); printf("ERROR: getpwnam() failed, unknown user\n");
web_server_free(&mgr); goto cleanup;
return EXIT_FAILURE;
} else if (setgroups(0, NULL) != 0) { } else if (setgroups(0, NULL) != 0) {
printf("setgroups() failed\n"); printf("ERROR: setgroups() failed\n");
web_server_free(&mgr); goto cleanup;
return EXIT_FAILURE;
} else if (setgid(pw->pw_gid) != 0) { } else if (setgid(pw->pw_gid) != 0) {
printf("setgid() failed\n"); printf("ERROR: setgid() failed\n");
web_server_free(&mgr); goto cleanup;
return EXIT_FAILURE;
} else if (setuid(pw->pw_uid) != 0) { } else if (setuid(pw->pw_uid) != 0) {
printf("setuid() failed\n"); printf("ERROR: setuid() failed\n");
web_server_free(&mgr); goto cleanup;
return EXIT_FAILURE;
} }
} }
if (getuid() == 0) { if (getuid() == 0) {
printf("myMPD should not be run with root privileges\n"); printf("myMPD should not be run with root privileges\n");
web_server_free(&mgr); goto cleanup;
return EXIT_FAILURE;
} }
//check needed directories //check needed directories
if (!testdir("Document root", DOC_ROOT)) if (!testdir("Document root", DOC_ROOT)) {
return EXIT_FAILURE; goto cleanup;
}
snprintf(testdirname, 400, "%s/library", DOC_ROOT); snprintf(testdirname, 400, "%s/library", DOC_ROOT);
if (!testdir("Link to mpd music_directory", testdirname)) { if (!testdir("Link to mpd music_directory", testdirname)) {
@ -285,54 +309,66 @@ int main(int argc, char **argv) {
} }
snprintf(testdirname, 400, "%s/tmp", config->varlibdir); snprintf(testdirname, 400, "%s/tmp", config->varlibdir);
if (!testdir("Temp dir", testdirname)) if (!testdir("Temp dir", testdirname)) {
return EXIT_FAILURE; goto cleanup;
}
snprintf(testdirname, 400, "%s/smartpls", config->varlibdir); snprintf(testdirname, 400, "%s/smartpls", config->varlibdir);
if (!testdir("Smartpls dir", testdirname)) if (!testdir("Smartpls dir", testdirname)) {
return EXIT_FAILURE; goto cleanup;
}
snprintf(testdirname, 400, "%s/state", config->varlibdir); snprintf(testdirname, 400, "%s/state", config->varlibdir);
if (!testdir("State dir", testdirname)) if (!testdir("State dir", testdirname)) {
return EXIT_FAILURE; goto cleanup;
}
//Create working threads //Create working threads
pthread_t mpd_client_thread, web_server_thread, mympd_api_thread; pthread_t mpd_client_thread, web_server_thread, mympd_api_thread;
//mpd connection //mpd connection
pthread_create(&mpd_client_thread, NULL, mpd_client_loop, config); if (pthread_create(&mpd_client_thread, NULL, mpd_client_loop, config) == 0) {
pthread_setname_np(mpd_client_thread, "mympd_mpdclient"); pthread_setname_np(mpd_client_thread, "mympd_mpdclient");
init_thread_mpdclient = true;
}
else {
printf("ERROR: can't create mympd_client thread\n");
s_signal_received = SIGTERM;
}
//webserver //webserver
pthread_create(&web_server_thread, NULL, web_server_loop, &mgr); if (pthread_create(&web_server_thread, NULL, web_server_loop, &mgr) == 0) {
pthread_setname_np(web_server_thread, "mympd_webserver"); pthread_setname_np(web_server_thread, "mympd_webserver");
init_thread_webserver = true;
}
else {
printf("ERROR: can't create mympd_webserver thread\n");
s_signal_received = SIGTERM;
}
//mympd api //mympd api
pthread_create(&mympd_api_thread, NULL, mympd_api_loop, config); if (pthread_create(&mympd_api_thread, NULL, mympd_api_loop, config) == 0) {
pthread_setname_np(mympd_api_thread, "mympd_mympdapi"); pthread_setname_np(mympd_api_thread, "mympd_mympdapi");
init_thread_mympdapi = true;
}
else {
printf("ERROR: can't create mympd_mympdapi thread\n");
s_signal_received = SIGTERM;
}
//Outsourced all work to separate threads, do nothing... //Outsourced all work to separate threads, do nothing...
rc = EXIT_SUCCESS;
//cleanup //Try to cleanup all
pthread_join(mpd_client_thread, NULL); cleanup:
pthread_join(web_server_thread, NULL); if (init_thread_mpdclient)
pthread_join(mympd_api_thread, NULL); pthread_join(mpd_client_thread, NULL);
if (init_thread_webserver)
pthread_join(web_server_thread, NULL);
if (init_thread_mympdapi)
pthread_join(mympd_api_thread, NULL);
if (init_webserver)
web_server_free(&mgr);
tiny_queue_free(web_server_queue); tiny_queue_free(web_server_queue);
tiny_queue_free(mpd_client_queue); tiny_queue_free(mpd_client_queue);
tiny_queue_free(mympd_api_queue); tiny_queue_free(mympd_api_queue);
free(config->mpdhost); free_config(config);
free(config->mpdpass); return rc;
free(config->webport);
free(config->sslport);
free(config->sslcert);
free(config->sslkey);
free(config->user);
free(config->coverimagename);
free(config->taglist);
free(config->searchtaglist);
free(config->browsetaglist);
free(config->varlibdir);
free(config->etcdir);
free(config->streamurl);
free(config->backgroundcolor);
free(config);
return EXIT_SUCCESS;
} }

1
src/web_server.c
View File

@ -122,7 +122,6 @@ void *web_server_loop(void *arg_mgr) {
} }
// } // }
} }
mg_mgr_free(mgr);
return NULL; return NULL;
} }