aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

make sure YP entries are flushed out when a source stops. Avoid

Browse Source 
segv on failed icecast startup and add some log messages.

svn path=/icecast/trunk/icecast/; revision=6807
This commit is contained in:
Karl Heyes 2004-06-02 19:34:14 +00:00
parent fcef29c60a
commit fe2a763e9e
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/yp.c
View File

@ -30,10 +30,10 @@
#include "cfgfile.h" #include "cfgfile.h"
#include "stats.h" #include "stats.h"
#include <curl/curl.h> #include <curl/curl.h>
#ifdef WIN32 #ifdef WIN32
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#define CATMODULE "yp" #define CATMODULE "yp"
@ -314,12 +314,12 @@ static unsigned do_yp_remove (ypdata_t *yp, char *s, unsigned len)
INFO1 ("clearing up YP entry for %s", yp->mount); INFO1 ("clearing up YP entry for %s", yp->mount);
send_to_yp ("remove", yp, s); send_to_yp ("remove", yp, s);
yp->remove = 1;
free (yp->sid); free (yp->sid);
yp->sid = NULL; yp->sid = NULL;
yp->process = do_yp_add;
yp_update = 1;
} }
yp_update = 1;
yp->remove = 1;
yp->process = do_yp_add;
return 0; return 0;
} }
@ -850,6 +850,7 @@ void yp_remove (const char *mount)
ypdata_t *yp = find_yp_mount (server, mount); ypdata_t *yp = find_yp_mount (server, mount);
if (yp) if (yp)
{ {
DEBUG2 ("mark %s on YP %s", mount, server->url);
yp->process = do_yp_remove; yp->process = do_yp_remove;
yp->next_update = 0; yp->next_update = 0;
} }
@ -888,7 +889,9 @@ void yp_shutdown ()
{ {
yp_running = 0; yp_running = 0;
yp_update = 1; yp_update = 1;
thread_join (yp_thread); if (yp_thread)
thread_join (yp_thread);
curl_global_cleanup(); curl_global_cleanup();
INFO0 ("YP thread down");
} }