X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci2%2Fui.git;a=blobdiff_plain;f=luci2%2Fhtdocs%2Fluci2%2Fluci2.js;h=84ebf847040c5efc09ae6320f1820b3ccf9e42e6;hp=9f402570c869537f5e0b5a84a8a004d155d486fc;hb=375aa260fd22b8db29f947baf306942dc47c1c11;hpb=494a4792c64b6cf82f0f38b9108ec2ec88665fe8

diff --git a/luci2/htdocs/luci2/luci2.js b/luci2/htdocs/luci2/luci2.js
index 9f40257..84ebf84 100644
--- a/luci2/htdocs/luci2/luci2.js
+++ b/luci2/htdocs/luci2/luci2.js
@@ -387,7 +387,7 @@ function LuCI2()
 	};
 
 	this.globals = {
-		timeout:  3000,
+		timeout:  15000,
 		resource: '/luci2',
 		sid:      '00000000000000000000000000000000'
 	};
@@ -977,6 +977,42 @@ function LuCI2()
 			method: 'switch_status',
 			params: [ 'switch' ],
 			expect: { ports: [ ] }
+		}),
+
+
+		runPing: _luci2.rpc.declare({
+			object: 'luci2.network',
+			method: 'ping',
+			params: [ 'data' ],
+			expect: { '': { code: -1 } }
+		}),
+
+		runPing6: _luci2.rpc.declare({
+			object: 'luci2.network',
+			method: 'ping6',
+			params: [ 'data' ],
+			expect: { '': { code: -1 } }
+		}),
+
+		runTraceroute: _luci2.rpc.declare({
+			object: 'luci2.network',
+			method: 'traceroute',
+			params: [ 'data' ],
+			expect: { '': { code: -1 } }
+		}),
+
+		runTraceroute6: _luci2.rpc.declare({
+			object: 'luci2.network',
+			method: 'traceroute6',
+			params: [ 'data' ],
+			expect: { '': { code: -1 } }
+		}),
+
+		runNslookup: _luci2.rpc.declare({
+			object: 'luci2.network',
+			method: 'nslookup',
+			params: [ 'data' ],
+			expect: { '': { code: -1 } }
 		})
 	};
 
@@ -2664,7 +2700,9 @@ function LuCI2()
 	this.ui.devicebadge = AbstractWidget.extend({
 		render: function()
 		{
-			var dev = this.options.l3_device || this.options.device || '?';
+			var l2dev = this.options.l2_device || this.options.device;
+			var l3dev = this.options.l3_device;
+			var dev = l3dev || l2dev || '?';
 
 			var span = document.createElement('span');
 				span.className = 'ifacebadge';
@@ -2705,7 +2743,7 @@ function LuCI2()
 				var type = 'ethernet';
 				var desc = _luci2.tr('Ethernet device');
 
-				if (this.options.l3_device != this.options.device)
+				if (l3dev != l2dev)
 				{
 					type = 'tunnel';
 					desc = _luci2.tr('Tunnel interface');
@@ -2955,6 +2993,7 @@ function LuCI2()
 				}
 			}
 
+			validation.i18n('Must be a valid IPv6 address');
 			return false;
 		},