summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-02-26 01:13:42 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-02-26 01:13:42 +0000
commitd4d6caab29e51d32ffab9f2b16077cce22375ec8 (patch)
treeba01c2c74359ba052d694b636eab4f879de8075d
parentbe71a55c7c678275f73a64c712aec776a3c2454b (diff)
downloadpfsense-d4d6caab29e51d32ffab9f2b16077cce22375ec8.zip
pfsense-d4d6caab29e51d32ffab9f2b16077cce22375ec8.tar.gz
* Call arp -da from interfaces_staticarp_configure() and not from GUI page
* OLSR improvements / fixes
-rw-r--r--etc/inc/services.inc2
-rw-r--r--usr/local/pkg/olsrd.xml3
-rwxr-xr-xusr/local/www/services_dhcp.php1
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index 318624c..245a4c9 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -305,7 +305,7 @@ function interfaces_staticarp_configure($if) {
}
} else {
mwexec("/sbin/ifconfig " . escapeshellarg($ifcfg['if']) . " -staticarp " );
- mwexec("/usr/sbin/arp -ad > /dev/null 2>&1 ");
+ mwexec("/usr/sbin/arp -da > /dev/null 2>&1 ");
}
return 0;
diff --git a/usr/local/pkg/olsrd.xml b/usr/local/pkg/olsrd.xml
index 3e24d3b..cc08064 100644
--- a/usr/local/pkg/olsrd.xml
+++ b/usr/local/pkg/olsrd.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<packagegui>
- <name>OLSRD</name>
+ <name>olsrd</name>
<version>1.0</version>
<title>OLSRD</title>
<!-- Menu is where this packages menu will appear -->
@@ -27,6 +27,7 @@
<!-- configpath gets expanded out automatically and config items will be
stored in that location -->
<configpath>['installedpackages']['OLSRD']['config']</configpath>
+ <aftersaveredirect>pkg_edit.php?xml=olsrd.xml&amp;id=0</aftersaveredirect>
<!-- fields gets invoked when the user adds or edits a item. the following items
will be parsed and rendered for the user as a gui with input, and selectboxes. -->
<fields>
diff --git a/usr/local/www/services_dhcp.php b/usr/local/www/services_dhcp.php
index 05fd9cf..785d3fe 100755
--- a/usr/local/www/services_dhcp.php
+++ b/usr/local/www/services_dhcp.php
@@ -175,7 +175,6 @@ if ($_POST) {
$config['dhcpd'][$if]['staticarp'] = true;
} else {
unset($config['dhcpd'][$if]['staticarp']);
- mwexec("/usr/sbin/arp -da");
}
write_config();
OpenPOWER on IntegriCloud