--- services_router_advertisements.php.orig	2013-09-12 00:20:11.000000000 +0200
+++ services_router_advertisements.php	2014-06-01 03:40:58.757814500 +0200
@@ -98,13 +98,16 @@
 	$pconfig['radomainsearchlist'] = $config['dhcpdv6'][$if]['radomainsearchlist'];
 	list($pconfig['radns1'],$pconfig['radns2']) = $config['dhcpdv6'][$if]['radnsserver'];
 	$pconfig['rasamednsasdhcp6'] = isset($config['dhcpdv6'][$if]['rasamednsasdhcp6']);
 
 	$pconfig['subnets'] = $config['dhcpdv6'][$if]['subnets']['item'];
+	$pconfig['routes'] = $config['dhcpdv6'][$if]['routes']['item'];
 }
 if (!is_array($pconfig['subnets']))
 	$pconfig['subnets'] = array();
+if (!is_array($pconfig['routes']))
+	$pconfig['routes'] = array();
 
 $advertise_modes = array("disabled" => "Disabled",
 			 "router" => "Router Only",
 			 "unmanaged" => "Unmanaged",
 			 "managed" => "Managed",
@@ -116,10 +119,15 @@
 
 $subnets_help = gettext("Subnets are specified in CIDR format.  " .
 			"Select the CIDR mask that pertains to each entry.  " .
 			"/128 specifies a single IPv6 host; /64 specifies a normal IPv6 network; etc.  " .
 			"If no subnets are specified here, the Router Advertisement (RA) Daemon will advertise to the subnet to which the router's interface is assigned.");
+			
+$routes_help = gettext("Routes are specified in CIDR format. " .
+			"Enter subnets to which routes should be advertised, and their priority. " .
+			"If you need a default route, specify it with ::/0 here.  " .
+			"If no routes are specified here, the Router Advertisement (RA) Daemon will advertise only the default route.");
 
 if ($_POST) {
 	unset($input_errors);
 
 	$pconfig = $_POST;
@@ -142,11 +150,34 @@
 			$pconfig['subnets'][] = $address . "/" . $bits;
 			if (!is_ipaddrv6($address))
 				$input_errors[] = sprintf(gettext("An invalid subnet or alias was specified. [%s/%s]"), $address, $bits);
 		}
 	}
