onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-24 04:07:55 +01:00
Code Issues Releases Wiki Activity

* OSConfigurator_bsd.cpp (compare_names): fixed #1807 "wrong order

Browse Source 
of address assignment in the generated OpenBSD/PF/CARP cluster
configuration". Need to assign ip addresses to regular interfaces
before trying to assign them to carp interfaces.
This commit is contained in:
Vadim Kurland 2010-10-29 14:51:51 -07:00
parent 50a4702a7b
commit 035509dc9f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,5 +1,10 @@
2010-10-29 Vadim Kurland <vadim@vk.crocodile.org>
* OSConfigurator_bsd.cpp (compare_names): fixed #1807 "wrong order
of address assignment in the generated OpenBSD/PF/CARP cluster
configuration". Need to assign ip addresses to regular interfaces
before trying to assign them to carp interfaces.
* configlets/linux24/load_modules: fixed #1820 "skip module
"nf_conntrack_ipv6" if generated script has no ipv6 rules"
Shell function load_modules should not try to load module

13
src/pflib/OSConfigurator_bsd.cpp
View File

@ -212,11 +212,18 @@ string OSConfigurator_bsd::printFunctions()
return ostr.str();
}
/*
* We need to sort interfaces by name but make sure carp interfaces
* are always last. See #1807
*/
bool compare_names(FWObject *a, FWObject *b)
{
if (a->getName() < b->getName()) return true;
return false;
QString a_name = QString(a->getName().c_str());
QString b_name = QString(b->getName().c_str());
if (a_name.startsWith("carp") && b_name.startsWith("carp")) return a_name < b_name;
if (a_name.startsWith("carp")) return false;
if (b_name.startsWith("carp")) return true;
return a_name < b_name;
}
string OSConfigurator_bsd::configureInterfaces()