From 1ded0fcd90d2645ead79048f44824908fc18cc72 Mon Sep 17 00:00:00 2001
From: agpecam <agpecam@gmail.com>
Date: Mon, 28 Dec 2015 16:40:40 +0800
Subject: Allow to select OSPF Network Type in the Quagga OSPFd > Interface
 Settings

---
 config/quagga_ospfd/quagga_ospfd.inc            |  3 +++
 config/quagga_ospfd/quagga_ospfd_interfaces.xml | 14 ++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/config/quagga_ospfd/quagga_ospfd.inc b/config/quagga_ospfd/quagga_ospfd.inc
index 27f08143..7c1f5422 100644
--- a/config/quagga_ospfd/quagga_ospfd.inc
+++ b/config/quagga_ospfd/quagga_ospfd.inc
@@ -109,6 +109,9 @@ function quagga_ospfd_install_conf() {
 			foreach ($config['installedpackages']['quaggaospfdinterfaces']['config'] as $conf) {
 				$realif = get_real_interface($conf['interface']);
 				$conffile .= "interface {$realif}\n" ;
+				if (!empty($conf['networktype'])) {
+					$conffile .= "  ip ospf network {$conf['networktype']}\n";
+				}
 				if (!empty($conf['metric'])) {
 					$conffile .= "  ip ospf cost {$conf['metric']}\n";
 				}
diff --git a/config/quagga_ospfd/quagga_ospfd_interfaces.xml b/config/quagga_ospfd/quagga_ospfd_interfaces.xml
index ef594bfd..d1cc876c 100644
--- a/config/quagga_ospfd/quagga_ospfd_interfaces.xml
+++ b/config/quagga_ospfd/quagga_ospfd_interfaces.xml
@@ -107,6 +107,20 @@
 			<source_value>value</source_value>
 			<required/>
 		</field>
+ 		<field>
+			<fielddescr>Network Type</fielddescr>
+			<fieldname>networktype</fieldname>
+			<description>Select OSPF Network Type of the interface.</description>
+			<type>select</type>
+			<default_value></default_value>
+			<options>
+				<option><value></value><name>Not specified (default)</name></option>
+				<option><value>broadcast</value><name>Broadcast</name></option>
+				<option><value>non-broadcast</value><name>Non-Broadcast</name></option>
+				<option><value>point-to-multipoint</value><name>Point-to-Multipoint</name></option>
+				<option><value>point-to-point</value><name>Point-to-Point</name></option>
+			</options>
+		</field>
 		<field>
 			<fielddescr>Metric</fielddescr>
 			<fieldname>metric</fieldname>
-- 
cgit v1.2.3


From 71d668f088e678454c16ca34abfc012456ebf31a Mon Sep 17 00:00:00 2001
From: agpecam <agpecam@gmail.com>
Date: Mon, 18 Jan 2016 23:51:44 +0800
Subject: bump version

---
 config/quagga_ospfd/quagga_ospfd.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/quagga_ospfd/quagga_ospfd.xml b/config/quagga_ospfd/quagga_ospfd.xml
index a696bd81..82855583 100644
--- a/config/quagga_ospfd/quagga_ospfd.xml
+++ b/config/quagga_ospfd/quagga_ospfd.xml
@@ -42,7 +42,7 @@
 	]]>
 	</copyright>
 	<name>quagga_ospfd</name>
-	<version>0.6.9</version>
+	<version>0.6.10</version>
 	<title>Services: Quagga OSPFd</title>
 	<include_file>/usr/local/pkg/quagga_ospfd.inc</include_file>
 	<aftersaveredirect>pkg_edit.php?xml=quagga_ospfd.xml&amp;id=0</aftersaveredirect>
-- 
cgit v1.2.3