+	
+	$pconfig['routes'] = array();
+	for ($x = 0; $x < 5000; $x += 1) {
+		$address = trim($_POST['route_address' . $x]);
+		if ($address === "")
+			continue;
+
+		$bits = trim($_POST['route_bits' . $x]);
+		if ($bits === "")
+			$bits = "128";
+			
+		$priority = trim($_POST['route_priority' . $x]);
+		if ($priority === "")
+			$priority = "medium";
 
+		if (is_alias($address)) {
+			$pconfig['routes'][] = array('destination' => $address);
+		} else {
+			$pconfig['routes'][] = array('destination' => $address . "/" . $bits, 'priority' => $priority);
+			if (!is_ipaddrv6($address))
+				$input_errors[] = sprintf(gettext("An invalid route was specified. [%s/%s]"), $address, $bits);
+		}
+	}
+	
 	if (($_POST['radns1'] && !is_ipaddrv6($_POST['radns1'])) || ($_POST['radns2'] && !is_ipaddrv6($_POST['radns2'])))
 		$input_errors[] = gettext("A valid IPv6 address must be specified for the primary/secondary DNS servers.");
 	if ($_POST['radomainsearchlist']) {
 		$domain_array=preg_split("/[ ;]+/",$_POST['radomainsearchlist']);
 		foreach ($domain_array as $curdomain) {
@@ -177,10 +208,16 @@
 		if (count($pconfig['subnets'])) {
 			$config['dhcpdv6'][$if]['subnets']['item'] = $pconfig['subnets'];
 		} else {
 			unset($config['dhcpdv6'][$if]['subnets']);
 		}
+		if (count($pconfig['routes'])) {
+			$config['dhcpdv6'][$if]['routes']['item'] = $pconfig['routes'];
+		} else {
+			unset($config['dhcpdv6'][$if]['routes']);
+		}
+
 
 		write_config();
 		$retval = services_radvd_configure();
 		$savemsg = get_std_save_message($retval);
 	}
@@ -200,22 +237,62 @@
 <script type="text/javascript" src="/javascript/autosuggest.js">
 </script>
 <script type="text/javascript" src="/javascript/suggestions.js">
 </script>
 <script type="text/javascript">
-	rowname[0] = "subnet_address";
-	rowtype[0] = "textbox";
-	rowsize[0] = "30";
-	rowname[1] = "subnet_bits";
-	rowtype[1] = "select";
-	rowsize[1] = "1";
-	function add_alias_control() {
-		var name = "subnet_address" + (totalrows - 1);
+	function addrow_maintable () {
+		field_counter_js = 2;
+		rowname[0] = "subnet_address";
+		rowtype[0] = "textbox";
+		rowsize[0] = "30";
+		rowname[1] = "subnet_bits";
+		rowtype[1] = "select";
+		rowsize[1] = "1";
+		totalrows = totalrows_maintable;
+		addRowTo('maintable');
+		totalrows_maintable = totalrows;
+	}
+	function add_alias_control_maintable() {
+		var name = "subnet_address" + (totalrows_maintable - 1);
 		obj = document.getElementById(name);
 		obj.setAttribute('class', 'formfldalias');
 		obj.setAttribute('autocomplete', 'off');
-		objAlias[totalrows - 1] = new AutoSuggestControl(obj, new StateSuggestions(addressarray));
+		objAlias[totalrows_maintable - 1] = new AutoSuggestControl(obj, new StateSuggestions(addressarray));
+	}
+	function addrow_routetable () {
+		var opt = document.createElement("option");
+		field_counter_js = 3;
+		rowname[0] = "route_address";
+		rowtype[0] = "textbox";
+		rowsize[0] = "30";
+		rowname[1] = "route_bits";
+		rowtype[1] = "select";
+		rowsize[1] = "1";
+		rowname[2] = "route_priority";
+		rowtype[2] = function (r_name, r_size, t_rows) {
+						var str;
+						<?php foreach($priority_modes as $name => $value) { ?>
+						str = str + "<option value=\"" + "<?=$name ?>" + "\" >" + "<?=$value ?>"  + "</option>";
+						<?php } ?>
+						str = "<select size='" + r_size + "' name='" + r_name + t_rows + "' id='" + r_name + t_rows + "'>" + str + "</select> ";
+						return str
+					}
+		rowsize[2] = "1";
+		totalrows = totalrows_routetable;
+		addRowTo('routetable');
+		totalrows_routetable = totalrows;
+		obj = document.getElementById("route_bits" + (totalrows_routetable - 1));
+		obj.options.add(opt);
+		opt.text = "0";
+		opt.value = 0;
+	}
+	function add_alias_control_routetable() {
+		var name = "route_address" + (totalrows_routetable - 1);
+		obj = document.getElementById(name);
+		obj.setAttribute('class', 'formfldalias');
+		obj.setAttribute('autocomplete', 'off');
+		objAlias[totalrows_routetable - 1] = new AutoSuggestControl(obj, new StateSuggestions(addressarray));
 	}
 </script>
 
 <form action="services_router_advertisements.php" method="post" name="iform" id="iform">
 <?php if ($input_errors) print_input_errors($input_errors); ?>
@@ -343,15 +420,69 @@
 				}
 ?>
 				</tbody>
 				</table>
 				<script type="text/javascript">
-					field_counter_js = 2;
-					totalrows = <?= $counter ?>;
+					totalrows_maintable = <?= $counter ?>;
 				</script>
 				<div id="addrowbutton">
-					<a onclick="javascript:addRowTo('maintable'); add_alias_control(); return false;" href="#"><!--
+					<a onclick="javascript:addrow_maintable(); add_alias_control_maintable(); return false;" href="#"><!--
+					--><img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry"); ?>" /></a>
+				</div>
+			</td>
+			</tr>
+			
+			<tr>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Routes");?></td>
+			<td width="78%" class="vtable">
+				<div><?= htmlentities($routes_help) ?></div>
+				<table id="routetable">
+				<tbody>
+<?php
+				$route_counter = 0;
+				foreach ($pconfig['routes'] as $route) {
+					$route_address_name = "route_address" . $route_counter;
+					$route_bits_name = "route_bits" . $route_counter;
+					$route_priority_name = "route_priority" . $route_counter;
+					list($address, $mask) = explode("/", $route['destination']);
+					$priority = $route['priority'];
+?>
+					<tr>
+						<td>
+							<input autocomplete="off" name="<?= $route_address_name ?>" type="text" class="formfldalias" id="<?= $route_address_name ?>" size="30" value="<?= htmlentities($address) ?>" />
+						</td>
+						<td>
+							<select name="<?= $route_bits_name ?>" class="formselect" id="<?= $route_bits_name ?>">
+							<option value="">
+							<?php for ($i = 128; $i >= 0; $i -= 1) { ?>
+								<option value="<?= $i ?>" <?= ("$mask" === "$i") ? "selected='selected'" : "" ?>><?= $i ?></option>
+							<?php } ?>
+							</select>
+						</td>
+						<td>
+							<select name="<?= $route_priority_name ?>" class="formselect" id="<?= $route_priority_name ?>">
+							<option value="">
+							<?php foreach($priority_modes as $name => $value) { ?>
+								<option value="<?=$name ?>" <?php if ($priority == $name) echo "selected='selected'" ?> > <?=$value ?></option>
+							<?php } ?>
+							</select>
+						</td>
+						<td>
+							<a onclick="removeRow(this); return false;" href="#"><img border="0" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" alt="" title="<?=gettext("remove this entry"); ?>" /></a>
+						</td>
+					</tr>
+<?php
+					$route_counter += 1;
+				}
+?>
+				</tbody>
+				</table>
+				<script type="text/javascript">
+					totalrows_routetable = <?= $route_counter ?>;
+				</script>
+				<div id="addrowbutton">
+					<a onclick="javascript:addrow_routetable(); add_alias_control_routetable(); return false;" href="#"><!--
 					--><img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry"); ?>" /></a>
 				</div>
 			</td>
 			</tr>
 
@@ -424,10 +555,13 @@
 	var objAlias = [];
 	function createAutoSuggest () {
 		<?php for ($i = 0; $i < $counter; $i += 1) { ?>
 			objAlias.push(new AutoSuggestControl(document.getElementById('subnet_address<?= $i ?>'), new StateSuggestions(addressarray)));
 		<?php } ?>
+		<?php for ($i = 0; $i < $route_counter; $i += 1) { ?>
+			objAlias.push(new AutoSuggestControl(document.getElementById('route_address<?= $i ?>'), new StateSuggestions(addressarray)));
+		<?php } ?>
 		new AutoSuggestControl(document.getElementById('radns1'), new StateSuggestions(addressarray));
 		new AutoSuggestControl(document.getElementById('radns2'), new StateSuggestions(addressarray));
 	}
 	setTimeout(createAutoSuggest, 500);
 //]]>