Andrew Boyson / web

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependents:   oldheating gps motorhome heating

Files at this revision

API Documentation at this revision

Revision 136:be1d42268b5d, committed 2020-04-02

Comitter:
andrewboyson
Date:
Thu Apr 02 19:10:57 2020 +0000
Parent:
135:c1490f7e95be
Child:
137:3b6632374855
Commit message:
Modified the IPv4 and IPv6 pages to display the resolution indexes for cross referencing against the TCP page

Changed in this revision

base/net/web-net4-script.inc Show annotated file Show diff for this revision Revisions of this file
base/net/web-net4-script.js Show annotated file Show diff for this revision Revisions of this file
base/net/web-net6-script.inc Show annotated file Show diff for this revision Revisions of this file
base/net/web-net6-script.js Show annotated file Show diff for this revision Revisions of this file 
--- a/base/net/web-net4-script.inc	Thu Apr 02 11:55:28 2020 +0000
+++ b/base/net/web-net4-script.inc	Thu Apr 02 19:10:57 2020 +0000
@@ -20,25 +20,36 @@
 "function parseArpLine(line)\n"
 "{\n"
 "    if (line.length == 0) return;\n"
-"    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;\n"
+"    let fields = line.split('\\t');\n"
+"    \n"
+"    arp += parseInt(fields[0], 16).toString().padStart(2, ' ');\n"
+"    \n"
+"    let minutes  = parseInt(fields[1], 16) / 1000 / 60;\n"
 "    arp += Math.floor(minutes).toString().padStart(4, ' ');\n"
+"    \n"
 "    arp += ' ';\n"
-"    arp += Net.makeIp4(line.substr(8, 8)).padEnd(15, ' ');\n"
+"    arp += Net.makeIp4(fields[2]).padEnd(15, ' ');\n"
+"    \n"
 "    arp += ' ';\n"
-"    arp += Net.makeMac(line.substr(16, 12));\n"
+"    arp += Net.makeMac(fields[3]);\n"
+"    \n"
 "    arp += '\\r\\n';\n"
 "}\n"
 "function parseDnsLine(line)\n"
 "{\n"
 "    if (line.length == 0) return;\n"
-"    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;\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(line.substr(8, 8)).padEnd(15, ' ');\n"
+"    dns += Net.makeIp4(fields[2]).padEnd(15, ' ');\n"
 "    dns += ' ';\n"
-"    dns += line.substr(16, 1);\n"
+"    dns += fields[3];\n"
 "    dns += ' ';\n"
-"    dns += line.substr(17);\n"
+"    dns += fields[4];\n"
 "    dns += '\\r\\n';\n"
 "}\n"
 "function parseArpLines(text)\n"

--- a/base/net/web-net4-script.js	Thu Apr 02 11:55:28 2020 +0000
+++ b/base/net/web-net4-script.js	Thu Apr 02 19:10:57 2020 +0000
@@ -20,25 +20,36 @@
 function parseArpLine(line)
 {
     if (line.length == 0) return;
-    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;
+    let fields = line.split('\t');
+    
+    arp += parseInt(fields[0], 16).toString().padStart(2, ' ');
+    
+    let minutes  = parseInt(fields[1], 16) / 1000 / 60;
     arp += Math.floor(minutes).toString().padStart(4, ' ');
+    
     arp += ' ';
-    arp += Net.makeIp4(line.substr(8, 8)).padEnd(15, ' ');
+    arp += Net.makeIp4(fields[2]).padEnd(15, ' ');
+    
     arp += ' ';
-    arp += Net.makeMac(line.substr(16, 12));
+    arp += Net.makeMac(fields[3]);
+    
     arp += '\r\n';
 }
 function parseDnsLine(line)
 {
     if (line.length == 0) return;
-    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;
+    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(line.substr(8, 8)).padEnd(15, ' ');
+    dns += Net.makeIp4(fields[2]).padEnd(15, ' ');
     dns += ' ';
-    dns += line.substr(16, 1);
+    dns += fields[3];
     dns += ' ';
-    dns += line.substr(17);
+    dns += fields[4];
     dns += '\r\n';
 }
 function parseArpLines(text)

--- a/base/net/web-net6-script.inc	Thu Apr 02 11:55:28 2020 +0000
+++ b/base/net/web-net6-script.inc	Thu Apr 02 19:10:57 2020 +0000
@@ -23,25 +23,34 @@
 "function parseArpLine(line)\n"
 "{\n"
 "    if (line.length == 0) return;\n"
-"    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;\n"
+"    let fields = line.split('\\t');\n"
+"    \n"
+"    arp += parseInt(fields[0], 16).toString().padStart(2, ' ');\n"
+"    \n"
+"    let minutes  = parseInt(fields[1], 16) / 1000 / 60;\n"
 "    arp += Math.floor(minutes).toString().padStart(4, ' ');\n"
 "    arp += ' ';\n"
-"    arp += Net.makeIp6(line.substr(8, 32)).padEnd(40, ' ');\n"
+"    \n"
+"    arp += Net.makeIp6(fields[2]).padEnd(40, ' ');\n"
 "    arp += ' ';\n"
-"    arp += Net.makeMac(line.substr(40, 12));\n"
+"    \n"
+"    arp += Net.makeMac(fields[3]);\n"
 "    arp += '\\r\\n';\n"
 "}\n"
 "function parseDnsLine(line)\n"
 "{\n"
 "    if (line.length == 0) return;\n"
-"    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;\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(line.substr(8, 32)).padEnd(40, ' ');\n"
+"    dns += Net.makeIp6(fields[2]).padEnd(40, ' ');\n"
 "    dns += ' ';\n"
-"    dns += line.substr(40, 1);\n"
+"    dns += fields[3];\n"
 "    dns += ' ';\n"
-"    dns += line.substr(41);\n"
+"    dns += fields[4];\n"
 "    dns += '\\r\\n';\n"
 "}\n"
 "function parseArpLines(text)\n"

--- a/base/net/web-net6-script.js	Thu Apr 02 11:55:28 2020 +0000
+++ b/base/net/web-net6-script.js	Thu Apr 02 19:10:57 2020 +0000
@@ -23,25 +23,34 @@
 function parseArpLine(line)
 {
     if (line.length == 0) return;
-    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;
+    let fields = line.split('\t');
+    
+    arp += parseInt(fields[0], 16).toString().padStart(2, ' ');
+    
+    let minutes  = parseInt(fields[1], 16) / 1000 / 60;
     arp += Math.floor(minutes).toString().padStart(4, ' ');
     arp += ' ';
-    arp += Net.makeIp6(line.substr(8, 32)).padEnd(40, ' ');
+    
+    arp += Net.makeIp6(fields[2]).padEnd(40, ' ');
     arp += ' ';
-    arp += Net.makeMac(line.substr(40, 12));
+    
+    arp += Net.makeMac(fields[3]);
     arp += '\r\n';
 }
 function parseDnsLine(line)
 {
     if (line.length == 0) return;
-    let minutes  = parseInt(line.substr(0, 8), 16) / 1000 / 60;
+    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(line.substr(8, 32)).padEnd(40, ' ');
+    dns += Net.makeIp6(fields[2]).padEnd(40, ' ');
     dns += ' ';
-    dns += line.substr(40, 1);
+    dns += fields[3];
     dns += ' ';
-    dns += line.substr(41);
+    dns += fields[4];
     dns += '\r\n';
 }
 function parseArpLines(text)