Diff: net-trace/http-trace-html.c

Revision:

77:4689596a2f3f

Parent:

58:e5ab14ef6ea6

Child:

86:f3c9beec4ee7

diff -r bb34dbb26aae -r 4689596a2f3f net-trace/http-trace-html.c
--- a/net-trace/http-trace-html.c	Thu Mar 21 11:21:19 2019 +0000
+++ b/net-trace/http-trace-html.c	Sat Mar 23 12:26:49 2019 +0000
@@ -10,48 +10,48 @@
     PageAddNav(TRACE_PAGE);
     PageAddH1(PageSite, "Trace");
     
-    HttpAddText("<h2>General</h2>\r\n");
-    PageAddAjaxInput ( 6.0, "Trace host"   , 5.2   , "ajax-trace-net-host"   , "set-trace-net-host"   );
-    PageAddAjaxInputToggle(10.0, "Trace stack"          , "ajax-trace-net-stack"  , "chg-trace-net-stack"  );
-    PageAddAjaxInputToggle(10.0, "Trace new line"       , "ajax-trace-net-newline", "chg-trace-net-newline");
-    PageAddAjaxInputToggle(10.0, "Trace verbose"        , "ajax-trace-net-verbose", "chg-trace-net-verbose");
-    PageAddAjaxInputToggle(10.0, "Log uart"             , "ajax-log-uart"         , "chg-log-uart"         );
-    HttpAddText("<h2>Net</h2>\r\n");
-    PageAddAjaxInputToggle(10.0, "MAC"                  , "ajax-trace-link"       , "chg-trace-link"       );
-    PageAddAjaxInputToggle(10.0, "Ip4 filtered"         , "ajax-trace-ip4"        , "chg-trace-ip4"        );
-    PageAddAjaxInputToggle(10.0, "Ip6 filtered"         , "ajax-trace-ip6"        , "chg-trace-ip6"        );
-    PageAddAjaxInputToggle(10.0, "Udp filtered"         , "ajax-trace-udp"        , "chg-trace-udp"        );
-    PageAddAjaxInputToggle(10.0, "Tcp filtered"         , "ajax-trace-tcp"        , "chg-trace-tcp"        );
-    PageAddAjaxInputToggle(10.0, "Echo4 (ping4)"        , "ajax-trace-echo4"      , "chg-trace-echo4"      );
-    PageAddAjaxInputToggle(10.0, "Echo6 (ping6)"        , "ajax-trace-echo6"      , "chg-trace-echo6"      );
-    PageAddAjaxInputToggle(10.0, "Dest6 unreacheable"   , "ajax-trace-dest6"      , "chg-trace-dest6"      );
-    PageAddAjaxInputToggle(10.0, "HTTP"                 , "ajax-trace-http"       , "chg-trace-http"       );
-    PageAddAjaxInputToggle(10.0, "TFTP"                 , "ajax-trace-tftp"       , "chg-trace-tftp"       );
-    HttpAddText("<h2>Send requests via IPv4</h2>\r\n");
-    PageAddAjaxInputToggle(10.0, "DNS request via IPv4" , "ajax-trace-dns-ip4"    , "chg-send-dns-ip4"     );
-    PageAddAjaxInputToggle(10.0, "NTP request via IPv4" , "ajax-trace-ntp-ip4"    , "chg-send-ntp-ip4"     );
-    PageAddAjaxInputToggle(10.0, "TFTP request via IPv4", "ajax-trace-tftp-ip4"   , "chg-send-tftp-ip4"    );
-    HttpAddText("<h2>Router Resolution</h2>\r\n");
-    PageAddAjaxInputToggle(10.0, "Router advertise"     , "ajax-trace-ra"         , "chg-trace-ra"         );
-    PageAddAjaxInputToggle(10.0, "Router solicit"       , "ajax-trace-rs"         , "chg-trace-rs"         );
-    PageAddAjaxInputToggle(10.0, "DHCP"                 , "ajax-trace-dhcp"       , "chg-trace-dhcp"       );
-    HttpAddText("<h2>Address Resolution</h2>\r\n");
-    PageAddAjaxInputToggle(10.0, "IP4 cache"            , "ajax-trace-ar4"        , "chg-trace-ar4"        );
-    PageAddAjaxInputToggle(10.0, "IP6 cache"            , "ajax-trace-ar6"        , "chg-trace-ar6"        );
-    PageAddAjaxInputToggle(10.0, "ARP"                  , "ajax-trace-arp"        , "chg-trace-arp"        );
-    PageAddAjaxInputToggle(10.0, "NS server"            , "ajax-trace-ns-recv-sol", "chg-trace-ns-recv-sol");
-    PageAddAjaxInputToggle(10.0, "NS client reply"      , "ajax-trace-ns-recv-adv", "chg-trace-ns-recv-adv");
-    PageAddAjaxInputToggle(10.0, "NS client query"      , "ajax-trace-ns-send-sol", "chg-trace-ns-send-sol");
-    HttpAddText("<h2>Name Resolution</h2>\r\n");
-    PageAddAjaxInputToggle(10.0, "IP4 cache"            , "ajax-trace-nr4"        , "chg-trace-nr4"        );
-    PageAddAjaxInputToggle(10.0, "IP6 cache"            , "ajax-trace-nr6"        , "chg-trace-nr6"        );
-    PageAddAjaxInputToggle(10.0, "DNS name"             , "ajax-trace-dns-name"   , "chg-trace-dns-name"   );
-    PageAddAjaxInputToggle(10.0, "DNS client query"     , "ajax-trace-dns-query"  , "chg-trace-dns-query"  );
-    PageAddAjaxInputToggle(10.0, "DNS client reply"     , "ajax-trace-dns-reply"  , "chg-trace-dns-reply"  );
-    PageAddAjaxInputToggle(10.0, "DNS server"           , "ajax-trace-dns-server" , "chg-trace-dns-server" );
-    HttpAddText("<h2>NTP</h2>\r\n");
-    PageAddAjaxInputToggle(10.0, "NTP"                  , "ajax-trace-ntp"        , "chg-trace-ntp"        );
-    PageAddAjaxInputToggle(10.0, "NTP client"           , "ajax-trace-ntp-client" , "chg-trace-ntp-client" );
+    PageAddH2("General");
+    PageAddAjaxInput      ("Trace host"      , 5  , "ajax-trace-net-host"   , "set-trace-net-host"   );
+    PageAddAjaxInputToggle("Trace stack"          , "ajax-trace-net-stack"  , "chg-trace-net-stack"  );
+    PageAddAjaxInputToggle("Trace new line"       , "ajax-trace-net-newline", "chg-trace-net-newline");
+    PageAddAjaxInputToggle("Trace verbose"        , "ajax-trace-net-verbose", "chg-trace-net-verbose");
+    PageAddAjaxInputToggle("Log uart"             , "ajax-log-uart"         , "chg-log-uart"         );
+    PageAddH2("Net");
+    PageAddAjaxInputToggle("MAC"                  , "ajax-trace-link"       , "chg-trace-link"       );
+    PageAddAjaxInputToggle("Ip4 filtered"         , "ajax-trace-ip4"        , "chg-trace-ip4"        );
+    PageAddAjaxInputToggle("Ip6 filtered"         , "ajax-trace-ip6"        , "chg-trace-ip6"        );
+    PageAddAjaxInputToggle("Udp filtered"         , "ajax-trace-udp"        , "chg-trace-udp"        );
+    PageAddAjaxInputToggle("Tcp filtered"         , "ajax-trace-tcp"        , "chg-trace-tcp"        );
+    PageAddAjaxInputToggle("Echo4 (ping4)"        , "ajax-trace-echo4"      , "chg-trace-echo4"      );
+    PageAddAjaxInputToggle("Echo6 (ping6)"        , "ajax-trace-echo6"      , "chg-trace-echo6"      );
+    PageAddAjaxInputToggle("Dest6 unreacheable"   , "ajax-trace-dest6"      , "chg-trace-dest6"      );
+    PageAddAjaxInputToggle("HTTP"                 , "ajax-trace-http"       , "chg-trace-http"       );
+    PageAddAjaxInputToggle("TFTP"                 , "ajax-trace-tftp"       , "chg-trace-tftp"       );
+    PageAddH2("Send requests via IPv4");
+    PageAddAjaxInputToggle("DNS request via IPv4" , "ajax-trace-dns-ip4"    , "chg-send-dns-ip4"     );
+    PageAddAjaxInputToggle("NTP request via IPv4" , "ajax-trace-ntp-ip4"    , "chg-send-ntp-ip4"     );
+    PageAddAjaxInputToggle("TFTP request via IPv4", "ajax-trace-tftp-ip4"   , "chg-send-tftp-ip4"    );
+    PageAddH2("Router Resolution");
+    PageAddAjaxInputToggle("Router advertise"     , "ajax-trace-ra"         , "chg-trace-ra"         );
+    PageAddAjaxInputToggle("Router solicit"       , "ajax-trace-rs"         , "chg-trace-rs"         );
+    PageAddAjaxInputToggle("DHCP"                 , "ajax-trace-dhcp"       , "chg-trace-dhcp"       );
+    PageAddH2("Address Resolution");
+    PageAddAjaxInputToggle("IP4 cache"            , "ajax-trace-ar4"        , "chg-trace-ar4"        );
+    PageAddAjaxInputToggle("IP6 cache"            , "ajax-trace-ar6"        , "chg-trace-ar6"        );
+    PageAddAjaxInputToggle("ARP"                  , "ajax-trace-arp"        , "chg-trace-arp"        );
+    PageAddAjaxInputToggle("NS server"            , "ajax-trace-ns-recv-sol", "chg-trace-ns-recv-sol");
+    PageAddAjaxInputToggle("NS client reply"      , "ajax-trace-ns-recv-adv", "chg-trace-ns-recv-adv");
+    PageAddAjaxInputToggle("NS client query"      , "ajax-trace-ns-send-sol", "chg-trace-ns-send-sol");
+    PageAddH2("Name Resolution");
+    PageAddAjaxInputToggle("IP4 cache"            , "ajax-trace-nr4"        , "chg-trace-nr4"        );
+    PageAddAjaxInputToggle("IP6 cache"            , "ajax-trace-nr6"        , "chg-trace-nr6"        );
+    PageAddAjaxInputToggle("DNS name"             , "ajax-trace-dns-name"   , "chg-trace-dns-name"   );
+    PageAddAjaxInputToggle("DNS client query"     , "ajax-trace-dns-query"  , "chg-trace-dns-query"  );
+    PageAddAjaxInputToggle("DNS client reply"     , "ajax-trace-dns-reply"  , "chg-trace-dns-reply"  );
+    PageAddAjaxInputToggle("DNS server"           , "ajax-trace-dns-server" , "chg-trace-dns-server" );
+    PageAddH2("NTP");
+    PageAddAjaxInputToggle("NTP"                  , "ajax-trace-ntp"        , "chg-trace-ntp"        );
+    PageAddAjaxInputToggle("NTP client"           , "ajax-trace-ntp-client" , "chg-trace-ntp-client" );
     
     PageAddEnd();
 }