Revision 144:7106252b7abf, committed 2020-12-26

Comitter:

andrewboyson

Date:

Sat Dec 26 20:02:22 2020 +0000

Parent:

143:cc2e148cb96a

Child:

145:d2bd78be00b2

Commit message:

Moved name resolution web info from IPv4 and IPv6 pages to general net page.

Changed in this revision

--- a/base/net/web-net-script.inc	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net-script.inc	Sat Dec 26 20:02:22 2020 +0000
@@ -62,6 +62,11 @@
 "    dns += fields[4];\n"
 "    dns += '\\r\\n';\n"
 "}\n"
+"function parseDnsLines(text)\n"
+"{\n"
+"    dns = '';\n"
+"    text.split('\\n').forEach(parseDnsLine);\n"
+"}\n"
 "function parseGenLines(text)\n"
 "{\n"
 "    let lines = text.split('\\n');\n"

--- a/base/net/web-net-script.js	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net-script.js	Sat Dec 26 20:02:22 2020 +0000
@@ -62,6 +62,11 @@
     dns += fields[4];
     dns += '\r\n';
 }
+function parseDnsLines(text)
+{
+    dns = '';
+    text.split('\n').forEach(parseDnsLine);
+}
 function parseGenLines(text)
 {
     let lines = text.split('\n');

--- a/base/net/web-net4-ajax.c	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net4-ajax.c	Sat Dec 26 20:02:22 2020 +0000
@@ -25,7 +25,4 @@
     HttpAddChar('\f');
     
     Ar4SendAjax();
-    HttpAddChar('\f');
-    
-    NrSendAjax();
 }

--- a/base/net/web-net4-html.c	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net4-html.c	Sat Dec 26 20:02:22 2020 +0000
@@ -11,8 +11,6 @@
     
     WebAddH2("ARP");
     HttpAddText("<code id='ajax-arp'></code>\r\n");
-    WebAddH2("DNS");
-    HttpAddText("<code id='ajax-dns'></code>\r\n");
     
     WebAddH2("DHCP");
     WebAddAjaxLabelled("IP4 address",   "ajax-local-ip"    );

--- a/base/net/web-net4-script.inc	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net4-script.inc	Sat Dec 26 20:02:22 2020 +0000
@@ -15,7 +15,6 @@
 "let renewalt2   = '';\n"
 "let elapsed     = '';\n"
 "let arp         = '';\n"
-"let dns         = '';\n"
 "\n"
 "function parseArpLine(line)\n"
 "{\n"
@@ -35,33 +34,11 @@
 "    \n"
 "    arp += '\\r\\n';\n"
 "}\n"
-"function parseDnsLine(line)\n"
-"{\n"
-"    if (line.length == 0) return;\n"
-"    let fields = line.split('\\t');\n"
-"    \n"
-"    dns += parseInt(fields[0], 16).toString().padStart(2, ' ');\n"
-"    \n"
-"    let minutes  = parseInt(fields[1], 16) / 1000 / 60;\n"
-"    dns += Math.floor(minutes).toString().padStart(4, ' ');\n"
-"    dns += ' ';\n"
-"    dns += Net.makeIp4(fields[2]).padEnd(15, ' ');\n"
-"    dns += ' ';\n"
-"    dns += fields[3];\n"
-"    dns += ' ';\n"
-"    dns += fields[4];\n"
-"    dns += '\\r\\n';\n"
-"}\n"
 "function parseArpLines(text)\n"
 "{\n"
 "    arp = '';\n"
 "    text.split('\\n').forEach(parseArpLine);\n"
 "}\n"
-"function parseDnsLines(text)\n"
-"{\n"
-"    dns = '';\n"
-"    text.split('\\n').forEach(parseDnsLine);\n"
-"}\n"
 "function parseGenLines(text)\n"
 "{\n"
 "    let lines = text.split('\\n');\n"
@@ -84,7 +61,6 @@
 "    let topics = Ajax.response.split('\\f');\n"
 "    parseGenLines(topics[0]);\n"
 "    parseArpLines(topics[1]);\n"
-"    parseDnsLines(topics[2]);\n"
 "}\n"
 "function display()\n"
 "{\n"
@@ -104,7 +80,6 @@
 "    elem = Ajax.getElementOrNull('ajax-renewal-t2'  ); if (elem) elem.textContent = renewalt2;\n"
 "    elem = Ajax.getElementOrNull('ajax-elapsed'     ); if (elem) elem.textContent = elapsed;\n"
 "    elem = Ajax.getElementOrNull('ajax-arp'         ); if (elem) elem.textContent = arp;\n"
-"    elem = Ajax.getElementOrNull('ajax-dns'         ); if (elem) elem.textContent = dns;\n"
 "}\n"
 "\n"
 "Ajax.server     = '/net4-ajax';\n"

--- a/base/net/web-net4-script.js	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net4-script.js	Sat Dec 26 20:02:22 2020 +0000
@@ -15,7 +15,6 @@
 let renewalt2   = '';
 let elapsed     = '';
 let arp         = '';
-let dns         = '';
 
 function parseArpLine(line)
 {
@@ -35,33 +34,11 @@
     
     arp += '\r\n';
 }
-function parseDnsLine(line)
-{
-    if (line.length == 0) return;
-    let fields = line.split('\t');
-    
-    dns += parseInt(fields[0], 16).toString().padStart(2, ' ');
-    
-    let minutes  = parseInt(fields[1], 16) / 1000 / 60;
-    dns += Math.floor(minutes).toString().padStart(4, ' ');
-    dns += ' ';
-    dns += Net.makeIp4(fields[2]).padEnd(15, ' ');
-    dns += ' ';
-    dns += fields[3];
-    dns += ' ';
-    dns += fields[4];
-    dns += '\r\n';
-}
 function parseArpLines(text)
 {
     arp = '';
     text.split('\n').forEach(parseArpLine);
 }
-function parseDnsLines(text)
-{
-    dns = '';
-    text.split('\n').forEach(parseDnsLine);
-}
 function parseGenLines(text)
 {
     let lines = text.split('\n');
@@ -84,7 +61,6 @@
     let topics = Ajax.response.split('\f');
     parseGenLines(topics[0]);
     parseArpLines(topics[1]);
-    parseDnsLines(topics[2]);
 }
 function display()
 {
@@ -104,7 +80,6 @@
     elem = Ajax.getElementOrNull('ajax-renewal-t2'  ); if (elem) elem.textContent = renewalt2;
     elem = Ajax.getElementOrNull('ajax-elapsed'     ); if (elem) elem.textContent = elapsed;
     elem = Ajax.getElementOrNull('ajax-arp'         ); if (elem) elem.textContent = arp;
-    elem = Ajax.getElementOrNull('ajax-dns'         ); if (elem) elem.textContent = dns;
 }
 
 Ajax.server     = '/net4-ajax';

--- a/base/net/web-net6-ajax.c	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net6-ajax.c	Sat Dec 26 20:02:22 2020 +0000
@@ -54,7 +54,4 @@
     HttpAddChar('\f');
     
     Ar6SendAjax();
-    HttpAddChar('\f');
-    
-    NrSendAjax();
 }

--- a/base/net/web-net6-html.c	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net6-html.c	Sat Dec 26 20:02:22 2020 +0000
@@ -12,9 +12,6 @@
     WebAddH2("NDP - Neighbour Advertisement");
     HttpAddText("<code id='ajax-arp'></code>\r\n");
     
-    WebAddH2("DNS");
-    HttpAddText("<code id='ajax-dns'></code>\r\n");
-    
     WebAddH2("Link local");
     WebAddAjaxLabelled("SLAAC",                 "ajax-slaac");
     

--- a/base/net/web-net6-script.inc	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net6-script.inc	Sat Dec 26 20:02:22 2020 +0000
@@ -2,7 +2,6 @@
 "'use strict';\n"
 "\n"
 "let arp             = '';\n"
-"let dns             = '';\n"
 "\n"
 "let hopLimit        = '';\n"
 "let mtu             = '';\n"
@@ -45,32 +44,11 @@
 "    arp += Net.makeMac(fields[3]);\n"
 "    arp += '\\r\\n';\n"
 "}\n"
