Re: sys/netinet/ipfw/ip_fw2.c:2600: error: 'fw_one_pass' undeclared

On Fri, Dec 04, 2009 at 11:10:29PM +0100, Luigi Rizzo wrote:
> On Fri, Dec 04, 2009 at 11:04:38AM -0800, David Wolfskill wrote:
> > Running
> > 
> > FreeBSD d254.dwolf.juniper.net. 9.0-CURRENT FreeBSD 9.0-CURRENT #1 r200055: Thu Dec  3 17:04:59 PST 2009     root_at_d254.dwolf.juniper.net.:/common/S4/obj/usr/src/sys/CANARY  i386
> > 
> > Sources updated to r200098; kernel build fails:
> 
> hmmm, i just completed a build with r200098
> though without vnet enabled, which may be the difference ?

Oh, yeah -- I forgot that I tweaked the kernel to supoort vimage
for Julian's demo last month.  :-}  And FWIW, my "build machine"
-- which uses neither ipfw nor vimage -- built (and booted and
smoke-tested) Just Fine.  The laptop gets a bit more of a workout.
(Especially since it can be connected to untrusted networks -- yeah,
I use IPFW on the laptop.)  :-}

And there's a reason its kernel config is called "CANARY." :-}

> Can you replace line p_fw2.c 2060 with
> -                if (fw_one_pass) {
> +                if (V_fw_one_pass) {
> and see if it fixes the problem ?

Reality check: that was ip_fw2.c:2582, yeah?  Ref.:

...
   2572         mtag = m_tag_find(m, PACKET_TAG_DIVERT, NULL);
   2573         if (args->rule) {
   2574                 /*
   2575                  * Packet has already been tagged. Look for the next rule
   2576                  * to restart processing. Make sure that args->rule still
   2577                  * exists and not changed.
   2578                  * If fw_one_pass != 0 then just accept it.
   2579                  * XXX should not happen here, but optimized out in
   2580                  * the caller.
   2581                  */
   2582                 if (V_fw_one_pass) {
   2583                         IPFW_RUNLOCK(chain);
   2584                         return (IP_FW_PASS);
   2585                 }
...

Anyway: with that change, the compile worked OK; I'll send word once I
reboot it and see if it "leaks magic smoke." :-}

> ...

Thanks!

Peace,
david
-- 
David H. Wolfskill				david_at_catwhisker.org
Depriving a girl or boy of an opportunity for education is evil.

See http://www.catwhisker.org/~david/publickey.gpg for my public key.