Diff: base/net/web-net-script.inc

Revision:

147:ea6f647725a1

Parent:

146:6bc151bd7063

Child:

148:3d685db9fdd3

--- a/base/net/web-net-script.inc	Mon Jan 04 16:09:03 2021 +0000
+++ b/base/net/web-net-script.inc	Sun Jan 10 11:53:12 2021 +0000
@@ -2,6 +2,7 @@
 "'use strict';\n"
 "\n"
 "let mac = '';\n"
+"let nr  = '';\n"
 "let tcp = '';\n"
 "let dns = '';\n"
 "let a4s = null;\n"
@@ -52,31 +53,52 @@
 "    let minutes  = parseInt(fields[1], 16) / 1000 / 60;\n"
 "    dns += Math.floor(minutes).toString().padStart(4, ' ');\n"
 "    dns += ' ';\n"
+"    let addrType = fields[2];\n"
+"    switch (addrType)\n"
+"    {\n"
+"        case '4': dns += '   A'; break;\n"
+"        case '6': dns += 'AAAA'; break;\n"
+"        default:  dns += addrType; break;\n"
+"    }\n"
+"    dns += ' ';\n"
 "    let addr = '';\n"
 "    let mac = '';\n"
-"    if (fields[2].substr( 0, 2) === '00') //Is empty or IP4\n"
+"    switch (addrType)\n"
 "    {\n"
-"        if (fields[2].substr(24, 2) === '00') //Is empty\n"
+"        case '4':\n"
+"            addr = Net.makeIp4(fields[3]);\n"
+"            if (a4s.has(addr)) mac = a4s.get(addr);\n"
+"            break;\n"
+"        case '6':\n"
+"            addr = Net.makeIp6(fields[3]);\n"
+"            if (a6s.has(addr)) mac = a6s.get(addr);\n"
+"            break;\n"
+"    }\n"
+"    /*\n"
+"    if (fields[3].substr( 0, 2) === '00') //Is empty or IP4\n"
+"    {\n"
+"        if (fields[3].substr(24, 2) === '00') //Is empty\n"
 "        {\n"
 "            addr = '';\n"
 "        }\n"
 "        else //Is Ip4\n"
 "        {\n"
-"            addr = Net.makeIp4Rev(fields[2].substr(24, 8));\n"
+"            addr = Net.makeIp4Rev(fields[3].substr(24, 8));\n"
 "            if (a4s.has(addr)) mac = a4s.get(addr);\n"
 "        }\n"
 "    }\n"
 "    else //Is IP6\n"
 "    {\n"
-"        addr = Net.makeIp6(fields[2]);\n"
+"        addr = Net.makeIp6(fields[3]);\n"
 "        if (a6s.has(addr)) mac = a6s.get(addr)\n"
 "    }\n"
+"    */\n"
 "    dns += addr.padEnd(40, ' ');\n"
 "    \n"
 "    dns += ' ';\n"
-"    dns += fields[3]; //DNS protocol used\n"
+"    dns += fields[4]; //DNS protocol used\n"
 "    dns += ' ';\n"
-"    dns += fields[4].padEnd(20, ' '); //Resolved name\n"
+"    dns += fields[5].padEnd(32, ' '); //Resolved name\n"
 "    \n"
 "    if (mac != '')\n"
 "    {\n"
@@ -125,6 +147,7 @@
 "{\n"
 "    let lines = text.split('\\n');\n"
 "    mac = Net.makeMac(lines[ 0]);\n"
+"    nr  =             lines[ 1] ;\n"
 "}\n"
 "function parseTcpLines(text)\n"
 "{\n"
@@ -161,6 +184,7 @@
 "\n"
 "    elem = Ajax.getElementOrNull('ajax-tcp'         ); if (elem) elem.textContent = tcp;\n"
 "    elem = Ajax.getElementOrNull('ajax-mac'         ); if (elem) elem.textContent = mac;\n"
+"    elem = Ajax.getElementOrNull('ajax-nr'          ); if (elem) elem.value       = nr;\n"
 "    elem = Ajax.getElementOrNull('ajax-dns'         ); if (elem) elem.textContent = dns;\n"
 "}\n"
 "\n"