Get rid of carpdev, it will never be

5 files changed, 5 insertions, 61 deletions

diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index f8fb7c3..bebdf94 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -61,10 +61,6 @@ if($_POST['disablecarp'] <> "") {
                                        		interface_vip_bring_down($vip);
                                        		sleep(1);
                                        	break;
-                                       	case "carpdev-dhcp":
-                                       		interface_vip_bring_down($vip);
-                                       		sleep(1);
-                                       	break;
                                	}
                 	}
         	}
@@ -79,10 +75,6 @@ if($_POST['disablecarp'] <> "") {
 						interface_carp_configure($vip);
 						sleep(1);
 					break;
-					case "carpdev-dhcp":
-						interface_carpdev_configure($vip);
-						sleep(1);
-					break;
 					case "ipalias":
 						if (strstr($vip['interface'], "_vip"))
 							interface_ipalias_configure($vip);
diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 87c32f6..36e48ab 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -78,9 +78,6 @@ if ($_POST) {
                 			case "carp":
                         			interface_carp_configure($a_vip[$vid]);
 						break;
-                			case "carpdev-dhcp":
-                        			interface_carpdev_configure($a_vip[$vid]);
-                        			break;
                 			default:
                         			break;
 					}
@@ -196,7 +193,7 @@ include("head.inc");
 		</tr>
 			  <?php $i = 0; foreach ($a_vip as $vipent): ?>
 			  <?php if($vipent['subnet'] <> "" or $vipent['range'] <> "" or
-			        $vipent['subnet_bits'] <> "" or (isset($vipent['range']['from']) && $vipent['range']['from'] <> "") or $vipent['mode'] == "carpdev-dhcp"): ?>
+			        $vipent['subnet_bits'] <> "" or (isset($vipent['range']['from']) && $vipent['range']['from'] <> "")): ?>
                 <tr>
                   <td class="listlr" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';">
 					<?php	if (($vipent['type'] == "single") || ($vipent['type'] == "network"))
@@ -205,11 +202,10 @@ include("head.inc");
 							if ($vipent['type'] == "range")
 								echo "{$vipent['range']['from']}-{$vipent['range']['to']}";
 					?>
-					<?php if($vipent['mode'] == "carpdev-dhcp") echo "DHCP"; ?>
-					<?php if($vipent['mode'] == "carp" or $vipent['mode'] == "carpdev-dhcp") echo " (vhid {$vipent['vhid']})"; ?>
+					<?php if($vipent['mode'] == "carp") echo " (vhid {$vipent['vhid']})"; ?>
                   </td>
                   <td class="listr" align="center" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';">
