diff options
| author | jim-p <jimp@pfsense.org> | 2016-01-18 11:25:12 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-01-18 11:25:12 -0500 |
| commit | a1510e3c9bf02e3b676cb798f06b78f143f43a5a (patch) | |
| tree | fcd45b28c0f976dbbf2ee645ad0a4af9f9c2ac37 | |
| parent | bdb20484dc5560467bbf77b3ef57d82008aaae83 (diff) | |
| parent | 71d668f088e678454c16ca34abfc012456ebf31a (diff) | |
| download | pfsense-packages-a1510e3c9bf02e3b676cb798f06b78f143f43a5a.tar.gz pfsense-packages-a1510e3c9bf02e3b676cb798f06b78f143f43a5a.tar.bz2 pfsense-packages-a1510e3c9bf02e3b676cb798f06b78f143f43a5a.zip | |
Merge pull request #1227 from agpecam/master
| -rw-r--r-- | config/quagga_ospfd/quagga_ospfd.inc | 3 | ||||
| -rw-r--r-- | config/quagga_ospfd/quagga_ospfd.xml | 2 | ||||
| -rw-r--r-- | config/quagga_ospfd/quagga_ospfd_interfaces.xml | 14 |
3 files changed, 18 insertions, 1 deletions
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.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&id=0</aftersaveredirect> 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> |