Revision 152:edbf676b08ca, committed 2021-01-19

Comitter:

andrewboyson

Date:

Tue Jan 19 18:59:06 2021 +0000

Parent:

151:10db7ff62b82

Child:

153:eaee18d970c4

Commit message:

Tidied up the Trace Nr6 and Nr4 to be just the NR cache

Changed in this revision

--- a/base/firmware/web-firmware-script.inc	Mon Jan 18 18:25:24 2021 +0000
+++ b/base/firmware/web-firmware-script.inc	Tue Jan 19 18:59:06 2021 +0000
@@ -24,9 +24,9 @@
 "}\n"
 "function xhrUploadProgress(e)\n"
 "{\n"
-"    logUpload('Total ' + e.total  + ' bytes\\r\\n' +\n"
-"              'Sent  ' + e.loaded + ' bytes\\r\\n' +\n"
-"              'Don\\'t restart yet, wait for the ok...');\n"
+"    logUpload('Uploading...\\r\\n' +\n"
+"              'Total ' + e.total  + ' bytes\\r\\n' +\n"
+"              'Sent  ' + e.loaded + ' bytes');\n"
 "}\n"
 "function xhrUploadStart()\n"
 "{\n"

--- a/base/firmware/web-firmware-script.js	Mon Jan 18 18:25:24 2021 +0000
+++ b/base/firmware/web-firmware-script.js	Tue Jan 19 18:59:06 2021 +0000
@@ -24,9 +24,9 @@
 }
 function xhrUploadProgress(e)
 {
-    logUpload('Total ' + e.total  + ' bytes\r\n' +
-              'Sent  ' + e.loaded + ' bytes\r\n' +
-              'Don\'t restart yet, wait for the ok...');
+    logUpload('Uploading...\r\n' +
+              'Total ' + e.total  + ' bytes\r\n' +
+              'Sent  ' + e.loaded + ' bytes');
 }
 function xhrUploadStart()
 {

--- a/base/net-trace/web-trace-html.c	Mon Jan 18 18:25:24 2021 +0000
+++ b/base/net-trace/web-trace-html.c	Tue Jan 19 18:59:06 2021 +0000
@@ -41,8 +41,7 @@
     WebAddAjaxInputToggle("NS client reply"      , "ajax-trace-ns-recv-adv", "chg-trace-ns-recv-adv");
     WebAddAjaxInputToggle("NS client query"      , "ajax-trace-ns-send-sol", "chg-trace-ns-send-sol");
     WebAddH2("Name Resolution");
-    WebAddAjaxInputToggle("IP4 cache"            , "ajax-trace-nr4"        , "chg-trace-nr4"        );
-    WebAddAjaxInputToggle("IP6 cache"            , "ajax-trace-nr6"        , "chg-trace-nr6"        );
+    WebAddAjaxInputToggle("NR cache"             , "ajax-trace-nr"         , "chg-trace-nr"         );
     WebAddAjaxInputToggle("DNS name"             , "ajax-trace-dns-name"   , "chg-trace-dns-name"   );
     WebAddAjaxInputToggle("DNS client query"     , "ajax-trace-dns-query"  , "chg-trace-dns-query"  );
     WebAddAjaxInputToggle("DNS client reply"     , "ajax-trace-dns-reply"  , "chg-trace-dns-reply"  );

--- a/base/net-trace/web-trace-query.c	Mon Jan 18 18:25:24 2021 +0000
+++ b/base/net-trace/web-trace-query.c	Tue Jan 19 18:59:06 2021 +0000
@@ -26,8 +26,7 @@
         if (HttpSameStr(pName, "chg-trace-ns-recv-sol" )) ChgTraceNsRecvSol();
         if (HttpSameStr(pName, "chg-trace-ns-recv-adv" )) ChgTraceNsRecvAdv();
         if (HttpSameStr(pName, "chg-trace-ns-send-sol" )) ChgTraceNsSendSol();
-        if (HttpSameStr(pName, "chg-trace-nr4"         )) ChgTraceNr4();
-        if (HttpSameStr(pName, "chg-trace-nr6"         )) ChgTraceNr6();
+        if (HttpSameStr(pName, "chg-trace-nr"          )) ChgTraceNr();
         if (HttpSameStr(pName, "chg-trace-ntp-client"  )) ChgTraceNtpClient();
         if (HttpSameStr(pName, "chg-trace-sync"        )) ChgTraceSync();
         if (HttpSameStr(pName, "chg-trace-echo4"       )) ChgTraceEcho4();

--- a/base/net-trace/web-trace-script.inc	Mon Jan 18 18:25:24 2021 +0000
+++ b/base/net-trace/web-trace-script.inc	Tue Jan 19 18:59:06 2021 +0000
@@ -24,8 +24,7 @@
 "   elem = Ajax.getElementOrNull('ajax-trace-ns-recv-sol' ); if (elem) setDirection(elem,  7, 2);\n"
 "   elem = Ajax.getElementOrNull('ajax-trace-ns-recv-adv' ); if (elem) setDirection(elem,  7, 3);\n"
 "   elem = Ajax.getElementOrNull('ajax-trace-ns-send-sol' ); if (elem) setDirection(elem,  8, 0);\n"
-"   elem = Ajax.getElementOrNull('ajax-trace-nr4'         ); if (elem) setDirection(elem,  8, 1);\n"
-"   elem = Ajax.getElementOrNull('ajax-trace-nr6'         ); if (elem) setDirection(elem,  8, 2);\n"
+"   elem = Ajax.getElementOrNull('ajax-trace-nr'          ); if (elem) setDirection(elem,  8, 2);\n"
 "   elem = Ajax.getElementOrNull('ajax-trace-ntp-client'  ); if (elem) setDirection(elem,  8, 3);\n"
 "   elem = Ajax.getElementOrNull('ajax-trace-echo4'       ); if (elem) setDirection(elem,  9, 2);\n"
 "   elem = Ajax.getElementOrNull('ajax-trace-echo6'       ); if (elem) setDirection(elem,  9, 3);\n"

--- a/base/net-trace/web-trace-script.js	Mon Jan 18 18:25:24 2021 +0000
+++ b/base/net-trace/web-trace-script.js	Tue Jan 19 18:59:06 2021 +0000
@@ -24,8 +24,7 @@
    elem = Ajax.getElementOrNull('ajax-trace-ns-recv-sol' ); if (elem) setDirection(elem,  7, 2);
    elem = Ajax.getElementOrNull('ajax-trace-ns-recv-adv' ); if (elem) setDirection(elem,  7, 3);
    elem = Ajax.getElementOrNull('ajax-trace-ns-send-sol' ); if (elem) setDirection(elem,  8, 0);
-   elem = Ajax.getElementOrNull('ajax-trace-nr4'         ); if (elem) setDirection(elem,  8, 1);
-   elem = Ajax.getElementOrNull('ajax-trace-nr6'         ); if (elem) setDirection(elem,  8, 2);
+   elem = Ajax.getElementOrNull('ajax-trace-nr'          ); if (elem) setDirection(elem,  8, 2);
    elem = Ajax.getElementOrNull('ajax-trace-ntp-client'  ); if (elem) setDirection(elem,  8, 3);
    elem = Ajax.getElementOrNull('ajax-trace-echo4'       ); if (elem) setDirection(elem,  9, 2);
    elem = Ajax.getElementOrNull('ajax-trace-echo6'       ); if (elem) setDirection(elem,  9, 3);