Merge remote-tracking branch 'amarx/firewall-dnat' into next

Conflicts:
	config/firewall/rules.pl

diff --cc config/firewall/rules.pl
index aa8870cdc488a47b123d0d794689573ec2f5b2d4,887c0526575ed9713a9f399ad623cfcee611ec8d..e0f69554e847d7949fc28b50e657d1cf6101ed9e
--- 1/config/firewall/rules.pl
--- 2/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@@ -291,22 -291,22 +291,24 @@@ sub buildrules 
  
                        foreach my $src (@sources) {
                                # Skip invalid source.
 -                              next unless (@$src[0]);
 +                              next unless (defined $src);
 +                              next unless ($src);
  
                                # Sanitize source.
-                               my $source = $src;
+                               my $source = @$src[0];
                                if ($source ~~ @ANY_ADDRESSES) {
                                        $source = "";
                                }
  
+                               my $source_intf = @$src[1];
+ 
                                foreach my $dst (@destinations) {
                                        # Skip invalid rules.
 -                                      next if (!@$dst[0] || (@$dst[0] eq "none"));
 +                                      next unless (defined $dst);
 +                                      next if (!$dst || ($dst eq "none"));
  
                                        # Sanitize destination.
-                                       my $destination = $dst;
+                                       my $destination = @$dst[0];
                                        if ($destination ~~ @ANY_ADDRESSES) {
                                                $destination = "";
                                        }

diff --cc html/cgi-bin/fwhosts.cgi
Simple merge