webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-13 12:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

captivectrl: Support unlimited leases

Browse Source 
When the expiry time equals zero, the lease will have
no time constraints. The IP address will also be removed
as it might probably change.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2016-01-30 14:46:55 +00:00
parent 5fbeaf1333
commit 0c24f0a9df
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/misc-progs/captivectrl.c
View File

@@ -143,24 +143,29 @@ static int add_client_rules(const client_t* clients) {
char match[STRING_SIZE];
while (clients) {
time_t expires = clients->time_start + clients->expires;
char* time_start = format_time(&clients->time_start);
char* time_end = format_time(&expires);
size_t len = 0;
if (*clients->ipaddr) {
if (*clients->ipaddr && clients->expires > 0) {
len += snprintf(match + len, sizeof(match) - len,
"-s %s", clients->ipaddr);
}
len += snprintf(match + len, sizeof(match) - len,
" -m mac --mac-source %s -m time --datestart %s --datestop %s",
clients->etheraddr, time_start, time_end);
" -m mac --mac-source %s", clients->etheraddr);
free(time_start);
free(time_end);
if (clients->expires > 0) {
time_t expires = clients->time_start + clients->expires;
char* time_start = format_time(&clients->time_start);
char* time_end = format_time(&expires);
len += snprintf(match + len, sizeof(match) - len,
"-m time --datestart %s --datestop %s",
time_start, time_end);
free(time_start);
free(time_end);
}
// filter
snprintf(command, sizeof(command), IPTABLES " -A CAPTIVE_PORTAL_CLIENTS"