Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Aug 2009 19:07:26 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r196550 - in head: etc/defaults etc/rc.d share/man/man5
Message-ID:  <200908251907.n7PJ7QiO036868@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Tue Aug 25 19:07:26 2009
New Revision: 196550
URL: http://svn.freebsd.org/changeset/base/196550

Log:
  Add a new rc.d script, static_arp, which enables the administrator to
  statically bind IPv4 <-> MAC address at boot time.
  
  In order to use this, the administrator needs to configure the following
  rc.conf(5) variable:
  
   - static_arp_pairs: A list of names for static bind pairs, and,
   - a series of static_arp_(name): the arguments that is being passed to
     ``arp -S'' operation.
  
  Example:
    static_arp_pairs="gw"
    static_arp_gw="192.168.1.1 00:01:02:03:04:05"
  
  See the rc.conf(5) manual page for more details.
  
  Reviewed by:	-rc@
  MFC after:	2 weeks

Added:
  head/etc/rc.d/static_arp   (contents, props changed)
Modified:
  head/etc/defaults/rc.conf
  head/etc/rc.d/Makefile
  head/share/man/man5/rc.conf.5

Modified: head/etc/defaults/rc.conf
==============================================================================
--- head/etc/defaults/rc.conf	Tue Aug 25 19:04:22 2009	(r196549)
+++ head/etc/defaults/rc.conf	Tue Aug 25 19:07:26 2009	(r196550)
@@ -357,6 +357,7 @@ bsnmpd_flags=""			# Flags for bsnmpd.
 
 ### Network routing options: ###
 defaultrouter="NO"		# Set to default gateway (or NO).
+static_arp_pairs=""		# Set to static ARP list (or leave empty).
 static_routes=""		# Set to static route list (or leave empty).
 natm_static_routes=""		# Set to static route list for NATM (or leave empty).
 gateway_enable="NO"		# Set to YES if this host will be a gateway.

Modified: head/etc/rc.d/Makefile
==============================================================================
--- head/etc/rc.d/Makefile	Tue Aug 25 19:04:22 2009	(r196549)
+++ head/etc/rc.d/Makefile	Tue Aug 25 19:07:26 2009	(r196550)
@@ -32,7 +32,7 @@ FILES=	DAEMON FILESYSTEMS LOGIN NETWORKI
 	random rarpd resolv rfcomm_pppd_server root \
 	route6d routed routing rpcbind rtadvd rwho \
 	savecore sdpd securelevel sendmail \
-	serial sppp statd swap1 \
+	serial sppp statd static_arp swap1 \
 	syscons sysctl syslogd \
 	timed tmp \
 	ugidfw \

Added: head/etc/rc.d/static_arp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/etc/rc.d/static_arp	Tue Aug 25 19:07:26 2009	(r196550)
@@ -0,0 +1,71 @@
+#!/bin/sh
+#
+# Copyright (c) 2009  Xin LI <delphij@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# Configure static ARP table
+#
+# $FreeBSD$
+#
+
+# PROVIDE: static_arp
+# REQUIRE: netif
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="static_arp"
+start_cmd="static_arp_start"
+stop_cmd="static_arp_stop"
+
+static_arp_start()
+{
+	if [ -n "${static_arp_pairs}" ]; then
+		echo -n 'Binding static ARP pair(s):'
+		for e in ${static_arp_pairs}; do
+			local arp_args
+			echo -n " ${e}"
+			eval arp_args=\$static_arp_${e}
+			arp -S ${arp_args} >/dev/null 2>&1
+		done
+		echo '.'
+	fi
+}
+
+static_arp_stop()
+{
+	if [ -n "${static_arp_pairs}" ]; then
+		echo -n 'Unbinding static ARP pair(s):'
+		for e in ${static_arp_pairs}; do
+			local arp_args
+			echo -n " ${e}"
+			eval arp_args=\$static_arp_${e}
+			arp -d ${arp_args%%[ 	]*} > /dev/null 2>&1
+		done
+		echo '.'
+	fi
+}
+
+load_rc_config $name
+run_rc_command "$1"

Modified: head/share/man/man5/rc.conf.5
==============================================================================
--- head/share/man/man5/rc.conf.5	Tue Aug 25 19:04:22 2009	(r196549)
+++ head/share/man/man5/rc.conf.5	Tue Aug 25 19:07:26 2009	(r196550)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2009
+.Dd August 25, 2009
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -2227,6 +2227,22 @@ name server!).
 .Pq Vt str
 The IPv6 equivalent of
 .Va defaultrouter .
+.It Va static_arp_pairs
+.Pq Vt str
+Set to the list of static ARP pairs that are to be added at system
+boot time.
+For each whitespace separated
+.Ar element
+in the value, a
+.Va static_arp_ Ns Aq Ar element
+variable is assumed to exist whose contents will later be passed to a
+.Dq Nm arp Cm -S
+operation.
+For example
+.Bd -literal
+static_arp_pairs="gw"
+static_arp_gw="192.168.1.1 00:01:02:03:04:05"
+.Ed
 .It Va static_routes
 .Pq Vt str
 Set to the list of static routes that are to be added at system



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908251907.n7PJ7QiO036868>