aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-01-03 14:56:34 -05:00
Code

move the source client '200 OK' response to the source client specific part

Browse Source 
of the source thread, and rearrange stats around that

svn path=/trunk/icecast/; revision=5862
This commit is contained in:
Karl Heyes 2004-02-25 16:24:30 +00:00
parent c1bb9e983b
commit 7371d0ab21
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/connection.c
View File

@ -479,8 +479,6 @@ int connection_complete_source (source_t *source)
global.sources++;
global_unlock();
stats_event_inc(NULL, "sources");
stats_event_inc(NULL, "source_total_connections");
/* for relays, we don't yet have a client, however we do require one
* to retrieve the stream from. This is created here, quite late,
@ -490,8 +488,6 @@ int connection_complete_source (source_t *source)
if (source->client == NULL)
source->client = client_create (source->con, source->parser);
sock_set_blocking (source->con->sock, SOCK_NONBLOCK);
while (mountproxy)
{
if (strcmp (mountproxy->mountname, source->mount) == 0)

34
src/source.c
View File

@ -398,18 +398,10 @@ void *source_main(void *arg)
/* grab a read lock, to make sure we get a chance to cleanup */
thread_rwlock_rlock(source->shutdown_rwlock);
/* If we connected successfully, we can send the message (if requested)
* back
*/
if(source->send_return) {
source->client->respcode = 200;
bytes = sock_write(source->client->con->sock,
"HTTP/1.0 200 OK\r\n\r\n");
if(bytes > 0) source->client->con->sent_bytes = bytes;
}
/* start off the statistics */
source->listeners = 0;
stats_event_inc(NULL, "sources");
stats_event_inc(NULL, "source_total_connections");
stats_event(source->mount, "listeners", "0");
stats_event(source->mount, "type", source->format->format_description);
#ifdef USE_YP
@ -520,6 +512,7 @@ void *source_main(void *arg)
}
}
sock_set_blocking (source->con->sock, SOCK_NONBLOCK);
DEBUG0("Source creation complete");
source->running = 1;
@ -913,10 +906,25 @@ void source_apply_mount (source_t *source, mount_proxy *mountinfo)
void *source_client_thread (void *arg)
{
source_t *source = arg;
const char ok_msg[] = "HTTP/1.0 200 OK\r\n\r\n";
int bytes;
source->send_return = 1;
stats_event_inc(NULL, "source_client_connections");
source_main (source);
source->client->respcode = 200;
bytes = sock_write_bytes (source->client->con->sock, ok_msg, sizeof (ok_msg)-1);
if (bytes < sizeof (ok_msg)-1)
{
global_lock();
global.sources--;
global_unlock();
WARN0 ("Error writing 200 OK message to source client");
}
else
{
source->client->con->sent_bytes += bytes;
stats_event_inc(NULL, "source_client_connections");
source_main (source);
}
source_free_source (source);
return NULL;
}

1
src/source.h
View File

@ -53,7 +53,6 @@ typedef struct source_tag
long listeners;
long max_listeners;
int yp_public;
int send_return;
struct auth_tag *authenticator;
int fallback_override;
int no_mount;