Merge branch 'master' of http://gitweb.pfsense.org/pfsense-packages/mainline

1 files changed, 55 insertions, 41 deletions

diff --git a/config/openospfd/openospfd_interfaces.xml b/config/openospfd/openospfd_interfaces.xml
index b8f2522e..445eefea 100644
--- a/config/openospfd/openospfd_interfaces.xml
+++ b/config/openospfd/openospfd_interfaces.xml
@@ -1,16 +1,17 @@
 <packagegui>
 	<name>OSPFd Interfaces</name>
 	<version>0.1</version>
-	<title>Services: OSPFd</title>
+	<title>Services: OpenOSPFd</title>
 	<include_file>/usr/local/pkg/openospfd.inc</include_file>
-	<aftersaveredirect>pkg_edit.php?xml=openospfd.xml&amp;id=0</aftersaveredirect>
+	<aftersaveredirect>pkg.php?xml=openospfd_interfaces.xml</aftersaveredirect>
+	<custom_php_command_before_form>ospfd_display_friendlyiface();</custom_php_command_before_form>
 	<additional_files_needed>
-                <prefix>/usr/local/pkg/</prefix>
-                <chmod>077</chmod>
-                <item>http://www.pfsense.com/packages/config/openospfd/openospfd.inc</item>
-        </additional_files_needed>
+		<prefix>/usr/local/pkg/</prefix>
+		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/openospfd/openospfd.inc</item>
+	</additional_files_needed>
 	<menu>
-		<name>OSPFd</name>
+		<name>OSPF</name>
 		<tooltiptext>Modify ospfd settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>openospfd.xml</configfile>
@@ -26,83 +27,96 @@
 		<url>pkg.php?xml=openospfd_interfaces.xml</url>
 		<active/>
 	</tab>
+	<tab>
+		<text>Status</text>
+		<url>/status_ospfd.php</url>
+	</tab>	
 	</tabs>
 	<adddeleteeditpagefields>
 		<columnitem>
-                        <fielddescr>Interface</fielddescr>
-                        <fieldname>interface</fieldname>
-                </columnitem>
+			<fielddescr>Interface</fielddescr>
+			<fieldname>interface</fieldname>
+			<type>interface</type>
+		</columnitem>
 		<columnitem>
-                        <fielddescr>Description</fielddescr>
-                        <fieldname>descr</fieldname>
-                </columnitem>
+			<fielddescr>Description</fielddescr>
+			<fieldname>descr</fieldname>
+		</columnitem>
 	</adddeleteeditpagefields>
 	<service>
-		<name>ospfd</name>
+		<name>OpenOSPFd</name>
 		<rcfile>ospfd.sh</rcfile>
 		<executable>ospfd</executable>
 	</service>
 	<fields>
-                <field>
-                        <fielddescr>Interface</fielddescr>
-                        <fieldname>interface</fieldname>
-                        <description>Enter the desired participating interface here.</description>
-                        <type>interfaces_selection</type>
+		<field>
+			<fielddescr>Interface</fielddescr>
+			<fieldname>interface</fieldname>
+			<description>Enter the desired participating interface here.</description>
+			<type>interfaces_selection</type>
 			<required/>
-                </field>
+		</field>
 		<field>
 			<fielddescr>Metric</fielddescr>
 			<fieldname>metric</fieldname>
 			<description>Metric for this OSPF interface (leave blank for default).</description>
 			<type>input</type>
-                </field>
+		</field>
 		<field>
-                        <fielddescr>Description</fielddescr>
-                        <fieldname>descr</fieldname>
+			<fielddescr>Description</fielddescr>
+			<fieldname>descr</fieldname>
 			<size>30</size>
-                        <type>input</type>
-                </field>
-                <field>
-                        <fielddescr>Enable MD5 password for this OSPFd interface (default no)</fielddescr>
-                        <fieldname>md5password</fieldname>
-                        <description>Enables the use of an MD5 password to on this instance</description>
-                        <type>checkbox</type>
-                </field>
+			<type>input</type>
+		</field>
+		<field>
+			<fielddescr>Interface is Passive</fielddescr>
+			<fieldname>passive</fieldname>
+			<description>Prevent transmission and reception of OSPF packets on this interface.  The specified interface will be announced as a stub network.</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Enable MD5 password for this OpenOSPFd interface (default no)</fielddescr>
+			<fieldname>md5password</fieldname>
+			<description>Enables the use of an MD5 password to on this instance</description>
+			<type>checkbox</type>
+		</field>
 		<field>
 			<fielddescr>Password</fielddescr>
 			<fieldname>password</fieldname>
 			<description>Password for this OSPF interface.</description>
 			<type>input</type>
-                </field>
+		</field>
 		<field>
 			<fielddescr>Router Priority</fielddescr>
 			<fieldname>routerpriorityelections</fieldname>
-			<description>Router priority when participating in elections for DR (Default 1) Valid range is 0-255.  0 will cause the router to not participate in election.</description>
+			<description>
+					Router priority when participating in elections for DR (Default 1) Valid range is 0-255.  0 will cause the router to not participate in election.
+			</description>
 			<type>input</type>
-                </field>
+		</field>
 		<field>
 			<fielddescr>Hello Interval</fielddescr>
 			<fieldname>hellointervalinseconds</fieldname>
 			<description>Hello Interval this OSPF interface in seconds (Default 10).</description>
 			<type>input</type>
-                </field>
+		</field>
 		<field>
 			<fielddescr>Retransmit Interval</fielddescr>
 			<fieldname>retransmitinterval</fieldname>
 			<description>Retransmit Interval this OSPF interface in seconds (Default 5).</description>
 			<type>input</type>
-                </field>
+		</field>
 		<field>
 			<fielddescr>Dead Timer</fielddescr>
 			<fieldname>deadtimer</fieldname>
 			<description>Dead Timer for this OSPF interface in seconds (Default 40).</description>
 			<type>input</type>
-                </field>
+		</field>
 	</fields>
 	<custom_php_resync_config_command>
-                ospfd_install_conf();
-        </custom_php_resync_config_command>
+		ospfd_install_conf();
+	</custom_php_resync_config_command>
 	<custom_php_validation_command>
-                ospfd_validate_interface();
-        </custom_php_validation_command>
+		ospfd_validate_interface();
+	</custom_php_validation_command>
 </packagegui>