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

Fix relaying. Oops.

Browse Source 
svn path=/trunk/icecast/; revision=4328
This commit is contained in:
Michael Smith 2003-02-07 11:46:03 +00:00
parent e3bb942ed9
commit 8600634e68
1 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/slave.c
View File

@ -51,7 +51,8 @@ static int _initialized = 0;
void slave_initialize(void) { void slave_initialize(void) {
if (_initialized) return; if (_initialized) return;
/* Don't create a slave thread if it isn't configured */ /* Don't create a slave thread if it isn't configured */
if (config_get_config()->master_server == NULL) if (config_get_config()->master_server == NULL &&
config_get_config()->relay == NULL)
return; return;
_initialized = 1; _initialized = 1;
@ -129,44 +130,47 @@ static void *_slave_thread(void *arg) {
else else
interval = 0; interval = 0;
mastersock = sock_connect_wto(config_get_config()->master_server, config_get_config()->master_server_port, 0); if(config_get_config()->master_server != NULL) {
if (mastersock == SOCK_ERROR) { mastersock = sock_connect_wto(config_get_config()->master_server,
WARN0("Relay slave failed to contact master server to fetch stream list"); config_get_config()->master_server_port, 0);
continue; if (mastersock == SOCK_ERROR) {
} WARN0("Relay slave failed to contact master server to fetch stream list");
continue;
}
len = strlen(username) + strlen(password) + 1; len = strlen(username) + strlen(password) + 1;
authheader = malloc(len+1); authheader = malloc(len+1);
strcpy(authheader, username); strcpy(authheader, username);
strcat(authheader, ":"); strcat(authheader, ":");
strcat(authheader, password); strcat(authheader, password);
data = util_base64_encode(authheader); data = util_base64_encode(authheader);
sock_write(mastersock, sock_write(mastersock,
"GET /admin/streamlist HTTP/1.0\r\n" "GET /admin/streamlist HTTP/1.0\r\n"
"Authorization: Basic %s\r\n" "Authorization: Basic %s\r\n"
"\r\n", data); "\r\n", data);
free(authheader); free(authheader);
free(data); free(data);
while (sock_read_line(mastersock, buf, sizeof(buf))) { while (sock_read_line(mastersock, buf, sizeof(buf))) {
if(!strlen(buf)) if(!strlen(buf))
break; break;
}
while (sock_read_line(mastersock, buf, sizeof(buf))) {
avl_tree_rlock(global.source_tree);
if (!source_find_mount(buf)) {
avl_tree_unlock(global.source_tree);
create_relay_stream(
config_get_config()->master_server,
config_get_config()->master_server_port,
buf);
}
else
avl_tree_unlock(global.source_tree);
}
sock_close(mastersock);
} }
while (sock_read_line(mastersock, buf, sizeof(buf))) {
avl_tree_rlock(global.source_tree);
if (!source_find_mount(buf)) {
avl_tree_unlock(global.source_tree);
create_relay_stream(
config_get_config()->master_server,
config_get_config()->master_server_port,
buf);
}
else
avl_tree_unlock(global.source_tree);
}
sock_close(mastersock);
/* And now, we process the individual mounts... */ /* And now, we process the individual mounts... */
relay_server *relay = config_get_config()->relay; relay_server *relay = config_get_config()->relay;
while(relay) { while(relay) {
@ -178,6 +182,7 @@ static void *_slave_thread(void *arg) {
} }
else else
avl_tree_unlock(global.source_tree); avl_tree_unlock(global.source_tree);
relay = relay->next;
} }
} }
thread_exit(0); thread_exit(0);