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: Announce server-instance in URL events and auth

Browse Source
This commit is contained in:
Philipp Schafft 2023-02-27 02:06:27 +00:00
parent d7f401e36c
commit 44566499ef
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/auth_url.c
View File

@ -73,6 +73,7 @@
#include "source.h"
#include "client.h"
#include "cfgfile.h"
#include "global.h"
#include "connection.h"
#include "common/httpp/httpp.h"
@ -334,7 +335,8 @@ static auth_result url_remove_client(auth_client *auth_user)
char *username,
*password,
*mount,
*server;
*server,
*server_instance;
const char *mountreq;
ice_config_t *config;
int port;
@ -352,6 +354,7 @@ static auth_result url_remove_client(auth_client *auth_user)
server = util_url_escape(config->hostname);
port = config->port;
config_release_config();
server_instance = util_url_escape(global_instance_uuid());
agent = httpp_getvar(client->parser, "user-agent");
if (agent) {
@ -380,12 +383,13 @@ static auth_result url_remove_client(auth_client *auth_user)
ipaddr = util_url_escape(client->con->ip);
ret = snprintf(post, sizeof(post),
"action=%s&server=%s&port=%d&client=%lu&mount=%s"
"action=%s&server=%s&port=%d&server-instance=%s&client=%lu&mount=%s"
"&user=%s&pass=%s&duration=%lu&ip=%s&agent=%s",
url->removeaction, /* already escaped */
server, port, client->con->id, mount, username,
server, port, server_instance, client->con->id, mount, username,
password, (long unsigned)duration, ipaddr, user_agent);
free(server_instance);
free(server);
free(mount);
free(username);
@ -448,7 +452,8 @@ static auth_result url_add_client(auth_client *auth_user)
const char *mountreq;
char *mount,
*ipaddr,
*server;
*server,
*server_instance;
ice_config_t *config;
char *userpwd = NULL, post [4096];
ssize_t post_offset;
@ -465,6 +470,7 @@ static auth_result url_add_client(auth_client *auth_user)
server = util_url_escape(config->hostname);
port = config->port;
config_release_config();
server_instance = util_url_escape(global_instance_uuid());
agent = httpp_getvar(client->parser, "user-agent");
if (agent) {
@ -493,12 +499,13 @@ static auth_result url_add_client(auth_client *auth_user)
ipaddr = util_url_escape(client->con->ip);
post_offset = snprintf(post, sizeof (post),
"action=%s&server=%s&port=%d&client=%lu&mount=%s"
"action=%s&server=%s&port=%d&server-instance=%s&client=%lu&mount=%s"
"&user=%s&pass=%s&ip=%s&agent=%s",
url->addaction, /* already escaped */
server, port, client->con->id, mount, username,
server, port, server_instance, client->con->id, mount, username,
password, ipaddr, user_agent);
free(server_instance);
free(server);
free(mount);
free(user_agent);

2
src/event_url.c
View File

@ -88,6 +88,8 @@ static int event_url_emit(void *state, event_t *event) {
}
config_release_config();
string_renderer_add_kv_with_options(renderer, "server-instance", global_instance_uuid(), STRING_RENDERER_ENCODING_PLAIN, false, false);
string_renderer_end_list(renderer);