On Sat, Dec 08, 2001 at 02:33:31PM +0700, Eugene Grosbein wrote: > > OK, I have a proposal that should fit both opinions. I'll keep the > > net.link.ether.inet.static_arp to mean what it means now (keep ARP > > table static, no updates except from local process through a routing > > socket writes), and will add another sysctl that will switch the > > meaning of IFF_NOARP from "no arp" to "static arp on this interface". > > How about this? > > This would be the best souliution at least for us :-) > OK, enough of cooling off. :-)
The attached patch (for 5.0-CURRENT) adds the IFF_STATICARP per-interface flag, which does the obvious thing. Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software AG, [EMAIL PROTECTED] FreeBSD committer, +380.652.512.251 Simferopol, Ukraine http://www.FreeBSD.org The Power To Serve http://www.oracle.com Enabling The Information Age
Index: sys/net/if.h
===================================================================
RCS file: /home/ncvs/src/sys/net/if.h,v
retrieving revision 1.81
diff -u -p -r1.81 if.h
--- sys/net/if.h 14 Nov 2002 23:16:18 -0000 1.81
+++ sys/net/if.h 26 Dec 2002 19:57:41 -0000
@@ -150,6 +150,7 @@ struct if_data {
#define IFF_POLLING 0x10000 /* Interface is in polling mode. */
#define IFF_PPROMISC 0x20000 /* user-requested promisc mode */
#define IFF_MONITOR 0x40000 /* user-requested monitor mode */
+#define IFF_STATICARP 0x80000 /* static ARP */
/* flags set internally only: */
#define IFF_CANTCHANGE \
Index: sys/netinet/if_ether.c
===================================================================
RCS file: /home/ncvs/src/sys/netinet/if_ether.c,v
retrieving revision 1.96
diff -u -p -r1.96 if_ether.c
--- sys/netinet/if_ether.c 31 Jul 2002 16:45:16 -0000 1.96
+++ sys/netinet/if_ether.c 26 Dec 2002 19:57:41 -0000
@@ -448,12 +448,12 @@ arpresolve(ifp, rt, m, dst, desten, rt0)
return 1;
}
/*
- * If ARP is disabled on this interface, stop.
+ * If ARP is disabled or static on this interface, stop.
* XXX
* Probably should not allocate empty llinfo struct if we are
* not going to be sending out an arp request.
*/
- if (ifp->if_flags & IFF_NOARP) {
+ if (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) {
m_freem(m);
return (0);
}
@@ -654,6 +654,8 @@ match:
itaddr = myaddr;
goto reply;
}
+ if (ifp->if_flags & IFF_STATICARP)
+ goto reply;
la = arplookup(isaddr.s_addr, itaddr.s_addr == myaddr.s_addr, 0);
if (la && (rt = la->la_rt) && (sdl = SDL(rt->rt_gateway))) {
/* the following is not an error when doing bridging */
Index: sbin/ifconfig/ifconfig.8
===================================================================
RCS file: /home/ncvs/src/sbin/ifconfig/ifconfig.8,v
retrieving revision 1.66
diff -u -p -r1.66 ifconfig.8
--- sbin/ifconfig/ifconfig.8 25 Nov 2002 16:01:28 -0000 1.66
+++ sbin/ifconfig/ifconfig.8 26 Dec 2002 19:57:41 -0000
@@ -227,6 +227,18 @@ addresses and
.It Fl arp
Disable the use of the Address Resolution Protocol
.Pq Xr arp 4 .
+.It Cm staticarp
+If the Address Resolution Protocol is enabled,
+the host will only reply to requests for its addresses,
+and will never send any requests.
+.It Fl staticarp
+If the Address Resolution Protocol is enabled,
+the host will perform normally,
+sending out requests,
+listening for replies,
+and allowing gratuitous requests to update the
+.Tn ARP
+table.
.It Cm broadcast
(Inet only.)
Specify the address to use to represent broadcasts to the
Index: sbin/ifconfig/ifconfig.c
===================================================================
RCS file: /home/ncvs/src/sbin/ifconfig/ifconfig.c,v
retrieving revision 1.85
diff -u -p -r1.85 ifconfig.c
--- sbin/ifconfig/ifconfig.c 15 Nov 2002 00:02:21 -0000 1.85
+++ sbin/ifconfig/ifconfig.c 26 Dec 2002 19:57:41 -0000
@@ -243,6 +243,8 @@ struct cmd {
{ "-link2", -IFF_LINK2, setifflags },
{ "monitor", IFF_MONITOR, setifflags },
{ "-monitor", -IFF_MONITOR, setifflags },
+ { "staticarp", IFF_STATICARP, setifflags },
+ { "-staticarp", -IFF_STATICARP, setifflags },
#ifdef USE_IF_MEDIA
{ "media", NEXTARG, setmedia },
{ "mediaopt", NEXTARG, setmediaopt },
@@ -1065,7 +1067,7 @@ setifmtu(const char *val, int dummy __un
#define IFFBITS \
"\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6SMART\7RUNNING" \
"\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2" \
-"\20MULTICAST\023MONITOR"
+"\20MULTICAST\023MONITOR\024STATICARP"
#define IFCAPBITS \
"\003\1RXCSUM\2TXCSUM\3NETCONS\4VLAN_MTU\5VLAN_HWTAGGING\6JUMBO_MTU"
msg07944/pgp00000.pgp
Description: PGP signature
