[patch] Add '-a' option to tell dhcpcd to skip the ARP check

dhcpcd-2.0.5-selectarp.patch (text/plain), 2.05 KB, created by Kevin F. Quinn (RETIRED) on 2006-12-13 04:00:10 UTC

diff -u -r src.orig/arp.c src/arp.c
--- src.orig/arp.c	2006-04-21 20:56:12.000000000 +0200
+++ src/arp.c	2006-12-13 11:39:18.000000000 +0100
@@ -53,6 +53,7 @@
 extern	int		TokenRingIf;
 extern	dhcpInterface	DhcpIface;
 extern	unsigned char	ClientHwAddr[ETH_ALEN];
+extern	int		SkipArpCheck;
 
 int eth2tr(struct packed_ether_header *frame, int datalen);
 int tr2eth(struct packed_ether_header *frame);
@@ -67,6 +68,9 @@
   socklen_t slen;
   int i=0,len=0;
 
+  if (SkipArpCheck)
+    return 0;
+
   memset(&ArpMsgSend,0,sizeof(arpMessage));
   memcpy(ArpMsgSend.ethhdr.ether_dhost,MAC_BCAST_ADDR,ETH_ALEN);
   memcpy(ArpMsgSend.ethhdr.ether_shost,ClientHwAddr,ETH_ALEN);
diff -u -r src.orig/dhcpcd.8 src/dhcpcd.8
--- src.orig/dhcpcd.8	2006-04-21 20:56:13.000000000 +0200
+++ src/dhcpcd.8	2006-12-13 11:44:32.000000000 +0100
@@ -9,7 +9,7 @@
 .in +.5i
 .ti -.5i
 dhcpcd
-\%[\-knoprBCDHNRSTY]
+\%[\-aknoprBCDHNRSTY]
 \%[\-t\ <timeout>]
 \%[\-c\ <ExecFilePath>]
 \%[\-h\ <hostname>]
@@ -49,6 +49,10 @@
 
 .SH OPTIONS
 .TP
+.BI \-a
+ARP check on the IP address supplied by the DHCP server will be suppressed if
+this option is specified.
+.TP
 .BI \-k
 Sends
 .B SIGHUP
diff -u -r src.orig/dhcpcd.c src/dhcpcd.c
--- src.orig/dhcpcd.c	2006-12-13 11:40:08.000000000 +0100
+++ src/dhcpcd.c	2006-12-13 11:38:12.000000000 +0100
@@ -77,6 +77,7 @@
 int		SetDHCPDefaultRoutes=	1;
 int		Persistent	=	0;
 int		DownIfaceOnStop	=	0;
+int		SkipArpCheck	=	0;
 
 #if 0
 unsigned char	ClientMACaddr[ETH_ALEN];
@@ -158,6 +159,10 @@
 	    i++;
 	    s=1;
 	    break;
+	  case 'a':
+	    s++;
+	    SkipArpCheck = 1;
+	    goto prgs;
 	  case 'p':
 	    s++;
 	    Persistent = 1;
@@ -406,7 +411,7 @@
           default:
 usage:	    print_version();
 	    fprintf(stderr,
-"Usage: dhcpcd [-dknoprBCDHNRSTY] [-l leasetime] [-h hostname] [-t timeout]\n\
+"Usage: dhcpcd [-adknoprBCDHNRSTY] [-l leasetime] [-h hostname] [-t timeout]\n\
        [-i vendorClassID] [-I ClientID] [-c filename] [-s [ipaddr]]\n\
        [-w windowsize] [-L ConfigDir] [-G [gateway]] [-e etcDir]\n\
        [-m routeMetric] [-F none|ptr|both]\n\