Date: Fri, 09 Jan 1998 22:33:50 -0800 (PST) From: Simon Shapiro <shimon@simon-shapiro.org> To: Julian Elischer <julian@whistle.com> Cc: current@FreeBSD.ORG, "Jordan K.Hubbard" <jkh@time.cdrom.com>, Dennis Tenn <dstenn@fanfic.org> Subject: Re: Last night's tree breakage.. Message-ID: <XFMail.980109223350.shimon@simon-shapiro.org> In-Reply-To: <Pine.BSF.3.95.980109210141.18765A-100000@current1.whistle.com>
next in thread | previous in thread | raw e-mail | index | archive | help
There is at least another bug along these lines. In libalias.
Here is a patch:
Index: alias_db.c
===================================================================
RCS file: /Archives/FreeBSD/FreeBSD-CVS/src/lib/libalias/alias_db.c,v
retrieving revision 1.4
diff -c -r1.4 alias_db.c
*** alias_db.c 1998/01/09 21:13:34 1.4
--- alias_db.c 1998/01/10 06:19:17
***************
*** 2059,2064 ****
--- 2059,2065 ----
/* Firewall include files */
#include <sys/queue.h>
+ #include <net/if.h>
#include <netinet/ip_fw.h>
#include <string.h>
#include <err.h>
***************
*** 2168,2188 ****
/* Build and apply specific part of the rules */
rule.fw_src = GetOriginalAddress(link);
rule.fw_dst = GetDestAddress(link);
! rule.fw_pts[0] = ntohs(GetOriginalPort(link));
! rule.fw_pts[1] = ntohs(GetDestPort(link));
/* Skip non-bound links - XXX should not be strictly necessary,
but seems to leave hole if not done. Leak of non-bound links?
(Code should be left even if the problem is fixed - it is a
clear optimization) */
! if (rule.fw_pts[0] != 0 && rule.fw_pts[1] != 0) {
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof
rule);
if (r)
err(1, "alias punch inbound(1) setsockopt(IP_FW_ADD)");
rule.fw_src = GetDestAddress(link);
rule.fw_dst = GetOriginalAddress(link);
! rule.fw_pts[0] = ntohs(GetDestPort(link));
! rule.fw_pts[1] = ntohs(GetOriginalPort(link));
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof
rule);
if (r)
err(1, "alias punch inbound(2) setsockopt(IP_FW_ADD)");
--- 2169,2189 ----
/* Build and apply specific part of the rules */
rule.fw_src = GetOriginalAddress(link);
rule.fw_dst = GetDestAddress(link);
! rule.fw_uar.fw_pts[0] = ntohs(GetOriginalPort(link));
! rule.fw_uar.fw_pts[1] = ntohs(GetDestPort(link));
/* Skip non-bound links - XXX should not be strictly necessary,
but seems to leave hole if not done. Leak of non-bound links?
(Code should be left even if the problem is fixed - it is a
clear optimization) */
! if (rule.fw_uar.fw_pts[0] != 0 && rule.fw_uar.fw_pts[1] != 0) {
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof
rule);
if (r)
err(1, "alias punch inbound(1) setsockopt(IP_FW_ADD)");
rule.fw_src = GetDestAddress(link);
rule.fw_dst = GetOriginalAddress(link);
! rule.fw_uar.fw_pts[0] = ntohs(GetDestPort(link));
! rule.fw_uar.fw_pts[1] = ntohs(GetOriginalPort(link));
r = setsockopt(fireWallFD, IPPROTO_IP, IP_FW_ADD, &rule, sizeof
rule);
if (r)
err(1, "alias punch inbound(2) setsockopt(IP_FW_ADD)");
On 10-Jan-98 Julian Elischer wrote:
> A structure was moved from if.h to if_arp.h yesterday
> (actually a sensible move) but the mover admitted he hadn't tested
> a 'make world' yet...
> probably a result of that..
>
> julian
>
>
> On Fri, 9 Jan 1998, Dennis Tenn wrote:
>
>> On Fri, 9 Jan 1998, Jordan K. Hubbard wrote:
>>
>> | ===> libexec/bootpd
>> | ...
>> | /src/tmp/usr/include -c /usr/src/libexec/bootpd/hwaddr.c
>> | In file included from /usr/src/libexec/bootpd/hwaddr.c:27:
>> | /usr/obj/usr/src/tmp/usr/include/net/if_arp.h:100: field `ac_if' has
>> | incomplete
>> | type
>> | /usr/obj/usr/src/tmp/usr/include/net/if_arp.h:101: `ETHER_ADDR_LEN'
>> | undeclared here (not in a function)
>> | *** Error code 1
>>
>> You too?! Hrm.. Is this a bug?
>>
>> =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
>> Dennis Tenn * There will always come a time
>> dstenn@fanfic.org * When your love will be tested
>> * Stand tall and rise to the occasion
>> * For only then will you grow strong.
>> =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
>>
>>
>
----------
Sincerely Yours,
Simon Shapiro
Shimon@Simon-Shapiro.ORG Voice: 503.799.2313
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?XFMail.980109223350.shimon>