ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #24 fixed: Display server-side default filters on status page for clients

This commit is contained in:
Heikki Hannikainen 2013-12-18 23:43:59 +02:00
parent c34d707750
commit c9dc160ce4
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/accept.c
View File

@ -97,6 +97,9 @@ static void listener_free(struct listen_t *l)
if (l->filters[i])
hfree(l->filters[i]);
if (l->filter_s)
hfree(l->filter_s);
if (l->acl)
acl_free(l->acl);
@ -117,6 +120,8 @@ static void listener_free(struct listen_t *l)
static void listener_copy_filters(struct listen_t *l, struct listen_config_t *lc)
{
int i;
char filter_s[FILTER_S_SIZE] = "";
int filter_s_l = 0;
for (i = 0; i < (sizeof(l->filters)/sizeof(l->filters[0])); ++i) {
if (l->filters[i]) {
@ -124,9 +129,34 @@ static void listener_copy_filters(struct listen_t *l, struct listen_config_t *lc
l->filters[i] = NULL;
}
if (i < (sizeof(lc->filters)/sizeof(lc->filters[0])))
l->filters[i] = (lc->filters[i]) ? hstrdup(lc->filters[i]) : NULL;
if (i < (sizeof(lc->filters)/sizeof(lc->filters[0]))) {
if (!lc->filters[i])
continue;
l->filters[i] = hstrdup(lc->filters[i]);
int len = strlen(l->filters[i]);
if (filter_s_l + len + 2 < FILTER_S_SIZE) {
if (filter_s_l)
filter_s[filter_s_l++] = ' ';
memcpy(filter_s + filter_s_l, l->filters[i], len);
filter_s_l += len;
filter_s[filter_s_l] = 0;
}
}
}
if (l->filter_s) {
hfree(l->filter_s);
l->filter_s = NULL;
}
if (filter_s_l == 0)
return;
sanitize_ascii_string(filter_s);
l->filter_s = hstrdup(filter_s);
}
/*
@ -753,11 +783,14 @@ struct client_t *accept_client_for_listener(struct listen_t *l, int fd, char *ad
/* apply predefined filters */
for (i = 0; i < (sizeof(l->filters)/sizeof(l->filters[0])); ++i) {
if (l->filters[i])
if (l->filters[i]) {
if (filter_parse(c, l->filters[i], 0) < 0) { /* system filters */
hlog(LOG_ERR, "Bad system filter definition: %s", l->filters[i]);
}
}
}
if (l->filter_s)
strncpy(c->filter_s, l->filter_s, sizeof(c->filter_s));
return c;
}

1
src/accept.h
View File

@ -44,6 +44,7 @@ struct listen_t {
char *name;
char *addr_s;
char *filters[LISTEN_MAX_FILTERS]; // up to 10 filter definitions
char *filter_s;
};

1
src/filter.c
View File

@ -2630,7 +2630,6 @@ int filter_commands(struct worker_t *self, struct client_t *c, int in_message, c
// archive a copy of the filters, for status display
strncpy(c->filter_s, b, FILTER_S_SIZE);
c->filter_s[FILTER_S_SIZE-1] = 0;
sanitize_ascii_string(c->filter_s);