External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: add support for IPv6 masquerade rules

Browse Source 
IPv6 does support masquerade since Linux 3.9.0 / ip6tables 1.4.18,
which is Fedora 18 / RHEL-7 vintage, which covers all our supported
Linux versions.

Reviewed-by: Laine Stump <laine@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-06-08 14:28:20 +01:00
parent d53ab9f54e
commit 8774db431f
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/util/viriptables.c
View File

@ -854,29 +854,24 @@ iptablesForwardMasquerade(virFirewallPtr fw,
g_autofree char *portRangeStr = NULL; g_autofree char *portRangeStr = NULL;
g_autofree char *natRangeStr = NULL; g_autofree char *natRangeStr = NULL;
virFirewallRulePtr rule; virFirewallRulePtr rule;
int af = VIR_SOCKET_ADDR_FAMILY(netaddr);
virFirewallLayer layer = af == AF_INET ?
VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) if (!(networkstr = iptablesFormatNetwork(netaddr, prefix)))
return -1; return -1;
if (!VIR_SOCKET_ADDR_IS_FAMILY(netaddr, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, af)) {
/* Higher level code *should* guaranteee it's impossible to get here. */
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Attempted to NAT '%s'. NAT is only supported for IPv4."),
networkstr);
return -1;
}
if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, AF_INET)) {
if (!(addrStartStr = virSocketAddrFormat(&addr->start))) if (!(addrStartStr = virSocketAddrFormat(&addr->start)))
return -1; return -1;
if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->end, AF_INET)) { if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->end, af)) {
if (!(addrEndStr = virSocketAddrFormat(&addr->end))) if (!(addrEndStr = virSocketAddrFormat(&addr->end)))
return -1; return -1;
} }
} }
if (protocol && protocol[0]) { if (protocol && protocol[0]) {
rule = virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, rule = virFirewallAddRule(fw, layer,
"--table", "nat", "--table", "nat",
action == ADD ? "--insert" : "--delete", action == ADD ? "--insert" : "--delete",
pvt ? "LIBVIRT_PRT" : "POSTROUTING", pvt ? "LIBVIRT_PRT" : "POSTROUTING",
@ -885,7 +880,7 @@ iptablesForwardMasquerade(virFirewallPtr fw,
"!", "--destination", networkstr, "!", "--destination", networkstr,
NULL); NULL);
} else { } else {
rule = virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, rule = virFirewallAddRule(fw, layer,
"--table", "nat", "--table", "nat",
action == ADD ? "--insert" : "--delete", action == ADD ? "--insert" : "--delete",
pvt ? "LIBVIRT_PRT" : "POSTROUTING", pvt ? "LIBVIRT_PRT" : "POSTROUTING",
@ -1004,20 +999,14 @@ iptablesForwardDontMasquerade(virFirewallPtr fw,
int action) int action)
{ {
g_autofree char *networkstr = NULL; g_autofree char *networkstr = NULL;
virFirewallLayer layer = VIR_SOCKET_ADDR_FAMILY(netaddr) == AF_INET ?
VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
if (!(networkstr = iptablesFormatNetwork(netaddr, prefix))) if (!(networkstr = iptablesFormatNetwork(netaddr, prefix)))
return -1; return -1;
if (!VIR_SOCKET_ADDR_IS_FAMILY(netaddr, AF_INET)) {
/* Higher level code *should* guaranteee it's impossible to get here. */
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Attempted to NAT '%s'. NAT is only supported for IPv4."),
networkstr);
return -1;
}
if (physdev && physdev[0]) if (physdev && physdev[0])
virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, virFirewallAddRule(fw, layer,
"--table", "nat", "--table", "nat",
action == ADD ? "--insert" : "--delete", action == ADD ? "--insert" : "--delete",
pvt ? "LIBVIRT_PRT" : "POSTROUTING", pvt ? "LIBVIRT_PRT" : "POSTROUTING",
@ -1027,7 +1016,7 @@ iptablesForwardDontMasquerade(virFirewallPtr fw,
"--jump", "RETURN", "--jump", "RETURN",
NULL); NULL);
else else
virFirewallAddRule(fw, VIR_FIREWALL_LAYER_IPV4, virFirewallAddRule(fw, layer,
"--table", "nat", "--table", "nat",
action == ADD ? "--insert" : "--delete", action == ADD ? "--insert" : "--delete",
pvt ? "LIBVIRT_PRT" : "POSTROUTING", pvt ? "LIBVIRT_PRT" : "POSTROUTING",