aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-01-03 14:56:34 -05:00
Code

Feature: Support <http-headers> in <listen-socket>

Browse Source 
Closes: #2359
This commit is contained in:
Philipp Schafft 2020-10-15 20:41:21 +00:00
parent 1c98b77aab
commit d245b0261b
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cfgfile.c
View File

@ -657,6 +657,7 @@ listener_t *config_clear_listener(listener_t *listener)
if (listener->bind_address) xmlFree(listener->bind_address); if (listener->bind_address) xmlFree(listener->bind_address);
if (listener->shoutcast_mount) xmlFree(listener->shoutcast_mount); if (listener->shoutcast_mount) xmlFree(listener->shoutcast_mount);
if (listener->authstack) auth_stack_release(listener->authstack); if (listener->authstack) auth_stack_release(listener->authstack);
if (listener->http_headers) config_clear_http_header(listener->http_headers);
free (listener); free (listener);
} }
return next; return next;
@ -1949,6 +1950,8 @@ static void _parse_listen_socket(xmlDocPtr doc,
__read_int(doc, node, &listener->listen_backlog, "<listen-backlog> must not be empty."); __read_int(doc, node, &listener->listen_backlog, "<listen-backlog> must not be empty.");
} else if (xmlStrcmp(node->name, XMLSTR("authentication")) == 0) { } else if (xmlStrcmp(node->name, XMLSTR("authentication")) == 0) {
_parse_authentication_node(node, &(listener->authstack)); _parse_authentication_node(node, &(listener->authstack));
} else if (xmlStrcmp(node->name, XMLSTR("http-headers")) == 0) {
config_parse_http_headers(node->xmlChildrenNode, &(listener->http_headers));
} }
} while ((node = node->next)); } while ((node = node->next));
@ -2733,6 +2736,8 @@ listener_t *config_copy_listener_one(const listener_t *listener) {
if (listener->authstack) { if (listener->authstack) {
auth_stack_addref(n->authstack = listener->authstack); auth_stack_addref(n->authstack = listener->authstack);
} }
if (listener->http_headers)
n->http_headers = config_copy_http_header(listener->http_headers);
return n; return n;
} }

2
src/cfgfile.h
View File

@ -173,6 +173,8 @@ typedef struct _listener_t {
char *shoutcast_mount; char *shoutcast_mount;
tlsmode_t tls; tlsmode_t tls;
auth_stack_t *authstack; auth_stack_t *authstack;
/* additional HTTP headers */
ice_config_http_header_t *http_headers;
} listener_t; } listener_t;
typedef struct _config_tls_context { typedef struct _config_tls_context {

9
src/util.c
View File

@ -52,6 +52,7 @@
#include "admin.h" #include "admin.h"
#include "auth.h" #include "auth.h"
#include "acl.h" #include "acl.h"
#include "listensocket.h"
#define CATMODULE "util" #define CATMODULE "util"
@ -698,6 +699,14 @@ static inline char * _build_headers(int status, const char *allow, ice_config_t
if (client && client->acl && (header = acl_get_http_headers(client->acl))) if (client && client->acl && (header = acl_get_http_headers(client->acl)))
_build_headers_loop(&ret, &len, header, status, allow, client); _build_headers_loop(&ret, &len, header, status, allow, client);
if (client && client->con && client->con->listensocket_effective) {
const listener_t * listener = listensocket_get_listener(client->con->listensocket_effective);
if ((header = listener->http_headers))
_build_headers_loop(&ret, &len, header, status, allow, client);
listensocket_release_listener(client->con->listensocket_effective);
}
return ret; return ret;
} }