Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
Icecast-Server
Commits
1a426f7f
Commit
1a426f7f
authored
Jun 29, 2018
by
Philipp Schafft
🦁
Browse files
Cleanup: Renamed *_TRANSFORMED* to *_HTML*
parent
c7910fb8
Pipeline
#236
passed with stage
in 45 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/admin.c
View file @
1a426f7f
...
...
@@ -67,34 +67,34 @@
#define COMMAND_ANY ADMIN_COMMAND_ANY
#define FALLBACK_RAW_REQUEST "fallbacks"
#define FALLBACK_
TRANSFORMED
_REQUEST "fallbacks.xsl"
#define FALLBACK_
HTML
_REQUEST
"fallbacks.xsl"
#define SHOUTCAST_METADATA_REQUEST "admin.cgi"
#define METADATA_RAW_REQUEST "metadata"
#define METADATA_
TRANSFORMED
_REQUEST "metadata.xsl"
#define METADATA_
HTML
_REQUEST
"metadata.xsl"
#define LISTCLIENTS_RAW_REQUEST "listclients"
#define LISTCLIENTS_
TRANSFORMED
_REQUEST "listclients.xsl"
#define LISTCLIENTS_
HTML
_REQUEST
"listclients.xsl"
#define STATS_RAW_REQUEST "stats"
#define STATS_
TRANSFORMED
_REQUEST "stats.xsl"
#define STATS_
HTML
_REQUEST
"stats.xsl"
#define QUEUE_RELOAD_RAW_REQUEST "reloadconfig"
#define QUEUE_RELOAD_
TRANSFORMED
_REQUEST "reloadconfig.xsl"
#define QUEUE_RELOAD_
HTML
_REQUEST
"reloadconfig.xsl"
#define LISTMOUNTS_RAW_REQUEST "listmounts"
#define LISTMOUNTS_
TRANSFORMED
_REQUEST "listmounts.xsl"
#define LISTMOUNTS_
HTML
_REQUEST
"listmounts.xsl"
#define STREAMLIST_RAW_REQUEST "streamlist"
#define STREAMLIST_
TRANSFORMED
_REQUEST "streamlist.xsl"
#define STREAMLIST_
HTML
_REQUEST
"streamlist.xsl"
#define STREAMLIST_PLAINTEXT_REQUEST "streamlist.txt"
#define MOVECLIENTS_RAW_REQUEST "moveclients"
#define MOVECLIENTS_
TRANSFORMED
_REQUEST "moveclients.xsl"
#define MOVECLIENTS_
HTML
_REQUEST
"moveclients.xsl"
#define KILLCLIENT_RAW_REQUEST "killclient"
#define KILLCLIENT_
TRANSFORMED
_REQUEST "killclient.xsl"
#define KILLCLIENT_
HTML
_REQUEST
"killclient.xsl"
#define KILLSOURCE_RAW_REQUEST "killsource"
#define KILLSOURCE_
TRANSFORMED
_REQUEST "killsource.xsl"
#define KILLSOURCE_
HTML
_REQUEST
"killsource.xsl"
#define ADMIN_XSL_RESPONSE "response.xsl"
#define MANAGEAUTH_RAW_REQUEST "manageauth"
#define MANAGEAUTH_
TRANSFORMED
_REQUEST "manageauth.xsl"
#define MANAGEAUTH_
HTML
_REQUEST
"manageauth.xsl"
#define UPDATEMETADATA_RAW_REQUEST "updatemetadata"
#define UPDATEMETADATA_
TRANSFORMED
_REQUEST "updatemetadata.xsl"
#define UPDATEMETADATA_
HTML
_REQUEST
"updatemetadata.xsl"
#define DEFAULT_RAW_REQUEST ""
#define DEFAULT_
TRANSFORMED
_REQUEST ""
#define DEFAULT_
HTML
_REQUEST
""
#define BUILDM3U_RAW_REQUEST "buildm3u"
typedef
struct
{
...
...
@@ -118,37 +118,37 @@ static void command_updatemetadata (client_t *client, source_t *source, adm
static
void
command_buildm3u
(
client_t
*
client
,
source_t
*
source
,
admin_format_t
response
);
static
const
admin_command_handler_t
handlers
[]
=
{
{
"*"
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
TRANSFORMED
,
NULL
},
/* for ACL framework */
{
FALLBACK_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_fallback
},
{
FALLBACK_
TRANSFORMED
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_fallback
},
{
METADATA_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_metadata
},
{
METADATA_
TRANSFORMED
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_metadata
},
{
SHOUTCAST_METADATA_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_shoutcast_metadata
},
{
LISTCLIENTS_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_show_listeners
},
{
LISTCLIENTS_
TRANSFORMED
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_show_listeners
},
{
STATS_RAW_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_RAW
,
command_stats
},
{
STATS_
TRANSFORMED
_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
TRANSFORMED
,
command_stats
},
{
"stats.xml"
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_RAW
,
command_stats
},
{
QUEUE_RELOAD_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_queue_reload
},
{
QUEUE_RELOAD_
TRANSFORMED
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
TRANSFORMED
,
command_queue_reload
},
{
LISTMOUNTS_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_list_mounts
},
{
LISTMOUNTS_
TRANSFORMED
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
TRANSFORMED
,
command_list_mounts
},
{
STREAMLIST_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_list_mounts
},
{
STREAMLIST_PLAINTEXT_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_PLAINTEXT
,
command_list_mounts
},
{
STREAMLIST_
TRANSFORMED
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
TRANSFORMED
,
command_list_mounts
},
{
MOVECLIENTS_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_move_clients
},
{
MOVECLIENTS_
TRANSFORMED
_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
TRANSFORMED
,
command_move_clients
},
{
KILLCLIENT_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_kill_client
},
{
KILLCLIENT_
TRANSFORMED
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_kill_client
},
{
KILLSOURCE_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_kill_source
},
{
KILLSOURCE_
TRANSFORMED
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_kill_source
},
{
MANAGEAUTH_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_manageauth
},
{
MANAGEAUTH_
TRANSFORMED
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
TRANSFORMED
,
command_manageauth
},
{
UPDATEMETADATA_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_updatemetadata
},
{
UPDATEMETADATA_
TRANSFORMED
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
TRANSFORMED
,
command_updatemetadata
},
{
BUILDM3U_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_buildm3u
},
{
DEFAULT_
TRANSFORMED
_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
TRANSFORMED
,
command_stats
},
{
DEFAULT_RAW_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
TRANSFORMED
,
command_stats
}
{
"*"
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
HTML
,
NULL
},
/* for ACL framework */
{
FALLBACK_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_fallback
},
{
FALLBACK_
HTML
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_fallback
},
{
METADATA_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_metadata
},
{
METADATA_
HTML
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_metadata
},
{
SHOUTCAST_METADATA_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_shoutcast_metadata
},
{
LISTCLIENTS_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_show_listeners
},
{
LISTCLIENTS_
HTML
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_show_listeners
},
{
STATS_RAW_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_RAW
,
command_stats
},
{
STATS_
HTML
_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
HTML
,
command_stats
},
{
"stats.xml"
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_RAW
,
command_stats
},
{
QUEUE_RELOAD_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_queue_reload
},
{
QUEUE_RELOAD_
HTML
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
HTML
,
command_queue_reload
},
{
LISTMOUNTS_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_list_mounts
},
{
LISTMOUNTS_
HTML
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
HTML
,
command_list_mounts
},
{
STREAMLIST_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_list_mounts
},
{
STREAMLIST_PLAINTEXT_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_PLAINTEXT
,
command_list_mounts
},
{
STREAMLIST_
HTML
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
HTML
,
command_list_mounts
},
{
MOVECLIENTS_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_move_clients
},
{
MOVECLIENTS_
HTML
_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
HTML
,
command_move_clients
},
{
KILLCLIENT_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_kill_client
},
{
KILLCLIENT_
HTML
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_kill_client
},
{
KILLSOURCE_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_kill_source
},
{
KILLSOURCE_
HTML
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_kill_source
},
{
MANAGEAUTH_RAW_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_RAW
,
command_manageauth
},
{
MANAGEAUTH_
HTML
_REQUEST
,
ADMINTYPE_GENERAL
,
ADMIN_FORMAT_
HTML
,
command_manageauth
},
{
UPDATEMETADATA_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_updatemetadata
},
{
UPDATEMETADATA_
HTML
_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_
HTML
,
command_updatemetadata
},
{
BUILDM3U_RAW_REQUEST
,
ADMINTYPE_MOUNT
,
ADMIN_FORMAT_RAW
,
command_buildm3u
},
{
DEFAULT_
HTML
_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
HTML
,
command_stats
},
{
DEFAULT_RAW_REQUEST
,
ADMINTYPE_HYBRID
,
ADMIN_FORMAT_
HTML
,
command_stats
}
};
static
admin_command_table_t
command_tables
[
ADMIN_MAX_COMMAND_TABLES
]
=
{
...
...
@@ -451,7 +451,7 @@ void admin_send_response(xmlDocPtr doc,
client
->
respcode
=
200
;
fserve_add_client
(
client
,
NULL
);
}
if
(
response
==
ADMIN_FORMAT_
TRANSFORMED
)
{
if
(
response
==
ADMIN_FORMAT_
HTML
)
{
char
*
fullpath_xslt_template
;
size_t
fullpath_xslt_template_len
;
ice_config_t
*
config
=
config_get_config
();
...
...
@@ -605,7 +605,7 @@ static void command_move_clients(client_t *client,
if
(
!
parameters_passed
)
{
doc
=
admin_build_sourcelist
(
source
->
mount
);
admin_send_response
(
doc
,
client
,
response
,
MOVECLIENTS_
TRANSFORMED
_REQUEST
);
MOVECLIENTS_
HTML
_REQUEST
);
xmlFreeDoc
(
doc
);
return
;
}
...
...
@@ -738,7 +738,7 @@ static void command_show_listeners(client_t *client,
admin_add_listeners_to_mount
(
source
,
srcnode
,
client
->
mode
);
admin_send_response
(
doc
,
client
,
response
,
LISTCLIENTS_
TRANSFORMED
_REQUEST
);
LISTCLIENTS_
HTML
_REQUEST
);
xmlFreeDoc
(
doc
);
}
...
...
@@ -914,7 +914,7 @@ static void command_manageauth(client_t *client, source_t *source, admin_format_
auth_release
(
auth
);
admin_send_response
(
doc
,
client
,
response
,
MANAGEAUTH_
TRANSFORMED
_REQUEST
);
MANAGEAUTH_
HTML
_REQUEST
);
free
(
message
);
xmlFreeDoc
(
doc
);
return
;
...
...
@@ -1132,7 +1132,7 @@ static void command_stats(client_t *client, source_t *source, admin_format_t res
ICECAST_LOG_DEBUG
(
"Stats request, sending xml stats"
);
doc
=
stats_get_xml
(
1
,
mount
,
client
->
mode
);
admin_send_response
(
doc
,
client
,
response
,
STATS_
TRANSFORMED
_REQUEST
);
admin_send_response
(
doc
,
client
,
response
,
STATS_
HTML
_REQUEST
);
xmlFreeDoc
(
doc
);
return
;
}
...
...
@@ -1186,7 +1186,7 @@ static void command_list_mounts(client_t *client, source_t *source, admin_format
avl_tree_unlock
(
global
.
source_tree
);
admin_send_response
(
doc
,
client
,
response
,
LISTMOUNTS_
TRANSFORMED
_REQUEST
);
LISTMOUNTS_
HTML
_REQUEST
);
xmlFreeDoc
(
doc
);
}
}
...
...
@@ -1205,6 +1205,6 @@ static void command_updatemetadata(client_t *client,
xmlDocSetRootElement
(
doc
,
node
);
admin_send_response
(
doc
,
client
,
response
,
UPDATEMETADATA_
TRANSFORMED
_REQUEST
);
UPDATEMETADATA_
HTML
_REQUEST
);
xmlFreeDoc
(
doc
);
}
src/client.c
View file @
1a426f7f
...
...
@@ -252,8 +252,8 @@ static inline void _client_send_error(client_t *client, const icecast_error_t *e
case
ADMIN_FORMAT_RAW
:
xslt
=
NULL
;
break
;
case
ADMIN_FORMAT_
TRANSFORMED
:
xslt
=
CLIENT_DEFAULT_ERROR_XSL_
TRANSFORMED
;
case
ADMIN_FORMAT_
HTML
:
xslt
=
CLIENT_DEFAULT_ERROR_XSL_
HTML
;
break
;
case
ADMIN_FORMAT_PLAINTEXT
:
xslt
=
CLIENT_DEFAULT_ERROR_XSL_PLAINTEXT
;
...
...
@@ -435,8 +435,8 @@ void client_send_reportxml(client_t *client, reportxml_t *report, document_domai
case
ADMIN_FORMAT_RAW
:
/* noop, we don't need to set xsl */
break
;
case
ADMIN_FORMAT_
TRANSFORMED
:
xsl
=
CLIENT_DEFAULT_REPORT_XSL_
TRANSFORMED
;
case
ADMIN_FORMAT_
HTML
:
xsl
=
CLIENT_DEFAULT_REPORT_XSL_
HTML
;
break
;
case
ADMIN_FORMAT_PLAINTEXT
:
xsl
=
CLIENT_DEFAULT_REPORT_XSL_PLAINTEXT
;
...
...
@@ -563,7 +563,7 @@ admin_format_t client_get_admin_format_by_content_negotiation(client_t *client)
if
(
strcmp
(
pref
,
"text/xml"
)
==
0
)
{
return
ADMIN_FORMAT_RAW
;
}
else
if
(
strcmp
(
pref
,
"text/html"
)
==
0
)
{
return
ADMIN_FORMAT_
TRANSFORMED
;
return
ADMIN_FORMAT_
HTML
;
}
else
if
(
strcmp
(
pref
,
"text/plain"
)
==
0
)
{
return
ADMIN_FORMAT_PLAINTEXT
;
}
else
{
...
...
src/client.h
View file @
1a426f7f
...
...
@@ -27,11 +27,11 @@
#include
"refbuf.h"
#include
"module.h"
#define CLIENT_DEFAULT_REPORT_XSL_
TRANSFORMED
"report-html.xsl"
#define CLIENT_DEFAULT_REPORT_XSL_
HTML
"report-html.xsl"
#define CLIENT_DEFAULT_REPORT_XSL_PLAINTEXT "report-plaintext.xsl"
#define CLIENT_DEFAULT_ERROR_XSL_
TRANSFORMED
"error-html.xsl"
#define CLIENT_DEFAULT_ERROR_XSL_
HTML
"error-html.xsl"
#define CLIENT_DEFAULT_ERROR_XSL_PLAINTEXT "error-plaintext.xsl"
#define CLIENT_DEFAULT_ADMIN_FORMAT ADMIN_FORMAT_
TRANSFORMED
#define CLIENT_DEFAULT_ADMIN_FORMAT ADMIN_FORMAT_
HTML
typedef
enum
_document_domain_tag
{
DOCUMENT_DOMAIN_WEB
,
...
...
src/fserve.c
View file @
1a426f7f
...
...
@@ -506,7 +506,7 @@ int fserve_client_create (client_t *httpclient, const char *path)
*
eol
=
'\0'
;
doc
=
stats_get_xml
(
0
,
reference
,
httpclient
->
mode
);
free
(
reference
);
admin_send_response
(
doc
,
httpclient
,
ADMIN_FORMAT_
TRANSFORMED
,
xslt_playlist_requested
);
admin_send_response
(
doc
,
httpclient
,
ADMIN_FORMAT_
HTML
,
xslt_playlist_requested
);
xmlFreeDoc
(
doc
);
free
(
fullpath
);
return
0
;
...
...
src/icecasttypes.h
View file @
1a426f7f
...
...
@@ -32,7 +32,7 @@ typedef int32_t admin_command_id_t;
typedef
enum
{
ADMIN_FORMAT_AUTO
,
ADMIN_FORMAT_RAW
,
ADMIN_FORMAT_
TRANSFORMED
,
ADMIN_FORMAT_
HTML
,
ADMIN_FORMAT_PLAINTEXT
}
admin_format_t
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment