From owner-freebsd-bugs  Tue Oct  2 19:30:43 2001
Delivered-To: freebsd-bugs@freebsd.org
Received: from hot.ee.lbl.gov (hot.ee.lbl.gov [131.243.1.42])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1D02E37B405; Tue,  2 Oct 2001 19:30:38 -0700 (PDT)
Received: (from leres@localhost)
	by hot.ee.lbl.gov (8.11.5/8.11.5) id f932UbJ14999;
	Tue, 2 Oct 2001 19:30:37 -0700 (PDT)
Message-Id: <200110030230.f932UbJ14999@hot.ee.lbl.gov>
To: <ru@FreeBSD.org>
Cc: freebsd-bugs@FreeBSD.org
Subject: Re: bin/30904: [PATCH] allow route to create "proxy only" arp entries
In-reply-to: Your message of Tue, 02 Oct 2001 03:05:12 PDT.
Date: Tue, 02 Oct 2001 19:30:37 PDT
From: Craig Leres <leres@ee.lbl.gov>
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


> I have already committed your changes in route.c,v 1.51.
> Modulo the -announce (gratuitous ARP) part, which is
> turned on automatically for -proxy.  Will MFC shortly.

Looks good, thanks! (Sorry about the resubmit; the change wasn't in
4.4-RELEASE and it didn't occur to check further.)

> Please resubmit your style fixes.

Context diffs against 1.56 appended.

		Craig

===================================================================
RCS file: RCS/route.c,v
retrieving revision 1.3
diff -c -r1.3 route.c
*** route.c	2001/10/03 02:22:15	1.3
--- route.c	2001/10/03 02:22:21
***************
*** 102,123 ****
  typedef union sockunion *sup;
  int	pid, rtm_addrs;
  int	s;
! int	forcehost, forcenet, doflush, nflag, af, qflag, tflag, keyword();
  int	iflag, verbose, aflen = sizeof (struct sockaddr_in);
  int	locking, lockrest, debugonly;
  struct	rt_metrics rt_metrics;
  u_long  rtm_inits;
  uid_t	uid;
  int	atalk_aton __P((const char *, struct at_addr *));
  char	*atalk_ntoa __P((struct at_addr));
! const char	*routename(), *netname();
! void	flushroutes(), newroute(), monitor(), sockaddr(), sodump(), bprintf();
! void	print_getmsg(), print_rtmsg(), pmsg_common(), pmsg_addrs(), mask_addr();
! int	getaddr(), rtmsg(), x25_makemask();
! int	prefixlen();
! extern	char *iso_ntoa();
! 
! void usage __P((const char *)) __dead2;
  
  void
  usage(cp)
--- 102,141 ----
  typedef union sockunion *sup;
  int	pid, rtm_addrs;
  int	s;
! int	forcehost, forcenet, doflush, nflag, af, qflag, tflag;
  int	iflag, verbose, aflen = sizeof (struct sockaddr_in);
  int	locking, lockrest, debugonly;
  struct	rt_metrics rt_metrics;
  u_long  rtm_inits;
  uid_t	uid;
+ 
+ /* Forwards */
  int	atalk_aton __P((const char *, struct at_addr *));
  char	*atalk_ntoa __P((struct at_addr));
! void	bprintf __P((FILE *, int, u_char *));
! const char	*routename __P((struct sockaddr *));
! const char	*netname __P((struct sockaddr *));
! void	flushroutes __P((int, char **));
! int	getaddr __P((int, char *, struct hostent **));
! void	inet_makenetandmask __P((u_long, struct sockaddr_in *, u_long));
! void	interfaces __P((void));
! int	keyword __P((char *));
! void	mask_addr __P((void));
! void	monitor __P((void));
! void	newroute __P((int, char **));
! #ifdef NS
! char	*ns_print __P((struct sockaddr_ns *));
! #endif
! int	prefixlen __P((char *));
! void	print_getmsg __P((struct rt_msghdr *, int));
! void	print_rtmsg __P((struct rt_msghdr *, int));
! void	pmsg_common __P((struct rt_msghdr *));
! void	pmsg_addrs __P((char *, int));
! int	rtmsg __P((int, int));
! void	set_metric __P((char *, int));
! void	sockaddr __P((char *, struct sockaddr *));
! void	sodump __P((sup, char *));
! void	usage __P((const char *)) __dead2;
  
  void
  usage(cp)
***************
*** 311,319 ****
  	struct hostent *hp;
  	static char domain[MAXHOSTNAMELEN + 1];
  	static int first = 1, n;
- #ifdef NS
- 	char *ns_print();
- #endif
  
  	if (first) {
  		first = 0;
--- 329,334 ----
***************
*** 432,440 ****
  	u_long net, mask;
  	register u_long i;
  	int n, subnetshift;
- #ifdef NS
- 	char *ns_print();
- #endif
  
  	switch (sa->sa_family) {
  
--- 447,452 ----
***************
*** 1412,1418 ****
  	register char *cp;
  	register int i;
  
! 	(void) printf("   route to: %s\n", routename(&so_dst));
  	if (rtm->rtm_version != RTM_VERSION) {
  		warnx("routing message version %d not understood",
  		     rtm->rtm_version);
--- 1424,1430 ----
  	register char *cp;
  	register int i;
  
! 	(void) printf("   route to: %s\n", routename(&so_dst.sa));
  	if (rtm->rtm_version != RTM_VERSION) {
  		warnx("routing message version %d not understood",
  		     rtm->rtm_version);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message