Move interfaces_staticarp_configure() to interfaces.inc where it really belongs.

3 files changed, 32 insertions, 33 deletions

diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 4a3498b..5abea03 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -3772,4 +3772,36 @@ function get_vip_descr($ipaddress) {
 	return "";
 }
 
+function interfaces_staticarp_configure($if) {
+	global $config, $g;
+	if(isset($config['system']['developerspew'])) {
+		$mt = microtime();
+		echo "interfaces_staticarp_configure($if) being called $mt\n";
+	}
+
+	$ifcfg = $config['interfaces'][$if];
+
+	if (empty($if) || empty($ifcfg['if']))
+		return 0;
+
+	/* Enable staticarp, if enabled */
+	if(isset($config['dhcpd'][$if]['staticarp'])) {
+		mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " staticarp " );
+		mwexec("/usr/sbin/arp -d -i " . escapeshellarg($ifcfg['if']) . " -a > /dev/null 2>&1 ");
+		if (is_array($config['dhcpd'][$if]['staticmap'])) {
+
+			foreach ($config['dhcpd'][$if]['staticmap'] as $arpent) {
+				mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
+
+			}
+
+		}
+	} else {
+		mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " -staticarp " );
+		mwexec("/usr/sbin/arp -d -i " . escapeshellarg($ifcfg['if']) . " -a > /dev/null 2>&1 ");
+	}
+
+	return 0;
+}
+
 ?>
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 6913498..c020641 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -452,38 +452,6 @@ EOD;
         return 0;
 }
 
-function interfaces_staticarp_configure($if) {
-	global $config, $g;
-	if(isset($config['system']['developerspew'])) {
-		$mt = microtime();
-		echo "interfaces_staticarp_configure($if) being called $mt\n";
-	}
-
-        $ifcfg = $config['interfaces'][$if];
-
-	if (empty($if) || empty($ifcfg['if']))
-		return 0;
-
-        /* Enable staticarp, if enabled */
-        if(isset($config['dhcpd'][$if]['staticarp'])) {
-                mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " staticarp " );
-                mwexec("/usr/sbin/arp -d -i " . escapeshellarg($ifcfg['if']) . " -a > /dev/null 2>&1 ");
-                if (is_array($config['dhcpd'][$if]['staticmap'])) {
-
-                        foreach ($config['dhcpd'][$if]['staticmap'] as $arpent) {
-                                mwexec("/usr/sbin/arp -s " . escapeshellarg($arpent['ipaddr']) . " " . escapeshellarg($arpent['mac']));
-
-                        }
-
-                }
-        } else {
-                mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " -staticarp " );
-                mwexec("/usr/sbin/arp -d -i " . escapeshellarg($ifcfg['if']) . " -a > /dev/null 2>&1 ");
-        }
-
-        return 0;
-}
-
 function services_dhcrelay_configure() {
 	global $config, $g;
 	if(isset($config['system']['developerspew'])) {
diff --git a/etc/rc.linkup b/etc/rc.linkup
index 1d62da2..23d7c9b 100755
--- a/etc/rc.linkup
+++ b/etc/rc.linkup
@@ -35,7 +35,6 @@ require_once("config.inc");
 require_once("filter.inc");	
 require_once("shaper.inc");	
 require_once("interfaces.inc");
-require_once("services.inc");
 
 function handle_argument_group($iface, $argument2) {
 	global $config;