stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ACL: set the default (no filter) prefix when user entered empty or wrong prefix

Browse source
This commit is contained in:
Jaroslav Kysela 2014-09-16 17:23:43 +02:00
parent 89ee111a26
commit 97999e4715
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/access.c
View file

@ -487,6 +487,23 @@ access_get_by_addr(struct sockaddr *src)
return a;
}
/**
*
*/
static void
access_set_prefix_default(access_entry_t *ae)
{
access_ipmask_t *ai;
ai = calloc(1, sizeof(access_ipmask_t));
ai->ai_ipv6 = 1;
TAILQ_INSERT_HEAD(&ae->ae_ipmasks, ai, ai_link);
ai = calloc(1, sizeof(access_ipmask_t));
ai->ai_ipv6 = 0;
TAILQ_INSERT_HEAD(&ae->ae_ipmasks, ai, ai_link);
}
/**
*
*/
@ -578,6 +595,9 @@ access_set_prefix(access_entry_t *ae, const char *prefix)
tok = strtok_r(NULL, ",;| ", &saveptr);
}
if (!TAILQ_FIRST(&ae->ae_ipmasks))
access_set_prefix_default(ae);
}
/**
@ -1073,7 +1093,6 @@ access_init(int createdefault, int noacl)
htsmsg_t *c, *m;
htsmsg_field_t *f;
access_entry_t *ae;
access_ipmask_t *ai;
const char *s;
static struct {
@ -1118,13 +1137,7 @@ access_init(int createdefault, int noacl)
TAILQ_INIT(&ae->ae_ipmasks);
ai = calloc(1, sizeof(access_ipmask_t));
ai->ai_ipv6 = 1;
TAILQ_INSERT_HEAD(&ae->ae_ipmasks, ai, ai_link);
ai = calloc(1, sizeof(access_ipmask_t));
ai->ai_ipv6 = 0;
TAILQ_INSERT_HEAD(&ae->ae_ipmasks, ai, ai_link);
access_set_prefix_default(ae);
access_entry_save(ae);