Diff: net/http-net-html.c

Revision:

77:4689596a2f3f

Parent:

59:309e78f243dd

Child:

86:f3c9beec4ee7

diff -r bb34dbb26aae -r 4689596a2f3f net/http-net-html.c
--- a/net/http-net-html.c	Thu Mar 21 11:21:19 2019 +0000
+++ b/net/http-net-html.c	Sat Mar 23 12:26:49 2019 +0000
@@ -14,8 +14,6 @@
 #include  "dhcp.h"
 #include "slaac.h"
 
-#define WIDTH 16
-
 void HttpNetHtml()
 {
     HttpOk("text/html; charset=UTF-8", "no-cache", NULL, NULL);
@@ -24,40 +22,40 @@
     PageAddH1(PageSite, "Net");
                      
     PageAddH2("Ethernet");
-    PageAddLabelledMac  (WIDTH, "MAC",                   MacLocal);
+    PageAddLabelledMac  ("MAC",                   MacLocal);
     
     PageAddH2("IP4 DHCP");
-    PageAddLabelledIp4  (WIDTH, "IP4 address",           DhcpLocalIp);
-    PageAddLabelledValue(WIDTH, "Domain",                DhcpDomainName);
-    PageAddLabelledValue(WIDTH, "Host name",             DhcpHostName);
-    PageAddLabelledIp4  (WIDTH, "NTP server",            DhcpNtpIp);
-    PageAddLabelledIp4  (WIDTH, "DNS server",            DhcpDnsServerIp);
-    PageAddLabelledIp4  (WIDTH, "DHCP server",           DhcpServerIp);
-    PageAddLabelledIp4  (WIDTH, "Router",                DhcpRouterIp);
-    PageAddLabelledIp4  (WIDTH, "Subnet mask",           DhcpSubnetMask);
-    PageAddLabelledIp4  (WIDTH, "Broadcast IP",          DhcpBroadcastIp);
-    PageAddLabelledInt  (WIDTH, "Lease time IP",         DhcpLeaseTime);
-    PageAddLabelledInt  (WIDTH, "Renewal T1",            DhcpRenewalT1);
-    PageAddLabelledInt  (WIDTH, "Renewal T2",            DhcpRenewalT2);
-    PageAddLabelledInt  (WIDTH, "Elapsed",               DhcpGetElapsedLife());
+    PageAddLabelledIp4  ("IP4 address",           DhcpLocalIp);
+    PageAddLabelledText ("Domain",                DhcpDomainName);
+    PageAddLabelledText ("Host name",             DhcpHostName);
+    PageAddLabelledIp4  ("NTP server",            DhcpNtpIp);
+    PageAddLabelledIp4  ("DNS server",            DhcpDnsServerIp);
+    PageAddLabelledIp4  ("DHCP server",           DhcpServerIp);
+    PageAddLabelledIp4  ("Router",                DhcpRouterIp);
+    PageAddLabelledIp4  ("Subnet mask",           DhcpSubnetMask);
+    PageAddLabelledIp4  ("Broadcast IP",          DhcpBroadcastIp);
+    PageAddLabelledInt  ("Lease time IP",         DhcpLeaseTime);
+    PageAddLabelledInt  ("Renewal T1",            DhcpRenewalT1);
+    PageAddLabelledInt  ("Renewal T2",            DhcpRenewalT2);
+    PageAddLabelledInt  ("Elapsed",               DhcpGetElapsedLife());
     
     PageAddH2("IP6 NDP");
-    PageAddLabelledInt  (WIDTH, "Hop limit",             NdpHopLimit);
-    PageAddLabelledOnOff(WIDTH, "Managed address",       NdpManagedConfiguration);
-    PageAddLabelledOnOff(WIDTH, "Other configuration",   NdpOtherConfiguration);
-    PageAddLabelledMac  (WIDTH, "Router MAC",            NdpRouterMac);
-    PageAddLabelledInt  (WIDTH, "Prefix length",         NdpPrefixLength);
-    PageAddLabelledOnOff(WIDTH, "Prefix flag L",         NdpPrefixFlagL);
-    PageAddLabelledOnOff(WIDTH, "Prefix flag A",         NdpPrefixFlagA);
-    PageAddLabelledInt  (WIDTH, "Prefix valid secs",     NdpPrefixValidLifetime);
-    PageAddLabelledInt  (WIDTH, "Prefix preferred secs", NdpPrefixPreferredLifetime);
-    PageAddLabelledIp6  (WIDTH, "Prefix",                NdpPrefix);
-    PageAddLabelledInt  (WIDTH, "DNS life secs",         NdpDnsLifetime);
-    PageAddLabelledIp6  (WIDTH, "DNS server",            NdpDnsServer);
-    PageAddLabelledInt  (WIDTH, "Lease time",            NdpGetLease());
-    PageAddLabelledInt  (WIDTH, "Elapsed",               NdpGetElapsedLife());
-    PageAddLabelledIp6  (WIDTH, "SLAAC",                 SlaacLinkLocalIp);
-    PageAddLabelledInt  (WIDTH, "MTU",                   NdpMtu);
+    PageAddLabelledInt  ("Hop limit",             NdpHopLimit);
+    PageAddLabelledOnOff("Managed address",       NdpManagedConfiguration);
+    PageAddLabelledOnOff("Other configuration",   NdpOtherConfiguration);
+    PageAddLabelledMac  ("Router MAC",            NdpRouterMac);
+    PageAddLabelledInt  ("Prefix length",         NdpPrefixLength);
+    PageAddLabelledOnOff("Prefix flag L",         NdpPrefixFlagL);
+    PageAddLabelledOnOff("Prefix flag A",         NdpPrefixFlagA);
+    PageAddLabelledInt  ("Prefix valid secs",     NdpPrefixValidLifetime);
+    PageAddLabelledInt  ("Prefix preferred secs", NdpPrefixPreferredLifetime);
+    PageAddLabelledIp6  ("Prefix",                NdpPrefix);
+    PageAddLabelledInt  ("DNS life secs",         NdpDnsLifetime);
+    PageAddLabelledIp6  ("DNS server",            NdpDnsServer);
+    PageAddLabelledInt  ("Lease time",            NdpGetLease());
+    PageAddLabelledInt  ("Elapsed",               NdpGetElapsedLife());
+    PageAddLabelledIp6  ("SLAAC",                 SlaacLinkLocalIp);
+    PageAddLabelledInt  ("MTU",                   NdpMtu);
                
     PageAddH2("ARP 4"); HttpAddText("<code>"); Ar4SendHttp(); HttpAddText("</code>\r\n");
     PageAddH2("DNS 4"); HttpAddText("<code>"); Nr4SendHttp(); HttpAddText("</code>\r\n");