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

Updated submodules

Browse Source
This commit is contained in:
Philipp Schafft 2018-09-20 10:05:30 +00:00
parent 9a4491e43a
commit 231e60a46a
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common

@ -1 +1 @@
Subproject commit 09fb1ce13780543827013ebf52ef71c226484bd4 Subproject commit ad5fc1006122f42abd34ade3f42bf2779297140d

49
src/format.c
View File

@ -287,6 +287,37 @@ int format_advance_queue(source_t *source, client_t *client)
* calling functions will use a already freed client struct and * calling functions will use a already freed client struct and
* cause a segfault! * cause a segfault!
*/ */
static inline ssize_t __print_var(char *str, size_t remaining, const char *format, const char *first, const http_var_t *var)
{
size_t i;
ssize_t done = 0;
int ret;
for (i = 0; i < var->values; i++) {
ret = snprintf(str + done, remaining - done, format, first, var->value[i]);
if (ret == -1)
return -1;
done += ret;
}
return done;
}
static inline const char *__find_bitrate(const http_var_t *var)
{
size_t i;
const char *ret;
for (i = 0; i < var->values; i++) {
ret = strstr(var->value[i], "bitrate=");
if (ret)
return ret;
}
return NULL;
}
static int format_prepare_headers (source_t *source, client_t *client) static int format_prepare_headers (source_t *source, client_t *client)
{ {
size_t remaining; size_t remaining;
@ -337,11 +368,11 @@ static int format_prepare_headers (source_t *source, client_t *client)
if (!strcasecmp(var->name, "ice-audio-info")) if (!strcasecmp(var->name, "ice-audio-info"))
{ {
/* convert ice-audio-info to icy-br */ /* convert ice-audio-info to icy-br */
char *brfield = NULL; const char *brfield = NULL;
unsigned int bitrate; unsigned int bitrate;
if (bitrate_filtered == 0) if (bitrate_filtered == 0)
brfield = strstr(var->value, "bitrate="); brfield = __find_bitrate(var);
if (brfield && sscanf (brfield, "bitrate=%u", &bitrate)) if (brfield && sscanf (brfield, "bitrate=%u", &bitrate))
{ {
bytes = snprintf (ptr, remaining, "icy-br:%u\r\n", bitrate); bytes = snprintf (ptr, remaining, "icy-br:%u\r\n", bitrate);
@ -350,7 +381,7 @@ static int format_prepare_headers (source_t *source, client_t *client)
} }
else else
/* show ice-audio_info header as well because of relays */ /* show ice-audio_info header as well because of relays */
bytes = snprintf (ptr, remaining, "%s: %s\r\n", var->name, var->value); bytes = __print_var(ptr, remaining, "%s: %s\r\n", var->name, var);
} }
else else
{ {
@ -368,26 +399,24 @@ static int format_prepare_headers (source_t *source, client_t *client)
if (mountinfo && mountinfo->stream_name) if (mountinfo && mountinfo->stream_name)
bytes = snprintf (ptr, remaining, "icy-name:%s\r\n", mountinfo->stream_name); bytes = snprintf (ptr, remaining, "icy-name:%s\r\n", mountinfo->stream_name);
else else
bytes = snprintf (ptr, remaining, "icy-name:%s\r\n", var->value); bytes = __print_var(ptr, remaining, "icy-%s:%s\r\n", "name", var);
config_release_config(); config_release_config();
} }
else if (!strncasecmp("ice-", var->name, 4)) else if (!strncasecmp("ice-", var->name, 4))
{ {
if (!strcasecmp("ice-public", var->name)) if (!strcasecmp("ice-public", var->name))
bytes = snprintf (ptr, remaining, "icy-pub:%s\r\n", var->value); bytes = __print_var(ptr, remaining, "icy-%s:%s\r\n", "pub", var);
else else
if (!strcasecmp ("ice-bitrate", var->name)) if (!strcasecmp ("ice-bitrate", var->name))
bytes = snprintf (ptr, remaining, "icy-br:%s\r\n", var->value); bytes = __print_var(ptr, remaining, "icy-%s:%s\r\n", "br", var);
else else
bytes = snprintf (ptr, remaining, "icy%s:%s\r\n", bytes = __print_var(ptr, remaining, "icy%s:%s\r\n", var->name + 3, var);
var->name + 3, var->value);
} }
else else
if (!strncasecmp("icy-", var->name, 4)) if (!strncasecmp("icy-", var->name, 4))
{ {
bytes = snprintf (ptr, remaining, "icy%s:%s\r\n", bytes = __print_var(ptr, remaining, "icy%s:%s\r\n", var->name + 3, var);
var->name + 3, var->value);
} }
} }
} }