From 8ea59ed7ec2bba09557c57afa213a054b797b194 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Tue, 9 Jan 2018 21:09:54 +0100
Subject: [PATCH] firewall/nat, support ipv+ipv6 for port-forwards, closes
 https://github.com/opnsense/core/issues/1589

---
 src/www/firewall_nat_edit.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/www/firewall_nat_edit.php b/src/www/firewall_nat_edit.php
index 8d479b5dd..63af3b295 100644
--- a/src/www/firewall_nat_edit.php
+++ b/src/www/firewall_nat_edit.php
@@ -187,6 +187,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
             $input_errors[] = sprintf(gettext("%s is not a valid IPv6 address."), $pconfig[$fieldname]);
         }
     }
+
     if (!empty($pconfig['srcmask']) && !is_numericint($pconfig['srcmask'])) {
         $input_errors[] = gettext("A valid source bit count must be specified.");
     }
@@ -557,7 +558,7 @@ $( document ).ready(function() {
                   <td>
                     <select name="ipprotocol" class="selectpicker" data-width="auto" data-live-search="true" data-size="5" >
 <?php
-                    foreach (array('inet' => 'IPv4','inet6' => 'IPv6') as $proto => $name): ?>
+                    foreach (array('inet' => 'IPv4','inet6' => 'IPv6', 'inet46' => 'IPv4+IPv6') as $proto => $name): ?>
                     <option value="<?=$proto;?>" <?= $proto == $pconfig['ipprotocol'] ? "selected=\"selected\"" : "";?>>
                       <?=$name;?>
                     </option>