bin/139346: [patch] add arp option to remove static entries listed in file

[Gleb Kurtsou]

>Number:         139346
>Category:       bin
>Synopsis:       [patch] add arp option to remove static entries listed in file
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 04 10:50:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Gleb Kurtsou
>Release:        
>Organization:
>Environment:
FreeBSD tops 9.0-CURRENT FreeBSD 9.0-CURRENT #7 r197735+8fb35f6: Sat Oct  3 21:22:17 EEST 2009     root at tops:/usr/obj/usr/freebsd-src/local/sys/TOPS  amd64
>Description:
Add 'arp -d -f file' option to remove static entries listed in file.
Basically it reverts 'arp -f file'

Was discussed in this thread: http://lists.freebsd.org/pipermail/svn-src-head/2009-August/009923.html
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
index 8a3410f..11d1df6 100644
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -101,7 +101,7 @@ static int valid_type(int type);
 static int nflag;	/* no reverse dns lookups */
 static char *rifname;
 
-static int	expire_time, flags, doing_proxy, proxy_only;
+static int	expire_time, flags, func, doing_proxy, proxy_only;
 
 /* which function we're supposed to do */
 #define F_GET		1
@@ -109,23 +109,28 @@ static int	expire_time, flags, doing_proxy, proxy_only;
 #define F_FILESET	3
 #define F_REPLACE	4
 #define F_DELETE	5
+#define F_FILEDELETE	6
 
 #define SETFUNC(f)	{ if (func) usage(); func = (f); }
 
 int
 main(int argc, char *argv[])
 {
-	int ch, func = 0;
+	int ch;
 	int rtn = 0;
 	int aflag = 0;	/* do it for all entries */
 
+	func = 0;
 	while ((ch = getopt(argc, argv, "andfsSi:")) != -1)
 		switch(ch) {
 		case 'a':
 			aflag = 1;
 			break;
 		case 'd':
-			SETFUNC(F_DELETE);
+			if (func == F_FILESET)
+				func = F_FILEDELETE;
+			else 
+				SETFUNC(F_DELETE);
 			break;
 		case 'n':
 			nflag = 1;
@@ -137,7 +142,10 @@ main(int argc, char *argv[])
 			SETFUNC(F_SET);
 			break;
 		case 'f' :
-			SETFUNC(F_FILESET);
+			if (func == F_DELETE)
+				func = F_FILEDELETE;
+			else
+				SETFUNC(F_FILESET);
 			break;
 		case 'i':
 			rifname = optarg;
@@ -197,6 +205,7 @@ main(int argc, char *argv[])
 		}
 		break;
 	case F_FILESET:
+	case F_FILEDELETE:
 		if (argc != 1)
 			usage();
 		rtn = file(argv[0]);
@@ -213,7 +222,7 @@ static int
 file(char *name)
 {
 	FILE *fp;
-	int i, retval;
+	int i, j, retval;
 	char line[100], arg[5][50], *args[5], *p;
 
 	if ((fp = fopen(name, "r")) == NULL)
@@ -237,8 +246,23 @@ file(char *name)
 			retval = 1;
 			continue;
 		}
-		if (set(i, args))
-			retval = 1;
+		switch (func) {
+		case F_FILESET:
+			if (set(i, args))
+				retval = 1;
+			break;
+		case F_FILEDELETE:
+			for (j = 2; j < i; j++)
+				if (strncmp(args[j], "pub", 3) == 0) {
+					j = 0;
+					break;
+				}
+			if (delete(args[0], j == 0 ? SIN_PROXY : 0))
+				retval = 1;
+			break;
+		default:
+			usage();
+		}
 	}
 	fclose(fp);
 	return (retval);
@@ -650,11 +674,12 @@ nuke_entry(struct sockaddr_dl *sdl __unused,
 static void
 usage(void)
 {
-	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
+	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
 		"usage: arp [-n] [-i interface] hostname",
 		"       arp [-n] [-i interface] -a",
 		"       arp -d hostname [pub]",
 		"       arp -d [-i interface] -a",
+		"       arp -d -f filename",
 		"       arp -s hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
 		"       arp -S hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
 		"       arp -f filename");


>Release-Note:
>Audit-Trail:
>Unformatted: