Bug 125896

Summary:	[PATCH] arp manual and syntax synchronisation
Product:	Documentation	Reporter:	Marc Olzheim <marcolz>
Component:	Books & Articles	Assignee:	Tom Rhodes <trhodes>
Status:	Closed FIXED
Severity:	Affects Only Me	CC:	marcolz
Priority:	Normal
Version:	Latest
Hardware:	Any
OS:	Any

Description Marc Olzheim 2008-07-23 10:20:03 UTC

	Although it makes no sense to do so, the most recent addition to
	arp allows for both the reject and the blackhole keywords to be
	set. Some kind of warning seems appropriate. Apart from that,
	the part of the manual describing the syntax of a file passed to
	arp -f is out of sync.

Fix: 

Patch is at:
	http://www.stack.nl/~marcolz/FreeBSD/arp.20080723.patch.txt

Comment 1 Tom Rhodes freebsd_committer

2008-12-25 02:23:35 UTC

Responsible Changed
From-To: freebsd-doc->sam

Sam made the original change to arp(8), let him decide if the 
code change is correct.

Comment 2 dfilter service freebsd_committer

2008-12-25 06:44:28 UTC

Author: trhodes
Date: Thu Dec 25 06:44:19 2008
New Revision: 186485
URL: http://svn.freebsd.org/changeset/base/186485

Log:
  Print a warning when blackhole and reject are used together.
  Update arp.8 manual page syntax.
  
  PR:		125896
  Submitted by:	Marc Olzheim <marcolz@stack.nl>
  Approved by:	sam

Modified:
  head/usr.sbin/arp/arp.8
  head/usr.sbin/arp/arp.c

Modified: head/usr.sbin/arp/arp.8
==============================================================================
--- head/usr.sbin/arp/arp.8	Thu Dec 25 04:29:40 2008	(r186484)
+++ head/usr.sbin/arp/arp.8	Thu Dec 25 06:44:19 2008	(r186485)
@@ -28,7 +28,7 @@
 .\"     @(#)arp.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd March 18, 2008
+.Dd December 25, 2008
 .Dt ARP 8
 .Os
 .Sh NAME
@@ -53,14 +53,12 @@
 .Nm
 .Fl s Ar hostname ether_addr
 .Op Cm temp
-.Op Cm reject
-.Op Cm blackhole
+.Op Cm blackhole No \&| Cm reject
 .Op Cm pub Op Cm only
 .Nm
 .Fl S Ar hostname ether_addr
 .Op Cm temp
-.Op Cm reject
-.Op Cm blackhole
+.Op Cm blackhole No \&| Cm reject
 .Op Cm pub Op Cm only
 .Nm
 .Fl f Ar filename
@@ -182,7 +180,8 @@ in the file should be of the form
 .Bd -ragged -offset indent -compact
 .Ar hostname ether_addr
 .Op Cm temp
-.Op Cm pub
+.Op Cm blackhole No \&| Cm reject
+.Op Cm pub Op Cm only
 .Ed
 .Pp
 with argument meanings as given above.

Modified: head/usr.sbin/arp/arp.c
==============================================================================
--- head/usr.sbin/arp/arp.c	Thu Dec 25 04:29:40 2008	(r186484)
+++ head/usr.sbin/arp/arp.c	Thu Dec 25 06:44:19 2008	(r186485)
@@ -330,8 +330,14 @@ set(int argc, char **argv)
 				argc--; argv++;
 			}
 		} else if (strncmp(argv[0], "blackhole", 9) == 0) {
+			if (flags & RTF_REJECT) {
+				printf("Choose one of blackhole or reject, not both.\n");
+			}
 			flags |= RTF_BLACKHOLE;
 		} else if (strncmp(argv[0], "reject", 6) == 0) {
+			if (flags & RTF_BLACKHOLE) {
+				printf("Choose one of blackhole or reject, not both.\n");
+			}
 			flags |= RTF_REJECT;
 		} else if (strncmp(argv[0], "trail", 5) == 0) {
 			/* XXX deprecated and undocumented feature */
@@ -648,8 +654,8 @@ usage(void)
 		"       arp [-n] [-i interface] -a",
 		"       arp -d hostname [pub]",
 		"       arp -d [-i interface] -a",
-		"       arp -s hostname ether_addr [temp] [reject] [blackhole] [pub [only]]",
-		"       arp -S hostname ether_addr [temp] [reject] [blackhole] [pub [only]]",
+		"       arp -s hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
+		"       arp -S hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
 		"       arp -f filename");
 	exit(1);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 3 Tom Rhodes freebsd_committer

2008-12-25 06:45:44 UTC

Responsible Changed
From-To: sam->trhodes

Take this PR, change committed, thanks Sam!

Comment 4 Tom Rhodes freebsd_committer

2008-12-25 06:46:27 UTC

State Changed
From-To: open->patched

Switch open->patched.  MFC pending.

Comment 5 dfilter service freebsd_committer

2009-04-02 23:05:00 UTC

Author: trhodes
Date: Thu Apr  2 22:04:44 2009
New Revision: 190660
URL: http://svn.freebsd.org/changeset/base/190660

Log:
  nt a warning when blackhole and reject are used together.
  Update arp.8 manual page syntax.
  
  PR:		125896
  Submitted by:	Marc Olzheim <marcolz@stack.nl>
  Approved by:	re (kib), sam

Modified:
  stable/7/usr.sbin/arp/   (props changed)
  stable/7/usr.sbin/arp/arp.8
  stable/7/usr.sbin/arp/arp.c

Modified: stable/7/usr.sbin/arp/arp.8
==============================================================================
--- stable/7/usr.sbin/arp/arp.8	Thu Apr  2 21:58:34 2009	(r190659)
+++ stable/7/usr.sbin/arp/arp.8	Thu Apr  2 22:04:44 2009	(r190660)
@@ -28,7 +28,7 @@
 .\"     @(#)arp.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd March 18, 2008
+.Dd December 25, 2008
 .Dt ARP 8
 .Os
 .Sh NAME
@@ -53,14 +53,12 @@
 .Nm
 .Fl s Ar hostname ether_addr
 .Op Cm temp
-.Op Cm reject
-.Op Cm blackhole
+.Op Cm blackhole No \&| Cm reject
 .Op Cm pub Op Cm only
 .Nm
 .Fl S Ar hostname ether_addr
 .Op Cm temp
-.Op Cm reject
-.Op Cm blackhole
+.Op Cm blackhole No \&| Cm reject
 .Op Cm pub Op Cm only
 .Nm
 .Fl f Ar filename
@@ -182,7 +180,8 @@ in the file should be of the form
 .Bd -ragged -offset indent -compact
 .Ar hostname ether_addr
 .Op Cm temp
-.Op Cm pub
+.Op Cm blackhole No \&| Cm reject
+.Op Cm pub Op Cm only
 .Ed
 .Pp
 with argument meanings as given above.

Modified: stable/7/usr.sbin/arp/arp.c
==============================================================================
--- stable/7/usr.sbin/arp/arp.c	Thu Apr  2 21:58:34 2009	(r190659)
+++ stable/7/usr.sbin/arp/arp.c	Thu Apr  2 22:04:44 2009	(r190660)
@@ -330,8 +330,14 @@ set(int argc, char **argv)
 				argc--; argv++;
 			}
 		} else if (strncmp(argv[0], "blackhole", 9) == 0) {
+			if (flags & RTF_REJECT) {
+				printf("Choose one of blackhole or reject, not both.\n");
+			}
 			flags |= RTF_BLACKHOLE;
 		} else if (strncmp(argv[0], "reject", 6) == 0) {
+			if (flags & RTF_BLACKHOLE) {
+				printf("Choose one of blackhole or reject, not both.\n");
+			}
 			flags |= RTF_REJECT;
 		} else if (strncmp(argv[0], "trail", 5) == 0) {
 			/* XXX deprecated and undocumented feature */
@@ -630,8 +636,8 @@ usage(void)
 		"       arp [-n] [-i interface] -a",
 		"       arp -d hostname [pub]",
 		"       arp -d [-i interface] -a",
-		"       arp -s hostname ether_addr [temp] [reject] [blackhole] [pub [only]]",
-		"       arp -S hostname ether_addr [temp] [reject] [blackhole] [pub [only]]",
+		"       arp -s hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
+		"       arp -S hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
 		"       arp -f filename");
 	exit(1);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"

Comment 6 Tom Rhodes freebsd_committer

2009-04-02 23:07:01 UTC

State Changed
From-To: patched->closed

MFC complete, thanks for the submission!