Thread: [fwbuilder-commits] r1532 - in branches/v3_1: . src/compiler_lib
Brought to you by:
mikehorn
From: <va...@in...> - 2009-10-01 03:52:33
|
Author: vadim Date: 2009-09-30 20:52:14 -0700 (Wed, 30 Sep 2009) New Revision: 1532 Modified: branches/v3_1/build_num branches/v3_1/src/compiler_lib/CompilerDriver.cpp Log: catch situation when interface br0/eth0.102 is missing as eth0/eth0.102 even when br0/eth0.102 is unnumbered Modified: branches/v3_1/build_num =================================================================== --- branches/v3_1/build_num 2009-10-01 02:18:34 UTC (rev 1531) +++ branches/v3_1/build_num 2009-10-01 03:52:14 UTC (rev 1532) @@ -1 +1 @@ -#define BUILD_NUM 1530 +#define BUILD_NUM 1531 Modified: branches/v3_1/src/compiler_lib/CompilerDriver.cpp =================================================================== --- branches/v3_1/src/compiler_lib/CompilerDriver.cpp 2009-10-01 02:18:34 UTC (rev 1531) +++ branches/v3_1/src/compiler_lib/CompilerDriver.cpp 2009-10-01 03:52:14 UTC (rev 1532) @@ -320,9 +320,7 @@ } } - if ( iface->isUnnumbered()) continue; - - if ( iface->isDyn()) + if (iface->isDyn()) { have_dynamic_interfaces=true; @@ -348,7 +346,9 @@ for (list<FWObject*>::iterator j=l3.begin(); j!=l3.end(); ++j) iface->remove(*j); } - } else + } + + if (iface->isRegular()) { // Regular interface (should have an ip address) bool no_addr_ok = false; |