-                    <? if($vipent['mode'] == "proxyarp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_parp.gif' title='Proxy ARP'>"; elseif($vipent['mode'] == "carp" or $vipent['mode'] == "carpdev-dhcp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_carp.gif' title='CARP'>"; elseif($vipent['mode'] == "other") echo "<img src='./themes/".$g['theme']."/images/icons/icon_other.gif' title='Other'>"; elseif($vipent['mode'] == "ipalias") echo "<img src='./themes/".$g['theme']."/images/icons/icon_ifalias.gif' title='IP Alias'>";?>
+                    <? if($vipent['mode'] == "proxyarp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_parp.gif' title='Proxy ARP'>"; elseif($vipent['mode'] == "carp") echo "<img src='./themes/".$g['theme']."/images/icons/icon_carp.gif' title='CARP'>"; elseif($vipent['mode'] == "other") echo "<img src='./themes/".$g['theme']."/images/icons/icon_other.gif' title='Other'>"; elseif($vipent['mode'] == "ipalias") echo "<img src='./themes/".$g['theme']."/images/icons/icon_ifalias.gif' title='IP Alias'>";?>
                   </td>
                   <td class="listbg" ondblclick="document.location='firewall_virtual_ip_edit.php?id=<?=$i;?>';">
                     <?=htmlspecialchars($vipent['descr']);?>&nbsp;
diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index c0a21dc..f91fa79 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -145,7 +145,6 @@ if ($_POST) {
 	 */
 	switch ($_POST['mode']) {
 	case "carp":
-	case "carpdev-dhcp":
 		/* verify against reusage of vhids */
 		$idtracker = 0;
 		foreach($config['virtualip']['vip'] as $vip) {
@@ -210,7 +209,7 @@ if ($_POST) {
 		}
 
 		/* CARP specific fields */
-		if ($_POST['mode'] === "carp" or $_POST['mode'] == "carpdev-dhcp") {
+		if ($_POST['mode'] === "carp") {
 			$vipent['vhid'] = $_POST['vhid'];
 			$vipent['advskew'] = $_POST['advskew'];
 			$vipent['advbase'] = $_POST['advbase'];
@@ -233,12 +232,6 @@ if ($_POST) {
 			$vipent['subnet'] = $_POST['subnet'];
 		}
 
-		if ($_POST['mode'] == "carpdev-dhcp") {
-			unset($vipent['subnet']);
-			unset($vipent['subnet_bits']);
-			unset($vipent['alias-subnet']);		
-		}
-
 		if (!isset($id))
 			$id = count($a_vip);
 		if (file_exists("{$g['tmp_path']}/.firewall_virtual_ip.apply"))
@@ -339,21 +332,6 @@ function enable_change(enable_over) {
 		document.iform.noexpand.disabled = 1;
 		jQuery('#noexpandrow').css('display','none');
 	}
-	if (get_radio_value(document.iform.mode) == "carpdev-dhcp") {
-		document.iform.type.disabled = 1;
-		note.removeChild(note.firstChild);
-		note.appendChild(ipaliasnote);
-		document.iform.subnet_bits.disabled = 1;
-		document.iform.subnet.disabled = 1;
-		document.iform.subnet.value = '';
-		document.iform.subnet_bits.value = '';		
-        	document.iform.vhid.disabled = 0;
-        	document.iform.password.disabled = 0;
-        	document.iform.advskew.disabled = 0;
-        	document.iform.advbase.disabled = 0;
-		document.iform.noexpand.disabled = 1;
-		jQuery('#noexpandrow').css('display','none');
-	}
 	typesel_change();
 }
 function typesel_change() {
@@ -410,13 +388,6 @@ function typesel_change() {
 					<?php if ($pconfig['mode'] == "other") echo "checked";?>> <?=gettext("Other");?>
 					<input name="mode" type="radio" onclick="enable_change(false)" value="ipalias"
 					<?php if ($pconfig['mode'] == "ipalias") echo "checked";?>> <?=gettext("IP Alias");?>
-<?php
-/*
-					<input name="mode" type="radio" onclick="enable_change(false)" value="carpdev-dhcp"
-					<?php if ($pconfig['mode'] == "carpdev-dhcp") echo "checked";?>> CarpDEV-DHCP
-*/
-?>
-
 				  </td>
 				</tr>
 				<tr>
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 208e088..0f99466 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -192,9 +192,6 @@ switch($wancfg['ipaddr']) {
 	case "dhcp":
 		$pconfig['type'] = "dhcp";
 		break;
-	case "carpdev-dhcp":
-		$pconfig['ipaddr'] = "";
-		break;
 	case "pppoe":
 	case "pptp":
 	case "l2tp":
@@ -739,15 +736,6 @@ if ($_POST['apply']) {
 					$a_gateways[] = $gateway_item;
 				}
 				break;
-			case "carpdev-dhcp":
-				$wancfg['ipaddr'] = "carpdev-dhcp";
-				$wancfg['dhcphostname'] = $_POST['dhcphostname'];
-				$wancfg['alias-address'] = $_POST['alias-address'];
-				$wancfg['alias-subnet'] = $_POST['alias-subnet'];
-				if($gateway_item) {
-					$a_gateways[] = $gateway_item;
-				}
-				break;
 			case "ppp":
 				$a_ppps[$pppid]['ptpid'] = $_POST['ptpid'];
 				$a_ppps[$pppid]['type'] = $_POST['type'];
@@ -1115,7 +1103,7 @@ $statusurl = "status_interfaces.php";
 
 $closehead = false;
 include("head.inc");
-$types4 = array("none" => gettext("None"), "staticv4" => gettext("Static IPv4"), "dhcp" => gettext("DHCP"), "ppp" => gettext("PPP"), "pppoe" => gettext("PPPoE"), "pptp" => gettext("PPTP"), "l2tp" => gettext("L2TP") /* , "carpdev-dhcp" => "CarpDev"*/);
+$types4 = array("none" => gettext("None"), "staticv4" => gettext("Static IPv4"), "dhcp" => gettext("DHCP"), "ppp" => gettext("PPP"), "pppoe" => gettext("PPPoE"), "pptp" => gettext("PPTP"), "l2tp" => gettext("L2TP"));
 $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"), "dhcp6" => gettext("DHCP6"), "slaac" => gettext("SLAAC"), "6rd" => gettext("6rd Tunnel"), "6to4" => gettext("6to4 Tunnel"), "track6" => gettext("Track Interface"));
 
 ?>
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 88138ea..d657f03 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -249,9 +249,6 @@ function restore_config_section_xmlrpc($raw_params) {
                                         $carp_setuped = true;
 				interface_carp_configure($vip);
 				break;
-			case "carpdev-dhcp":
-				interface_carpdev_configure($vip);
-				break;
 			}
 		}
 		/* Cleanup remaining old carps */