X-Git-Url: http://git.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fview%2Fadmin_network%2Fdiagnostics.htm;h=64666880da180889fbbdab69dbf4e5da5e4211ab;hp=a991f9a48fd14895d814758eb9af3eec007d08ba;hb=839dcdc01299869bc714990c19d8e244f18318b5;hpb=31d76dbb64da3bcba3132d6246422ae50b376e5c

diff --git a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
index a991f9a48f..64666880da 100644
--- a/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
+++ b/modules/admin-full/luasrc/view/admin_network/diagnostics.htm
@@ -14,18 +14,33 @@ $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 = ""
 
 		var legend = document.getElementById('diag-rc-legend');
 		var output = document.getElementById('diag-rc-output');
 
+		if (typeof proto != 'undefined') {
+			for(var i = 0; i < proto.length; i++) {
+				if(proto[i].checked) {
+					protocol = proto[i].value;
+				}
+			}
+		}
+
 		if (legend && output)
 		{
 			output.innerHTML =
@@ -36,7 +51,7 @@ $Id$
 			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,17 +79,29 @@ $Id$
 
 			<br />
 
-			<div style="width:30%; float:left; text-align:center">
+			<div style="width:30%; float:left">
 				<input style="width: 50%" type="text" value="openwrt.org" name="ping" />
-				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping)" />
+				<input type="button" value="<%:Ping%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.ping,this.form.proto)" />
+				<% if has_ping6 then %>
+				<div style="width:100%; margin-top: 10px;">
+					<input type="radio" name="proto" value="" checked="checked" /> <%:IPv4%>
+					<input type="radio" name="proto" value="6" /> <%:IPv6%>
+				</div>
+				<%end%>
 			</div>
 
-			<div style="width:30%; float:left; text-align:center">
+			<div style="width:33%; float:left">
 				<input style="width: 50%" type="text" value="openwrt.org" name="traceroute" />
-				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute)" />
+				<input type="button" value="<%:Traceroute%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.traceroute,this.form.trproto)" />
+				<% if has_traceroute6 then %>
+				<div style="width:100%; margin-top: 10px;">
+					<input type="radio" name="trproto" value="" checked="checked" /> <%:IPv4%>
+					<input type="radio" name="trproto" value="6" /> <%:IPv6%>
+				</div>
+				<%end%>
 			</div>
 
-			<div style="width:30%; float:left; text-align:center">
+			<div style="width:33%; float:left;">
 				<input style="width: 50%" 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>