aniani/icecast-common
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-common.git synced 2024-12-04 14:46:31 -05:00
Code

Feature: Implemented routingclass ALL, ANY, and DEFAULT

Browse Source
This commit is contained in:
Philipp Schafft 2019-09-15 15:53:37 +00:00
parent 736180624c
commit 6e8d127bcb
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/igloo/logcore.h
View File

@ -36,9 +36,16 @@ extern "C" {
igloo_RO_FORWARD_TYPE(igloo_logcore_t); igloo_RO_FORWARD_TYPE(igloo_logcore_t);
typedef enum {
igloo_LOGCORE_CLASS_ANY,
igloo_LOGCORE_CLASS_ALL,
igloo_LOGCORE_CLASS_DEFAULT
} igloo_logcore_routingclass_t;
typedef struct { typedef struct {
char *id; char *id;
char *filename; char *filename;
igloo_logcore_routingclass_t routingclass;
ssize_t recent_limit; ssize_t recent_limit;
igloo_filter_t *filter; igloo_filter_t *filter;
igloo_objecthandler_t *formater; igloo_objecthandler_t *formater;

38
src/logcore.c
View File

@ -54,6 +54,7 @@ static int __copy_output(igloo_logcore_output_t *dst, const igloo_logcore_output
if (src->filename) if (src->filename)
dst->filename = strdup(src->filename); dst->filename = strdup(src->filename);
dst->recent_limit = src->recent_limit; dst->recent_limit = src->recent_limit;
dst->routingclass = src->routingclass;
igloo_ro_ref(dst->filter = src->filter); igloo_ro_ref(dst->filter = src->filter);
igloo_ro_ref(dst->formater = src->formater); igloo_ro_ref(dst->formater = src->formater);
@ -108,15 +109,17 @@ static void __free(igloo_ro_t self)
igloo_thread_rwlock_destroy(&(core->rwlock)); igloo_thread_rwlock_destroy(&(core->rwlock));
} }
static igloo_filter_result_t __push_msg(igloo_logcore_t *core, igloo_ro_t msg, int allow_askack) static igloo_filter_result_t __push_msg__output(igloo_logcore_t *core, igloo_ro_t msg, igloo_logcore_routingclass_t routingclass)
{ {
igloo_filter_result_t ret = igloo_FILTER_RESULT_DROP; igloo_filter_result_t ret = igloo_FILTER_RESULT_DROP;
igloo_logmsg_t *logmsg;
size_t i; size_t i;
for (i = 0; i < core->output_length; i++) { for (i = 0; i < core->output_length; i++) {
igloo_filter_result_t push = igloo_FILTER_RESULT_PASS; igloo_filter_result_t push = igloo_FILTER_RESULT_PASS;
if (core->output[i].routingclass != routingclass)
continue;
if (core->output[i].filter) if (core->output[i].filter)
push = igloo_filter_test(core->output[i].filter, msg); push = igloo_filter_test(core->output[i].filter, msg);
@ -125,10 +128,37 @@ static igloo_filter_result_t __push_msg(igloo_logcore_t *core, igloo_ro_t msg, i
igloo_list_push(core->output_recent[i], msg); igloo_list_push(core->output_recent[i], msg);
if (push == igloo_FILTER_RESULT_PASS) if (push == igloo_FILTER_RESULT_PASS) {
ret = push; switch (routingclass) {
case igloo_LOGCORE_CLASS_ANY:
case igloo_LOGCORE_CLASS_DEFAULT:
return push;
break;
default:
ret = push;
break;
}
}
} }
return ret;
}
static igloo_filter_result_t __push_msg(igloo_logcore_t *core, igloo_ro_t msg, int allow_askack)
{
igloo_filter_result_t ret = igloo_FILTER_RESULT_DROP;
igloo_filter_result_t res;
igloo_logmsg_t *logmsg;
ret = __push_msg__output(core, msg, igloo_LOGCORE_CLASS_ANY);
if (ret != igloo_FILTER_RESULT_PASS)
ret = __push_msg__output(core, msg, igloo_LOGCORE_CLASS_DEFAULT);
res = __push_msg__output(core, msg, igloo_LOGCORE_CLASS_ALL);
if (res == igloo_FILTER_RESULT_PASS)
ret = igloo_FILTER_RESULT_PASS;
if (ret == igloo_FILTER_RESULT_PASS) if (ret == igloo_FILTER_RESULT_PASS)
igloo_list_push(core->global_recent, msg); igloo_list_push(core->global_recent, msg);