aboutsummaryrefslogtreecommitdiff
path: root/etc/network.subr
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2014-09-11 12:30:29 +0000
committerHiroki Sato <hrs@FreeBSD.org>2014-09-11 12:30:29 +0000
commit15c7266a7f1d7814dca873273e5791c48bf5b755 (patch)
treedf97ed79b52bb303c1dbe97b46b064bd82e7aa7e /etc/network.subr
parentfad7eeb196426e187e33dcc412cb553f1c6ecac7 (diff)
downloadsrc-15c7266a7f1d7814dca873273e5791c48bf5b755.tar.gz
src-15c7266a7f1d7814dca873273e5791c48bf5b755.zip
- Add $netif_ipexpand_max to specify the upper limit for the number of
addresses generated by an address range specification. The default value is 2048. This can be increased by setting $netif_ipexpand_max in rc.conf. - Fix warning messages when an address range spec exceeds the upper limit. PR: 186841
Notes
Notes: svn path=/head/; revision=271424
Diffstat (limited to 'etc/network.subr')
-rw-r--r--etc/network.subr12
1 files changed, 5 insertions, 7 deletions
diff --git a/etc/network.subr b/etc/network.subr
index f67622d51efd..520c9e86a7e5 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -25,9 +25,7 @@
# $FreeBSD$
#
IFCONFIG_CMD="/sbin/ifconfig"
-
-# Maximum number of addresses expanded from a address range specification.
-_IPEXPANDMAX=31
+: ${netif_ipexpand_max:=2048}
#
# Subroutines commonly used from network startup scripts.
@@ -886,8 +884,8 @@ ifalias_expand_addr_inet()
_ipcount=$_iplow
while [ "$_ipcount" -le "$_iphigh" ]; do
_retstr="${_retstr} ${_iphead}${_iphead:+.}${_ipcount}${_iptail:+.}${_iptail}${_plen:+/}${_plen}"
- if [ $_ipcount -gt $(($_iplow + $_IPEXPANDMAX)) ]; then
- warn "Range specification is too large (${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_iphigh}${_iptail:+.}${_iptail}). ${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_ipcount}${_iptail:+.}${_iptail} was processed."
+ if [ $_ipcount -gt $(($_iplow + $netif_ipexpand_max)) ]; then
+ warn "Range specification is too large (${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_iphigh}${_iptail:+.}${_iptail}). ${_iphead}${_iphead:+.}${_iplow}${_iptail:+.}${_iptail}-${_iphead}${_iphead:+.}${_ipcount}${_iptail:+.}${_iptail} was processed. Increase \$netif_ipexpand_max in rc.conf."
break
else
_ipcount=$(($_ipcount + 1))
@@ -976,9 +974,9 @@ ifalias_expand_addr_inet6()
$_ipleft $_ipcount $_ipright \
${_plen:+/}$_plen`
_retstr="$_retstr $_r"
- if [ $_ipcount -gt $(($_iplow + $_IPEXPANDMAX)) ]
+ if [ $_ipcount -gt $(($_iplow + $netif_ipexpand_max)) ]
then
- warn "Range specification is too large $(printf '(%s:%04x%s-%s:%04x%s)' $_ipleft $_iplow $_ipright $_ipleft $_iphigh $_ipright). $(printf '%s:%04x%s-%s:%04x%s' $_ipleft $_iplow $_ipright $_ipleft $_ipcount $_ipright) was processed."
+ warn "Range specification is too large $(printf '(%s:%x%s-%s:%x%s)' "$_ipleft" "$_iplow" "$_ipright" "$_ipleft" "$_iphigh" "$_ipright"). $(printf '%s:%x%s-%s:%x%s' "$_ipleft" "$_iplow" "$_ipright" "$_ipleft" "$_ipcount" "$_ipright") was processed. Increase \$netif_ipexpand_max in rc.conf."
break
else
_ipcount=$(($_ipcount + 1))