X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fdiagnostics.htm;h=d1bef2a8b7936d12b747921b1d97b6c5c73402b2;hb=d2c188278629fa51f894a836947dbac5d691a6dd;hp=304e71741931d6eea19e4434a16498ea89895cd1;hpb=23da14d3031ff796adedfd8bf122b4dae48fcdbc;p=project%2Fluci.git

diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
index 304e71741..d1bef2a8b 100644
--- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -14,14 +14,21 @@ $Id$
 
 <%+header%>
 
+<%
+local fs   = require "nixio.fs"
+local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6")
+local has_traceroute6 = fs.access("/usr/bin/traceroute6")
+%>
+
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript">//<![CDATA[
 	var stxhr = new XHR();
 
-	function update_status(field)
+	function update_status(field, proto)
 	{
 		var tool = field.name;
 		var addr = field.value;
+		var protocol = proto ? "6" : "";
 
 		var legend = document.getElementById('diag-rc-legend');
 		var output = document.getElementById('diag-rc-output');
@@ -30,13 +37,13 @@ $Id$
 		{
 			output.innerHTML =
 				'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> ' +
-				'<%:Waiting for router...%>'
+				'<%:Waiting for command to complete...%>'
 			;
 
-			legend.style.display = null;
 			legend.parentNode.style.display = 'block';
+			legend.style.display = 'inline';
 
-			stxhr.get('<%=luci.dispatcher.build_url("admin", "network")%>/diag_' + tool + '/' + addr, null,
+			stxhr.get('<%=luci.dispatcher.build_url("admin", "network")%>/diag_' + tool + protocol + '/' + addr, null,
 				function(x)
 				{
 					if (x.responseText)
@@ -64,19 +71,39 @@ $Id$
 
 			<br />
 
-			<div style="width:30%; float:left; text-align:center">
-				<input class="cbi-input-text" type="text" value="openwrt.org" name="ping" />
-				<input type="button" value="Ping" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+			<div style="width:30%; float:left">
+				<input style="margin: 5px 0" type="text" value="openwrt.org" name="ping" /><br />
+				<% if has_ping6 then %>
+				<select name="ping_proto" style="width:auto">
+					<option value="" selected="selected"><%:IPv4%></option>
+					<option value="6"><%:IPv6%></option>
+				</select>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping, this.form.ping_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+				<% end %>
 			</div>
 
-			<div style="width:30%; float:left; text-align:center">
-				<input class="cbi-input-text" type="text" value="openwrt.org" name="traceroute" />
-				<input type="button" value="Traceroute" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+			<div style="width:33%; float:left">
+				<input style="margin: 5px 0" type="text" value="openwrt.org" name="traceroute" /><br />
+				<% if has_traceroute6 then %>
+				<select name="traceroute_proto" style="width:auto">
+					<option value="" selected="selected"><%:IPv4%></option>
+					<option value="6"><%:IPv6%></option>
+				</select>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute, this.form.traceroute_proto.selectedIndex)" />
+				<% else %>
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+				<% end %>
+				<% if not has_traceroute6 then %>
+					<p>&#160;</p>
+					<p><%:Install iputils-traceroute6 for IPv6 traceroute%></p>
+				<% end %>
 			</div>
 
-			<div style="width:30%; float:left; text-align:center">
-				<input class="cbi-input-text" type="text" value="openwrt.org" name="nslookup" />
-				<input type="button" value="Nslookup" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
+			<div style="width:33%; float:left;">
+				<input style="margin: 5px 0" type="text" value="openwrt.org" name="nslookup" /><br />
+				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
 			</div>
 
 			<br style="clear:both" /><br />