[pve-devel] [PATCH] rename link+ to fwln+

[Dietmar Maurer]

applied

> -----Original Message-----
> From: pve-devel [mailto:pve-devel-bounces at pve.proxmox.com] On Behalf
> Of Alexandre Derumier
> Sent: Mittwoch, 14. Mai 2014 05:27
> To: pve-devel at pve.proxmox.com
> Subject: [pve-devel] [PATCH] rename link+ to fwln+
> 
> 
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  src/PVE/Firewall.pm |    4 ++--
>  test/fwtester.pl    |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index
> bbaa58e..9098c0e 100644
> --- a/src/PVE/Firewall.pm
> +++ b/src/PVE/Firewall.pm
> @@ -2590,10 +2590,10 @@ sub compile {
>      ruleset_create_chain($ruleset, "PVEFW-FWBR-IN");
>      ruleset_chain_add_input_filters($ruleset, "PVEFW-FWBR-IN",
> $hostfw_options);
> 
> -    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-
> is-bridged --physdev-in link+ -j PVEFW-FWBR-IN");
> +    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev
> + --physdev-is-bridged --physdev-in fwln+ -j PVEFW-FWBR-IN");
> 
>      ruleset_create_chain($ruleset, "PVEFW-FWBR-OUT");
> -    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev --physdev-
> is-bridged --physdev-out link+ -j PVEFW-FWBR-OUT");
> +    ruleset_addrule($ruleset, "PVEFW-FORWARD", "-m physdev
> + --physdev-is-bridged --physdev-out fwln+ -j PVEFW-FWBR-OUT");
> 
>      ruleset_create_chain($ruleset, "PVEFW-VENET-IN");
>      ruleset_chain_add_input_filters($ruleset, "PVEFW-VENET-IN",
> $hostfw_options); diff --git a/test/fwtester.pl b/test/fwtester.pl index
> 97e9cfa..2536076 100755
> --- a/test/fwtester.pl
> +++ b/test/fwtester.pl
> @@ -209,7 +209,7 @@ sub simulate_firewall {
>  	$pkg->{mac_source} = $macaddr;
>  	my $brpkg = copy_packet($pkg);
>  	$brpkg->{physdev_in} = "tap${vmid}i0";
> -	$brpkg->{physdev_out} = "link${vmid}i0";
> +	$brpkg->{physdev_out} = "fwln${vmid}i0";
>  	$brpkg->{iface_in} = $brpkg->{iface_out} = "fwbr${vmid}i0";
>  	$pre_test = ['PVEFW-FORWARD', $brpkg];
>      } else {
> @@ -236,7 +236,7 @@ sub simulate_firewall {
>  	$pkg->{iface_out} = $net->{bridge} || die "unable to get bridge";
>  	my $brpkg = copy_packet($pkg);
>  	$brpkg->{physdev_out} = "tap${vmid}i0";
> -	$brpkg->{physdev_in} = "link${vmid}i0";
> +	$brpkg->{physdev_in} = "fwln${vmid}i0";
>  	$brpkg->{iface_in} = $brpkg->{iface_out} = "fwbr${vmid}i0";
>  	$post_test = ['PVEFW-FORWARD', $brpkg];
>      } else {
> --
> 1.7.10.4
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel