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

Update: Converted whether or not to show listeners in stats to a flag

Browse Source
This commit is contained in:
Philipp Schafft 2020-10-09 16:01:24 +00:00
parent 5eb09ca5de
commit 114a8b6b88
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/admin.c
View File

@ -1186,12 +1186,13 @@ static void command_shoutcast_metadata(client_t *client,
static void command_stats(client_t *client, source_t *source, admin_format_t response) static void command_stats(client_t *client, source_t *source, admin_format_t response)
{ {
unsigned int flags = (source) ? STATS_XML_FLAG_SHOW_HIDDEN|STATS_XML_FLAG_SHOW_LISTENERS : STATS_XML_FLAG_SHOW_HIDDEN;
const char *mount = (source) ? source->mount : NULL; const char *mount = (source) ? source->mount : NULL;
xmlDocPtr doc; xmlDocPtr doc;
ICECAST_LOG_DEBUG("Stats request, sending xml stats"); ICECAST_LOG_DEBUG("Stats request, sending xml stats");
doc = stats_get_xml(STATS_XML_FLAG_SHOW_HIDDEN, mount, client); doc = stats_get_xml(flags, mount, client);
admin_send_response(doc, client, response, STATS_HTML_REQUEST); admin_send_response(doc, client, response, STATS_HTML_REQUEST);
xmlFreeDoc(doc); xmlFreeDoc(doc);
return; return;

16
src/stats.c
View File

@ -838,7 +838,8 @@ static inline void __add_authstack (auth_stack_t *stack, xmlNodePtr parent) {
auth_stack_next(&stack); auth_stack_next(&stack);
} }
} }
static xmlNodePtr _dump_stats_to_doc (xmlNodePtr root, const char *show_mount, int hidden, client_t *client) { static xmlNodePtr _dump_stats_to_doc (xmlNodePtr root, unsigned int flags, const char *show_mount, client_t *client) {
int hidden = flags & STATS_XML_FLAG_SHOW_HIDDEN ? 1 : 0;
avl_node *avlnode; avl_node *avlnode;
xmlNodePtr ret = NULL; xmlNodePtr ret = NULL;
ice_config_t *config; ice_config_t *config;
@ -906,6 +907,9 @@ static xmlNodePtr _dump_stats_to_doc (xmlNodePtr root, const char *show_mount, i
if (source_real->running) if (source_real->running)
xmlNewTextChild(xmlnode, NULL, XMLSTR("content-type"), XMLSTR(source_real->format->contenttype)); xmlNewTextChild(xmlnode, NULL, XMLSTR("content-type"), XMLSTR(source_real->format->contenttype));
if (flags & STATS_XML_FLAG_SHOW_LISTENERS)
admin_add_listeners_to_mount(source_real, xmlnode, client->mode);
} }
avl_tree_unlock(global.source_tree); avl_tree_unlock(global.source_tree);
@ -1087,7 +1091,6 @@ xmlDocPtr stats_get_xml(unsigned int flags, const char *show_mount, client_t *cl
xmlDocPtr doc; xmlDocPtr doc;
xmlNodePtr node; xmlNodePtr node;
xmlNodePtr modules; xmlNodePtr modules;
source_t * source;
doc = xmlNewDoc (XMLSTR("1.0")); doc = xmlNewDoc (XMLSTR("1.0"));
node = xmlNewDocNode (doc, NULL, XMLSTR("icestats"), NULL); node = xmlNewDocNode (doc, NULL, XMLSTR("icestats"), NULL);
@ -1096,14 +1099,7 @@ xmlDocPtr stats_get_xml(unsigned int flags, const char *show_mount, client_t *cl
modules = module_container_get_modulelist_as_xml(global.modulecontainer); modules = module_container_get_modulelist_as_xml(global.modulecontainer);
xmlAddChild(node, modules); xmlAddChild(node, modules);
node = _dump_stats_to_doc(node, show_mount, flags & STATS_XML_FLAG_SHOW_HIDDEN ? 1 : 0, client); node = _dump_stats_to_doc(node, flags, show_mount, client);
if (show_mount && node) {
avl_tree_rlock(global.source_tree);
source = source_find_mount_raw(show_mount);
admin_add_listeners_to_mount(source, node, client->mode);
avl_tree_unlock(global.source_tree);
}
return doc; return doc;
} }

5
src/stats.h
View File

@ -21,8 +21,9 @@
#include "icecasttypes.h" #include "icecasttypes.h"
#include "refbuf.h" #include "refbuf.h"
#define STATS_XML_FLAG_NONE 0x0000U #define STATS_XML_FLAG_NONE 0x0000U
#define STATS_XML_FLAG_SHOW_HIDDEN 0x0001U #define STATS_XML_FLAG_SHOW_HIDDEN 0x0001U
#define STATS_XML_FLAG_SHOW_LISTENERS 0x0002U
typedef struct _stats_node_tag typedef struct _stats_node_tag
{ {