From owner-freebsd-stable Mon Jul 17 12:26:10 2000 Delivered-To: freebsd-stable@freebsd.org Received: from boreas.isi.edu (boreas.isi.edu [128.9.160.161]) by hub.freebsd.org (Postfix) with ESMTP id A545F37B560 for ; Mon, 17 Jul 2000 12:26:04 -0700 (PDT) (envelope-from larse@ISI.EDU) Received: from isi.edu (hbo.isi.edu [128.9.160.75]) by boreas.isi.edu (8.9.3/8.9.3) with ESMTP id MAA15929; Mon, 17 Jul 2000 12:25:58 -0700 (PDT) Message-ID: <39735DC6.BE82F7CB@isi.edu> Date: Mon, 17 Jul 2000 12:25:58 -0700 From: Lars Eggert Organization: USC Information Sciences Institute X-Mailer: Mozilla 4.73 [en] (X11; I; FreeBSD 4.0-STABLE i386) X-Accept-Language: en, de MIME-Version: 1.0 To: snap-users@kame.net, stable@freebsd.org, xbone@ISI.EDU Subject: KAME/FreeBSD-stable merge Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Hi, is there any reason why the (misnamed, but that's another issue) XBONEHACK option was eliminated during the recent KAME/FreeBSD-stable merge? (File /usr/src/sys/net/if_gif.c.) It took us a while to get this added to KAME, and we'd really like to see it merged into FreeBSD. Below is the short patch that will do the trick. It's very simple, so I don't expect it to cause any problems: --- if_gif.c.fbsd Mon Jul 17 12:20:48 2000 +++ if_gif.c.kame Mon Jul 17 12:16:21 2000 @@ -470,12 +522,14 @@ sc2->gif_psrc->sa_family != src->sa_family || sc2->gif_psrc->sa_len != src->sa_len) continue; +#ifndef XBONEHACK /* can't configure same pair of address onto two gifs */ if (bcmp(sc2->gif_pdst, dst, dst->sa_len) == 0 && bcmp(sc2->gif_psrc, src, src->sa_len) == 0) { error = EADDRNOTAVAIL; goto bad; } +#endif /* can't configure multiple multi-dest interfaces */ #define multidest(x) \ -- Lars Eggert Information Sciences Institute http://www.isi.edu/~larse/ University of Southern California To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message