From owner-freebsd-current Fri Jan 9 22:21:47 1998 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id WAA24885 for current-outgoing; Fri, 9 Jan 1998 22:21:47 -0800 (PST) (envelope-from owner-freebsd-current) Received: from nomis.simon-shapiro.org ([206.190.143.100]) by hub.freebsd.org (8.8.7/8.8.7) with SMTP id WAA24880 for ; Fri, 9 Jan 1998 22:21:41 -0800 (PST) (envelope-from shimon@nomis.Simon-Shapiro.ORG) Received: (qmail 27748 invoked by uid 1000); 10 Jan 1998 06:22:00 -0000 Message-ID: X-Mailer: XFMail 1.3-alpha-010198 [p0] on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <12437.884399561@time.cdrom.com> Date: Fri, 09 Jan 1998 22:22:00 -0800 (PST) Reply-To: shimon@simon-shapiro.org Organization: The Simon Shapiro Foundation From: Simon Shapiro To: "Jordan K. Hubbard" Subject: RE: Last night's tree breakage.. Cc: current@FreeBSD.ORG Sender: owner-freebsd-current@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk On 10-Jan-98 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 Add to that also: cc -O -pipe -Wall -I/usr/src/3.0/src/lib/libalias -I/usr/obj/usr/src/3.0/src/tmp/usr/include -c /usr/src/3.0/src/lib/libalias/alias_db.c -o alias_db.o /usr/src/3.0/src/lib/libalias/alias_db.c: In function `PunchFWHole': /usr/src/3.0/src/lib/libalias/alias_db.c:2172: structure has no member named `fw_pts' /usr/src/3.0/src/lib/libalias/alias_db.c:2173: structure has no member named `fw_pts' /usr/src/3.0/src/lib/libalias/alias_db.c:2179: structure has no member named `fw_pts' /usr/src/3.0/src/lib/libalias/alias_db.c:2179: structure has no member named `fw_pts' /usr/src/3.0/src/lib/libalias/alias_db.c:2185: structure has no member named `fw_pts' /usr/src/3.0/src/lib/libalias/alias_db.c:2186: structure has no member named `fw_pts' *** Error code 1 Which is solved by this 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 + #include #include #include #include *************** *** 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)"); The original but, I think I indicated a solution is a previous mailing. ---------- Sincerely Yours, Simon Shapiro Shimon@Simon-Shapiro.ORG Voice: 503.799.2313