Date: Fri, 20 Oct 2006 17:10:12 -0700 From: Julian Elischer <julian@elischer.org> To: Sam Leffler <sam@errno.com> Cc: cvs-src@FreeBSD.org, src-committers@FreeBSD.org, Julian Elischer <julian@FreeBSD.org>, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet ip_fw_pfil.c ip_input.c Message-ID: <45396564.1000402@elischer.org> In-Reply-To: <4539626F.3080003@errno.com> References: <200610201932.k9KJW8gF024621@repoman.freebsd.org> <4539616C.90901@errno.com> <4539626F.3080003@errno.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Sam Leffler wrote: > Sam Leffler wrote: >> Julian Elischer wrote: >>> julian 2006-10-20 19:32:08 UTC >>> >>> FreeBSD src repository >>> >>> Modified files: >>> sys/netinet ip_fw_pfil.c ip_input.c >>> Log: >>> Move some variables to a more likely place >>> and remove "temporary" stuff that is not needed any more. >>> >>> Revision Changes Path >>> 1.22 +8 -0 src/sys/netinet/ip_fw_pfil.c >>> http://cvsweb.FreeBSD.org/src/sys/netinet/ip_fw_pfil.c.diff?r1=1.21&r2=1.22 >>> 1.321 +0 -12 src/sys/netinet/ip_input.c >>> http://cvsweb.FreeBSD.org/src/sys/netinet/ip_input.c.diff?r1=1.320&r2=1.321 >>> >>> >> This change breaks kernels w/o PFIL_HOOKS. > > I misspoke. It requires ipfw or similar to build: > > if_ethersubr.o(.text+0x828): In function `ether_output_frame': > /usr/sam/avila/sys/net/if_ethersubr.c:386: undefined reference to > `ip_fw_chk_ptr' > if_ethersubr.o(.text+0xb20): In function `ether_ipfw_chk': > /usr/sam/avila/sys/net/if_ethersubr.c:481: undefined reference to > `fw_one_pass' > if_ethersubr.o(.text+0xb28):/usr/sam/avila/sys/net/if_ethersubr.c:481: > undefined reference to `ip_fw_chk_ptr' > if_ethersubr.o(.text+0xb2c):/usr/sam/avila/sys/net/if_ethersubr.c:481: > undefined reference to `ip_dn_io_ptr' > if_ethersubr.o(.text+0x1274): In function `ether_demux': > /usr/sam/avila/sys/net/if_ethersubr.c:830: undefined reference to > `ip_fw_chk_ptr > > That's because you moved the variable out of the ip code and into ipfw. > > Sam gotcha sorry I'll fix it.. I thought I tested all the combinations.. but I just figured out that I moved it to the wrong place.. I should have put it into pfil.c not ip_fw_pfil.c pfil.c is dependent on inet and ether. so should exist at all times that ip_input.c did, but is more relevant. (it's part of another change that I'm working on that may or may not come into the FreeBSD tree).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?45396564.1000402>