generate example zone and interfaces file

diff --git a/PVE/Firewall.pm b/PVE/Firewall.pm
index f75879ef11aa600a9b5892ddd7b21b5f137e9c13..6565212d1f3bcb0d470f866b25b38d9079f4ef97 100644 (file)
--- a/PVE/Firewall.pm
+++ b/PVE/Firewall.pm
@@ -14,21 +14,81 @@ sub compile {
 
     my $netinfo;
 
+    my $bridges = {};
+    my $zoneinfo = {
+       fw => { type => 'firewall' },
+    };
+
     foreach my $vmid (keys %{$vmdata->{qemu}}) {
        $netinfo->{$vmid} = {};
        my $conf = $vmdata->{qemu}->{$vmid};
        foreach my $opt (keys %$conf) {
            next if $opt !~ m/^net(\d+)$/;
+           my $netid = $1;
            my $net = PVE::QemuServer::parse_net($conf->{$opt});
            next if !$net;
-           $netinfo->{$vmid} = $net;
+           die "implement me" if !$net->{bridge};
+           my $bridge = $net->{bridge};
+           $bridges->{$bridge} = 1;
+           $zoneinfo->{$bridge}->{type} = 'ipv4';
+           $zoneinfo->{$bridge}->{ifaces}->{$bridge} = 1;
+           if (defined($net->{tag})) {
+               $bridge = $bridge .= "v$net->{tag}";
+               $bridges->{$bridge} = 1;
+               $zoneinfo->{$bridge}->{type} = 'ipv4';
+               $zoneinfo->{$bridge}->{ifaces}->{$bridge} = 1;
+           }
+
+           my $zone = $bridge . ($conf->{zone} || "vm$vmid");
+           $net->{zone} = $zone;
+           $zoneinfo->{$zone}->{type} = 'bport';
+           $zoneinfo->{$zone}->{bridge} = $bridge;
+           $zoneinfo->{$zone}->{ifaces}->{"tap${vmid}i${netid}"} = 1;
+           $netinfo->{$vmid}->{$netid} = $net;
+       }
+    }
+
+    #print Dumper($netinfo);
+
+    # TODO: zone names have length limit, so we need to
+    # translate them into shorter names 
+
+    # dump zone file
+
+    print "DUMP: zones\n";
+    my $format = "%-15s %-10s %s\n";
+    printf($format, '#ZONE', 'TYPE', 'OPTIONS');
+
+    foreach my $z (sort keys %$zoneinfo) {
+       printf($format, $z, $zoneinfo->{$z}->{type}, '');
+    }
+
+    print "#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE\n";
+
+    print "\n";
+    print "DUMP: interfaces\n";
+
+    $format = "%-15s %-20s %-10s %s\n";
+    printf($format, '#ZONE', 'INTERFACE', 'BROADCAST', 'OPTIONS');
+    foreach my $z (sort keys %$zoneinfo) {
+       my $ifaces = $zoneinfo->{$z}->{ifaces};
+       foreach my $iface (sort keys %$ifaces) {
+           my $broadcast =  $zoneinfo->{$z}->{type} eq 'ipv4' ? 'detect' : '';
+           my $options =  $bridges->{$iface} ? 'bridge' : '';
+           my $bridge = $zoneinfo->{$z}->{bridge} || '';
+           my $iftxt = $zoneinfo->{$z}->{bridge} ? "$zoneinfo->{$z}->{bridge}:$iface" : $iface;
+           printf($format, $z, $iftxt, $broadcast, $options);
        }
     }
 
-    print Dumper($netinfo);
+    print "#LAST LINE - ADD YOUR ENTRIES ABOVE THIS ONE - DO NOT REMOVE\n";
+
+    print "\n";
+
 
 }
 
+
 sub activate {
 
 }

diff --git a/fwtest.pl b/fwtest.pl
index 4e3a637d7d3ddfacf06a9fe2d05d2f1ed974d37a..f04b67ef924467cba663b8fbadca762b0cc0944c 100755 (executable)
--- a/fwtest.pl
+++ b/fwtest.pl
@@ -12,6 +12,15 @@ my $vmdata = {
        101 => {
            net0 => 'rtl8139=0E:9D:ED:CC:9B:ED,bridge=vmbr0',
        },
+       102 => {
+           zone => 'z1',
+           net0 => 'rtl8139=0E:9D:ED:CC:AA:ED,bridge=vmbr0',
+       },
+       103 => {
+           zone => 'z1',
+           net0 => 'rtl8139=0E:9D:ED:CC:BC:ED,bridge=vmbr0',
+           net1 => 'rtl8139=0E:9D:ED:CC:BC:AA,tag=5,bridge=vmbr0',
+       },
     },
 };