Commit 6127fea4 authored by Ed "oddsock" Zaleski's avatar Ed "oddsock" Zaleski
Browse files

* fix bug of not using url decoding value when processing audio_info string

* we now process server name and description if we are not a public stream
* Added quality to status.xsl

svn path=/icecast/trunk/icecast/; revision=8131
parent e65325c5
...@@ -483,6 +483,7 @@ static void source_init (source_t *source) ...@@ -483,6 +483,7 @@ static void source_init (source_t *source)
ice_config_t *config = config_get_config(); ice_config_t *config = config_get_config();
char *listenurl, *str; char *listenurl, *str;
int listen_url_size; int listen_url_size;
char *s;
/* 6 for max size of port */ /* 6 for max size of port */
listen_url_size = strlen("http://") + strlen(config->hostname) + listen_url_size = strlen("http://") + strlen(config->hostname) +
...@@ -567,8 +568,22 @@ static void source_init (source_t *source) ...@@ -567,8 +568,22 @@ static void source_init (source_t *source)
avl_tree_unlock(global.source_tree); avl_tree_unlock(global.source_tree);
} }
if (source->yp_public) if (source->yp_public) {
yp_add (source); yp_add (source);
}
else {
/* If we are a private server, see if ic*-name and description
is provided, and if so, add them to the stats */
if ((s = httpp_getvar(source->parser, "ice-name"))) {
stats_event (source->mount, "server_name", s);
}
if ((s = httpp_getvar(source->parser, "icy-name"))) {
stats_event (source->mount, "server_name", s);
}
if ((s = httpp_getvar(source->parser, "ice-description"))) {
stats_event (source->mount, "server_description", s);
}
}
} }
...@@ -821,7 +836,7 @@ static void _parse_audio_info (source_t *source, const char *s) ...@@ -821,7 +836,7 @@ static void _parse_audio_info (source_t *source, const char *s)
if (esc) if (esc)
{ {
util_dict_set (source->audio_info, name, esc); util_dict_set (source->audio_info, name, esc);
stats_event (source->mount, name, value); stats_event (source->mount, name, esc);
free (esc); free (esc);
} }
} }
......
...@@ -34,6 +34,9 @@ ...@@ -34,6 +34,9 @@
<xsl:if test="bitrate"> <xsl:if test="bitrate">
<tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr> <tr><td>Bitrate:</td><td class="streamdata"> <xsl:value-of select="bitrate" /></td></tr>
</xsl:if> </xsl:if>
<xsl:if test="quality">
<tr><td>Quality:</td><td class="streamdata"> <xsl:value-of select="quality" /></td></tr>
</xsl:if>
<xsl:if test="listeners"> <xsl:if test="listeners">
<tr><td>Stream Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr> <tr><td>Stream Listeners:</td><td class="streamdata"> <xsl:value-of select="listeners" /></td></tr>
</xsl:if> </xsl:if>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment