aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

avoid compiler warnings; send /message/ in case of 403.

Browse Source 
svn path=/icecast/trunk/icecast/; revision=18650
This commit is contained in:
Philipp Schafft 2012-10-11 22:49:57 +00:00
parent 61c9def238
commit 27ba19f014
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/client.c
View File

@ -182,7 +182,7 @@ int client_read_bytes (client_t *client, void *buf, unsigned len)
return bytes; return bytes;
} }
static void client_send_error0(client_t *client, int status, int plain, char *message) static void client_send_error(client_t *client, int status, int plain, const char *message)
{ {
ssize_t ret; ssize_t ret;
@ -201,24 +201,24 @@ static void client_send_error0(client_t *client, int status, int plain, char *me
fserve_add_client (client, NULL); fserve_add_client (client, NULL);
} }
void client_send_400(client_t *client, char *message) void client_send_400(client_t *client, const char *message)
{ {
client_send_error0(client, 400, 0, message); client_send_error(client, 400, 0, message);
} }
void client_send_404(client_t *client, char *message) void client_send_404(client_t *client, const char *message)
{ {
client_send_error0(client, 404, 0, message); client_send_error(client, 404, 0, message);
} }
void client_send_401(client_t *client) void client_send_401(client_t *client)
{ {
client_send_error0(client, 401, 1, "You need to authenticate\r\n"); client_send_error(client, 401, 1, "You need to authenticate\r\n");
} }
void client_send_403(client_t *client, const char *reason) void client_send_403(client_t *client, const char *message)
{ {
client_send_error0(client, 403, 1, "Forbidden"); client_send_error(client, 403, 1, message);
} }

7
src/client.h
View File

@ -69,11 +69,10 @@ typedef struct _client_tag
int client_create (client_t **c_ptr, connection_t *con, http_parser_t *parser); int client_create (client_t **c_ptr, connection_t *con, http_parser_t *parser);
void client_destroy(client_t *client); void client_destroy(client_t *client);
void client_send_504(client_t *client, char *message); void client_send_404(client_t *client, const char *message);
void client_send_404(client_t *client, char *message);
void client_send_401(client_t *client); void client_send_401(client_t *client);
void client_send_403(client_t *client, const char *reason); void client_send_403(client_t *client, const char *message);
void client_send_400(client_t *client, char *message); void client_send_400(client_t *client, const char *message);
int client_send_bytes (client_t *client, const void *buf, unsigned len); int client_send_bytes (client_t *client, const void *buf, unsigned len);
int client_read_bytes (client_t *client, void *buf, unsigned len); int client_read_bytes (client_t *client, void *buf, unsigned len);
void client_set_queue (client_t *client, refbuf_t *refbuf); void client_set_queue (client_t *client, refbuf_t *refbuf);

4
src/format_mp3.c
View File

@ -293,9 +293,9 @@ static void mp3_set_title (source_t *source)
if (source_mp3->inline_url) if (source_mp3->inline_url)
{ {
char *end = strstr (source_mp3->inline_url, "';"); char *end = strstr (source_mp3->inline_url, "';");
int urllen = size; ssize_t urllen = size;
if (end) urllen = end - source_mp3->inline_url + 2; if (end) urllen = end - source_mp3->inline_url + 2;
if (size-r > urllen) if ((ssize_t)(size-r) > urllen)
snprintf (p->data+r, size-r, "StreamUrl='%s';", source_mp3->inline_url+11); snprintf (p->data+r, size-r, "StreamUrl='%s';", source_mp3->inline_url+11);
} }
else if (source_mp3->url) else if (source_mp3->url)

4
src/main.c
View File

@ -394,14 +394,14 @@ static void _ch_root_uid_setup(void)
return; return;
} }
if(gid != -1) { if(gid != (gid_t)-1) {
if(!setgid(gid)) if(!setgid(gid))
fprintf(stdout, "Changed groupid to %i.\n", (int)gid); fprintf(stdout, "Changed groupid to %i.\n", (int)gid);
else else
fprintf(stdout, "Error changing groupid: %s.\n", strerror(errno)); fprintf(stdout, "Error changing groupid: %s.\n", strerror(errno));
} }
if(uid != -1) { if(uid != (uid_t)-1) {
if(!setuid(uid)) if(!setuid(uid))
fprintf(stdout, "Changed userid to %i.\n", (int)uid); fprintf(stdout, "Changed userid to %i.\n", (int)uid);
else else

2
src/sighandler.c
View File

@ -54,6 +54,8 @@ void _sig_ignore(int signo)
void _sig_hup(int signo) void _sig_hup(int signo)
{ {
INFO1("Caught signal %d, scheduling config re-read...", signo);
global_lock(); global_lock();
global . schedule_config_reread = 1; global . schedule_config_reread = 1;
global_unlock(); global_unlock();