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

Feature: Implemented DELETE on sources

Browse Source
This commit is contained in:
Philipp Schafft 2018-10-26 08:03:46 +00:00
parent ccca2460aa
commit 0bdad13fd2
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cfgfile.c
View File

@ -1101,7 +1101,7 @@ static void _parse_root(xmlDocPtr doc,
"legacy-global-source", "legacy-global-source",
AUTH_TYPE_STATIC, "source", AUTH_TYPE_STATIC, "source",
source_password, NULL, source_password, NULL,
"source,put,get", 0, "*"); "source,put,get,delete", 0, "*");
} }
} else { } else {
ICECAST_LOG_ERROR("Can not find nor create default mount, but " ICECAST_LOG_ERROR("Can not find nor create default mount, but "
@ -1990,7 +1990,7 @@ static void _parse_authentication(xmlDocPtr doc, xmlNodePtr node,
if (admin_password && admin_username) if (admin_password && admin_username)
__append_old_style_auth(&old_style, "legacy-admin", AUTH_TYPE_STATIC, __append_old_style_auth(&old_style, "legacy-admin", AUTH_TYPE_STATIC,
admin_username, admin_password, NULL, "get,post,head,stats,options", 1, "*"); admin_username, admin_password, NULL, "get,post,head,stats,options,delete", 1, "*");
if (relay_password && relay_username) if (relay_password && relay_username)
__append_old_style_auth(&old_style, "legacy-relay", AUTH_TYPE_STATIC, __append_old_style_auth(&old_style, "legacy-relay", AUTH_TYPE_STATIC,

18
src/connection.c
View File

@ -1066,6 +1066,21 @@ static void _handle_get_request(client_t *client) {
} }
} }
static void _handle_delete_request(client_t *client) {
source_t *source;
avl_tree_wlock(global.source_tree);
source = source_find_mount_raw(client->uri);
if (source) {
source->running = 0;
avl_tree_unlock(global.source_tree);
client_send_204(client);
} else {
avl_tree_unlock(global.source_tree);
client_send_error_by_id(client, ICECAST_ERROR_CON_UNKNOWN_REQUEST);
}
}
static void _handle_shoutcast_compatible(client_queue_t *node) static void _handle_shoutcast_compatible(client_queue_t *node)
{ {
char *http_compliant; char *http_compliant;
@ -1328,6 +1343,9 @@ static void _handle_authed_client(client_t *client, void *userdata, auth_result
case httpp_req_options: case httpp_req_options:
_handle_get_request(client); _handle_get_request(client);
break; break;
case httpp_req_delete:
_handle_delete_request(client);
break;
default: default:
ICECAST_LOG_ERROR("Wrong request type from client"); ICECAST_LOG_ERROR("Wrong request type from client");
client_send_error_by_id(client, ICECAST_ERROR_CON_UNKNOWN_REQUEST); client_send_error_by_id(client, ICECAST_ERROR_CON_UNKNOWN_REQUEST);