Commit 3f76299e authored by Philipp Schafft's avatar Philipp Schafft 🦁

Merge branch 'feature-relay-improvements'

parents 75314c2b 1c619037
Pipeline #264 failed with stage
in 12 seconds
This diff is collapsed.
......@@ -173,6 +173,24 @@ typedef struct _config_tls_context {
char *cipher_list;
} config_tls_context_t;
typedef struct {
char *server;
int port;
char *mount;
char *username;
char *password;
char *bind;
int mp3metadata;
} relay_config_upstream_t;
typedef struct {
char *localmount;
int on_demand;
size_t upstreams;
relay_config_upstream_t *upstream;
relay_config_upstream_t upstream_default;
} relay_config_t;
struct ice_config_tag {
char *config_filename;
......@@ -219,7 +237,8 @@ struct ice_config_tag {
/* is TLS supported by the server? */
int tls_ok;
relay_server *relay;
size_t relay_length;
relay_config_t **relay;
mount_proxy *mounts;
......
......@@ -36,9 +36,9 @@ typedef struct ice_global_tag
avl_tree *source_tree;
/* for locally defined relays */
relay_server *relays;
relay_t *relays;
/* relays retrieved from master */
relay_server *master_relays;
relay_t *master_relays;
module_container_t *modulecontainer;
......
......@@ -90,7 +90,7 @@ typedef enum {
/* ---[ slave.[ch] ]--- */
typedef struct _relay_server relay_server;
typedef struct relay_tag relay_t;
/* ---[ module.[ch] ]--- */
......
This diff is collapsed.
......@@ -15,29 +15,13 @@
#include "common/thread/thread.h"
#include "icecasttypes.h"
struct _relay_server {
char *server;
int port;
char *mount;
char *username;
char *password;
char *localmount;
char *bind;
source_t *source;
int mp3metadata;
int on_demand;
int running;
int cleanup;
time_t start;
thread_type *thread;
relay_server *next;
};
#include "cfgfile.h"
void slave_initialize(void);
void slave_shutdown(void);
void slave_update_all_mounts (void);
void slave_rebuild_mounts (void);
relay_server *relay_free (relay_server *relay);
void relay_config_free (relay_config_t *relay);
relay_t *relay_free (relay_t *relay);
#endif /* __SLAVE_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment