webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 03:07:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

aliases: Add support to assign aliases to multiple RED interfaces

Browse Source 
This is a little patch which will extend the aliases page to offer an
interface selection if there are more than one RED interfaces.

This is a little hack to make configuration easier for users who have
manually set up more than one RED interface (e.g. for load balancing or
fail-over) and want to use the UI to configure firewall rules.

As a little benefit on the side, I had to rewrite setaliases.c to use
ip(8) instead of ifconfig(8).

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Acked-by: Peter Müller <peter.mueller@ipfire.org>
This commit is contained in:
Michael Tremer
2022-06-29 18:27:23 +00:00
committed by Peter Müller
parent f704d76e08
commit 6395bed8a4
4 changed files with 99 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/misc-progs/setaliases.c
View File

@@ -28,6 +28,8 @@
struct keyvalue *kv = NULL;
FILE *file = NULL;
#define SCOPE 128
void exithandler(void)
{
if (kv) freekeyvalues(kv);
@@ -45,6 +47,7 @@ int main(void)
char *enabled;
char *sptr;
char *comment;
char* intf = NULL;
int alias;
int count;
@@ -118,13 +121,12 @@ int main(void)
exit(1);
}
/* down the aliases in turn until ifconfig complains */
alias=0;
do
{
memset(command, 0, STRING_SIZE);
snprintf(command, STRING_SIZE-1, "/sbin/ifconfig %s:%d down 2>/dev/null", red_dev, alias++);
} while (safe_system(command)==0);
// Flush all previous aliases
alias = 0;
do {
snprintf(command, STRING_SIZE - 1,
"ip addr flush dev red%d scope %d 2>/dev/null", alias++, SCOPE);
} while (safe_system(command) == 0);
/* Now set up the new aliases from the config file */
if (!(file = fopen(CONFIG_ROOT "/ethernet/aliases", "r")))
@@ -144,15 +146,18 @@ int main(void)
aliasip = NULL;
enabled = NULL;
comment = NULL;
intf = NULL;
sptr = strtok(s, ",");
while (sptr)
{
if (count == 0)
aliasip = sptr;
if (count == 1)
else if (count == 1)
enabled = sptr;
else
else if (count == 2)
comment = sptr;
else if (count == 3)
intf = sptr;
count++;
sptr = strtok(NULL, ",");
}
@@ -175,15 +180,18 @@ int main(void)
exit(1);
}
memset(command, 0, STRING_SIZE);
snprintf(command, STRING_SIZE-1,
"/sbin/ifconfig %s:%d %s netmask %s up",
red_dev, alias, aliasip, red_netmask);
// Default to RED_DEV if intf isn't set
if (!intf)
intf = red_dev;
snprintf(command, STRING_SIZE - 1, "ip addr add %s/%s dev %s scope %d",
aliasip, red_netmask, intf, SCOPE);
safe_system(command);
memset(command, 0, STRING_SIZE);
// Send an ARP broadcast
snprintf(command, STRING_SIZE-1,
"/usr/sbin/arping -q -c 1 -w 1 -i %s -S %s %s",
red_dev, aliasip, default_gateway);
intf, aliasip, default_gateway);
safe_system(command);
alias++;
}