Attachment #380545 for bug #625770

View | Details | Raw Unified | Return to bug 625770
Collapse All | Expand All




          (new_network_number)        k='NETWORK'             ;;
          (new_broadcast_address)     k='BROADCAST'           ;;
          (new_interface_mtu)         k='MTU'                 ;;
          (new_rfc3442_classless_static_routes_formatted)
                                      k='ROUTES'              ;;
        # (new_static_routes)         k='ROUTES'              ;;
          (new_routers)               k='GATEWAYS'            ;;

}
get_ipv4_default_gw()
{
  if [ "x$new_rfc3442_classless_static_routes_formatted" != x ] ; then
    local r route=() gw=()
    for r in $new_rfc3442_classless_static_routes_formatted ; do
      route=(${r//,/ })
      case ${route[0]}/${route[1]} in
      0.0.0.0/0.0.0.0)

}
set_ipv4_routes()
{
  if [ "x$new_rfc3442_classless_static_routes_formatted" != x ] ; then
    local r route=()
    # TODO: multiple gw's to one dest as in $new_routers?
    for r in $new_rfc3442_classless_static_routes_formatted ; do
      route=(${r//,/ })
      case ${route[0]}/${route[1]} in
      0.0.0.0/0.0.0.0)

          '^[[:space:]]*DHCLIENT_SET_\(HOSTNAME\|DEFAULT_ROUTE\)=' \
          "$SYSCONFIG_CFG_DIR/dhcp" 2>/dev/null`
  fi
  if [ "x$new_rfc3442_classless_static_routes" != x ] ; then
    new_rfc3442_classless_static_routes_formatted=$(
      parse_ipv4_classless_routes $new_rfc3442_classless_static_routes
    )
  else
    unset new_rfc3442_classless_static_routes_formatted
  fi
  if [ x$new_broadcast_address != x ] ; then
    new_broadcast_arg="brd $new_broadcast_address"

Lines 30-40 Link Here

(-)dhclient.conf (-2 / +2 lines)
30	#	30	#
31	# define classless static route option	31	# define classless static route option
32	#	32	#
33	option rfc3442-classless-static-routes_raw code 121 = array of unsigned integer 8;	33	option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
34		34
35	# Request several well known/usefull dhcp options.	35	# Request several well known/usefull dhcp options.
36	request subnet-mask, broadcast-address, routers,	36	request subnet-mask, broadcast-address, routers,
37	rfc3442-classless-static-routes_raw,	37	rfc3442-classless-static-routes,
38	interface-mtu, host-name, domain-name,	38	interface-mtu, host-name, domain-name,
39	domain-name-servers, nis-domain, nis-servers,	39	domain-name-servers, nis-domain, nis-servers,
40	nds-context, nds-servers, nds-tree-name,	40	nds-context, nds-servers, nds-tree-name,

Return to bug 625770

Lines 78-84 Link Here

(-)dhclient-script (-9 / +9 lines)
78	(new_network_number) k='NETWORK' ;;	78	(new_network_number) k='NETWORK' ;;
79	(new_broadcast_address) k='BROADCAST' ;;	79	(new_broadcast_address) k='BROADCAST' ;;
80	(new_interface_mtu) k='MTU' ;;	80	(new_interface_mtu) k='MTU' ;;
81	(new_rfc3442_classless_static_routes)	81	(new_rfc3442_classless_static_routes_formatted)
82	k='ROUTES' ;;	82	k='ROUTES' ;;
83	# (new_static_routes) k='ROUTES' ;;	83	# (new_static_routes) k='ROUTES' ;;
84	(new_routers) k='GATEWAYS' ;;	84	(new_routers) k='GATEWAYS' ;;
Lines 195-203 Link Here
195	}	195	}
196	get_ipv4_default_gw()	196	get_ipv4_default_gw()
197	{	197	{
198	if [ "x$new_rfc3442_classless_static_routes" != x ] ; then	198	if [ "x$new_rfc3442_classless_static_routes_formatted" != x ] ; then
199	local r route=() gw=()	199	local r route=() gw=()
200	for r in $new_rfc3442_classless_static_routes ; do	200	for r in $new_rfc3442_classless_static_routes_formatted ; do
201	route=(${r//,/ })	201	route=(${r//,/ })
202	case ${route[0]}/${route[1]} in	202	case ${route[0]}/${route[1]} in
203	0.0.0.0/0.0.0.0)	203	0.0.0.0/0.0.0.0)
Lines 213-222 Link Here
213	}	213	}
214	set_ipv4_routes()	214	set_ipv4_routes()
215	{	215	{
216	if [ "x$new_rfc3442_classless_static_routes" != x ] ; then	216	if [ "x$new_rfc3442_classless_static_routes_formatted" != x ] ; then
217	local r route=()	217	local r route=()
218	# TODO: multiple gw's to one dest as in $new_routers?	218	# TODO: multiple gw's to one dest as in $new_routers?
219	for r in $new_rfc3442_classless_static_routes ; do	219	for r in $new_rfc3442_classless_static_routes_formatted ; do
220	route=(${r//,/ })	220	route=(${r//,/ })
221	case ${route[0]}/${route[1]} in	221	case ${route[0]}/${route[1]} in
222	0.0.0.0/0.0.0.0)	222	0.0.0.0/0.0.0.0)
Lines 323-334 Link Here
323	'^[[:space:]]*DHCLIENT_SET_\(HOSTNAME\\|DEFAULT_ROUTE\)=' \	323	'^[[:space:]]*DHCLIENT_SET_\(HOSTNAME\\|DEFAULT_ROUTE\)=' \
324	"$SYSCONFIG_CFG_DIR/dhcp" 2>/dev/null`	324	"$SYSCONFIG_CFG_DIR/dhcp" 2>/dev/null`
325	fi	325	fi
326	if [ "x$new_rfc3442_classless_static_routes_raw" != x ] ; then	326	if [ "x$new_rfc3442_classless_static_routes" != x ] ; then
327	new_rfc3442_classless_static_routes=$(	327	new_rfc3442_classless_static_routes_formatted=$(
328	parse_ipv4_classless_routes $new_rfc3442_classless_static_routes_raw	328	parse_ipv4_classless_routes $new_rfc3442_classless_static_routes
329	)	329	)
330	else	330	else
331	unset new_rfc3442_classless_static_routes	331	unset new_rfc3442_classless_static_routes_formatted
332	fi	332	fi
333	if [ x$new_broadcast_address != x ] ; then	333	if [ x$new_broadcast_address != x ] ; then
334	new_broadcast_arg="brd $new_broadcast_address"	334	new_broadcast_arg="brd $new_broadcast_address"