-"function parseDnsLine(line)\n"
-"{\n"
-"    if (line.length == 0) return;\n"
-"    let fields = line.split('\\t');\n"
-"    \n"
-"    dns += parseInt(fields[0], 16).toString().padStart(2, ' ');\n"
-"    let minutes  = parseInt(fields[1], 16) / 1000 / 60;\n"
-"    dns += Math.floor(minutes).toString().padStart(4, ' ');\n"
-"    dns += ' ';\n"
-"    dns += Net.makeIp6(fields[2]).padEnd(40, ' ');\n"
-"    dns += ' ';\n"
-"    dns += fields[3];\n"
-"    dns += ' ';\n"
-"    dns += fields[4];\n"
-"    dns += '\\r\\n';\n"
-"}\n"
 "function parseArpLines(text)\n"
 "{\n"
 "    arp = '';\n"
 "    text.split('\\n').forEach(parseArpLine);\n"
 "}\n"
-"function parseDnsLines(text)\n"
-"{\n"
-"    dns = '';\n"
-"    text.split('\\n').forEach(parseDnsLine);\n"
-"}\n"
 "function parseGenLines(text)\n"
 "{\n"
 "    let lines = text.split('\\n');\n"
@@ -107,14 +85,12 @@
 "    let topics = Ajax.response.split('\\f');\n"
 "    parseGenLines(topics[0]);\n"
 "    parseArpLines(topics[1]);\n"
-"    parseDnsLines(topics[2]);\n"
 "}\n"
 "function display()\n"
 "{\n"
 "    let elem;\n"
 "    \n"
 "    elem = Ajax.getElementOrNull('ajax-arp'             ); if (elem) elem.textContent = arp;\n"
-"    elem = Ajax.getElementOrNull('ajax-dns'             ); if (elem) elem.textContent = dns;\n"
 "    elem = Ajax.getElementOrNull('ajax-slaac'           ); if (elem) elem.textContent = slaac;\n"
 "    elem = Ajax.getElementOrNull('ajax-hop-limit'       ); if (elem) elem.textContent = hopLimit;\n"
 "    elem = Ajax.getElementOrNull('ajax-mtu'             ); if (elem) elem.textContent = mtu;\n"

--- a/base/net/web-net6-script.js	Sat Dec 26 19:38:40 2020 +0000
+++ b/base/net/web-net6-script.js	Sat Dec 26 20:02:22 2020 +0000
@@ -2,7 +2,6 @@
 'use strict';
 
 let arp             = '';
-let dns             = '';
 
 let hopLimit        = '';
 let mtu             = '';
@@ -45,32 +44,11 @@
     arp += Net.makeMac(fields[3]);
     arp += '\r\n';
 }
-function parseDnsLine(line)
-{
-    if (line.length == 0) return;
-    let fields = line.split('\t');
-    
-    dns += parseInt(fields[0], 16).toString().padStart(2, ' ');
-    let minutes  = parseInt(fields[1], 16) / 1000 / 60;
-    dns += Math.floor(minutes).toString().padStart(4, ' ');
-    dns += ' ';
-    dns += Net.makeIp6(fields[2]).padEnd(40, ' ');
-    dns += ' ';
-    dns += fields[3];
-    dns += ' ';
-    dns += fields[4];
-    dns += '\r\n';
-}
 function parseArpLines(text)
 {
     arp = '';
     text.split('\n').forEach(parseArpLine);
 }
-function parseDnsLines(text)
-{
-    dns = '';
-    text.split('\n').forEach(parseDnsLine);
-}
 function parseGenLines(text)
 {
     let lines = text.split('\n');
@@ -107,14 +85,12 @@
     let topics = Ajax.response.split('\f');
     parseGenLines(topics[0]);
     parseArpLines(topics[1]);
-    parseDnsLines(topics[2]);
 }
 function display()
 {
     let elem;
     
     elem = Ajax.getElementOrNull('ajax-arp'             ); if (elem) elem.textContent = arp;
-    elem = Ajax.getElementOrNull('ajax-dns'             ); if (elem) elem.textContent = dns;
     elem = Ajax.getElementOrNull('ajax-slaac'           ); if (elem) elem.textContent = slaac;
     elem = Ajax.getElementOrNull('ajax-hop-limit'       ); if (elem) elem.textContent = hopLimit;
     elem = Ajax.getElementOrNull('ajax-mtu'             ); if (elem) elem.textContent = mtu;