onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

Secuwall: Fix vlan handling.

Browse Source
This commit is contained in:
Adrian-Ken Rueegsegger 2010-02-19 16:24:48 +00:00
parent 2c146eddcf
commit 1139b1c1f9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler_lib/interfacePropertiesObjectFactory.cpp
View File

@ -50,7 +50,7 @@ interfaceProperties* interfacePropertiesObjectFactory::getInterfacePropertiesObj
interfaceProperties* interfacePropertiesObjectFactory::getInterfacePropertiesObject(
const std::string &os_family)
{
if (os_family == "linux24") return new linux24Interfaces();
if (os_family == "linux24" || os_family == "secuwall") return new linux24Interfaces();
if (os_family == "ios") return new iosInterfaces();
if (os_family == "pix_os" || os_family == "ios") return new pixInterfaces();
if (os_family == "openbsd" || os_family == "freebsd") return new bsdInterfaces();

7
src/iptlib/OSConfigurator_secuwall.cpp
View File

@ -721,13 +721,16 @@ int OSConfigurator_secuwall::generateInterfaceFile (Interface * iface, IPv4 * ip
/* Fall-through */
case VRRP:
{
FWObject* parent = iface->getParent();
stream << "BASEDEV=\"";
if (options->getStr("base_device").empty())
if (parent != NULL && parent->getName().empty())
{
/* No base device provided */
abort("No base device specified for " + iface->getName());
}
stream << options->getStr("base_device").c_str();
stream << parent->getName().c_str();
stream << "\"" << endl;
}
break;