diff options
| author | Renato Botelho <garga@pfSense.org> | 2013-09-09 12:29:44 -0700 |
|---|---|---|
| committer | Renato Botelho <garga@pfSense.org> | 2013-09-09 12:29:44 -0700 |
| commit | 6906202e5414898843eb1867382a9587de509f9f (patch) | |
| tree | c5b786c352e7283993a3ab47839124e369e1beaf /config | |
| parent | 58d93a47ef523a42260e4e4e97289be4501eb5ea (diff) | |
| parent | a5695467b13b179b14a9c69dc3d6767ceffebabd (diff) | |
| download | pfsense-packages-6906202e5414898843eb1867382a9587de509f9f.tar.gz pfsense-packages-6906202e5414898843eb1867382a9587de509f9f.tar.bz2 pfsense-packages-6906202e5414898843eb1867382a9587de509f9f.zip | |
Merge pull request #482 from phil-davis/master
bandwidthd - check for interface subnet also specified by user
Diffstat (limited to 'config')
| -rw-r--r-- | config/bandwidthd/bandwidthd.inc | 19 | ||||
| -rw-r--r-- | config/bandwidthd/bandwidthd.xml | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/config/bandwidthd/bandwidthd.inc b/config/bandwidthd/bandwidthd.inc index 00e3cd28..45709ec3 100644 --- a/config/bandwidthd/bandwidthd.inc +++ b/config/bandwidthd/bandwidthd.inc @@ -139,13 +139,22 @@ function bandwidthd_install_config() { $ifcfg = $config['interfaces'][$int]; $subnet = gen_subnet($ifcfg['ipaddr'], $ifcfg['subnet']); $subnetmask = gen_subnet_mask($ifcfg['subnet']); + $subnet_with_mask = ""; if($subnet == "pppoe") { $subnet = find_interface_ip("ng0"); - if($subnet) - $subnets .= "subnet {$subnet}/32\n"; + if($subnet) { + $subnet_with_mask = $subnet . "/32"; + } } else { - if($subnet) - $subnets .= "subnet {$subnet}/{$ifcfg['subnet']}\n"; + if($subnet) { + $subnet_with_mask = $subnet . "/" . $ifcfg['subnet']; + } + } + if (!empty($subnet_with_mask)) { + /* Only add the subnet if the user has not specified it in the custom subnets. */ + /* This avoids generating an unnecessary syntax error message from the config. */ + if (!in_array($subnet_with_mask, $subnets_custom)) + $subnets .= "subnet {$subnet_with_mask}\n"; } } } @@ -197,7 +206,7 @@ $dev # intervals to skip before doing a graphing run $skip_intervals -# Graph cutoff is how many k must be transfered by an +# Graph cutoff is how many k must be transferred by an # ip before we bother to graph it $graph_cutoff diff --git a/config/bandwidthd/bandwidthd.xml b/config/bandwidthd/bandwidthd.xml index d0753a01..71e5e8fc 100644 --- a/config/bandwidthd/bandwidthd.xml +++ b/config/bandwidthd/bandwidthd.xml @@ -46,7 +46,7 @@ <requirements>Describe your package requirements here</requirements> <faq>Currently there are no FAQ items provided.</faq> <name>bandwidthd</name> - <version>2.0.1_5 pkg v.0.1</version> + <version>2.0.1_5 pkg v.0.2</version> <title>Bandwidthd</title> <aftersaveredirect>/pkg_edit.php?xml=bandwidthd.xml&id=0</aftersaveredirect> <include_file>/usr/local/pkg/bandwidthd.inc</include_file> |