[Olsr-cvs] olsrd-current/lib/httpinfo/src olsrd_httpinfo.c, 1.77, 1.78

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/httpinfo/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24441/lib/httpinfo/src

Modified Files:
	olsrd_httpinfo.c 
Log Message:
* fixed up the html

Index: olsrd_httpinfo.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/httpinfo/src/olsrd_httpinfo.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** olsrd_httpinfo.c	16 Sep 2007 21:20:07 -0000	1.77
--- olsrd_httpinfo.c	13 Oct 2007 12:04:57 -0000	1.78
***************
*** 780,785 ****
    size += snprintf(&buf[size], bufsize-size, "<h2>OLSR routes in kernel</h2>\n");
  
!   size += snprintf(&buf[size], bufsize-size, "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"center\"><tr><th%1$s>Destination</th><th%1$s>Gateway</th><th>Metric</th>",
!                   resolve_ip_addresses ? " colspan=\"2\"" : "");
  
    size += snprintf(&buf[size], bufsize-size, "<th>ETX</th>");
--- 780,787 ----
    size += snprintf(&buf[size], bufsize-size, "<h2>OLSR routes in kernel</h2>\n");
  
!   size += snprintf(&buf[size], bufsize-size,
!                    "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"center\">"
!                    "<tr><th%1$s>Destination</th><th%1$s>Gateway</th><th>Metric</th>",
!                    resolve_ip_addresses ? " colspan=\"2\"" : "");
  
    size += snprintf(&buf[size], bufsize-size, "<th>ETX</th>");
***************
*** 959,967 ****
  
  
      if((olsr_cnf->ip_version == AF_INET) && (olsr_cnf->hna4_entries))
        {
  	struct hna4_entry *hna4;
  	
- 	size += snprintf(&buf[size], bufsize-size, "<h2>Announced HNA entries</h2>\n");
  	size += snprintf(&buf[size], bufsize-size, "<table width=\"100%%\" BORDER=0 CELLSPACING=0 CELLPADDING=0 ALIGN=center><tr><th>Network</th><th>Netmask</th></tr>\n");
  	
--- 961,969 ----
  
  
+     size += snprintf(&buf[size], bufsize-size, "<h2>Announced HNA entries</h2>\n");
      if((olsr_cnf->ip_version == AF_INET) && (olsr_cnf->hna4_entries))
        {
  	struct hna4_entry *hna4;
  	
  	size += snprintf(&buf[size], bufsize-size, "<table width=\"100%%\" BORDER=0 CELLSPACING=0 CELLPADDING=0 ALIGN=center><tr><th>Network</th><th>Netmask</th></tr>\n");
  	
***************
*** 979,983 ****
  	struct hna6_entry *hna6;
  	
- 	size += snprintf(&buf[size], bufsize-size, "<h2>Announced HNA entries</h2>\n");
  	size += snprintf(&buf[size], bufsize-size, "<table width=\"100%%\" BORDER=0 CELLSPACING=0 CELLPADDING=0 ALIGN=center><tr><th>Network</th><th>Prefix length</th></tr>\n");
  	
--- 981,984 ----
***************
*** 1006,1010 ****
  
    size += snprintf(&buf[size], bufsize-size, "<h2>Links</h2>\n");
!   size += snprintf(&buf[size], bufsize-size, "<table width=\"100%%\" BORDER=0 CELLSPACING=0 CELLPADDING=0 ALIGN=center><tr><th>Local IP</th><th>Remote IP</th><th>Hysteresis</th>\n");
    if (olsr_cnf->lq_level > 0)
      size += snprintf(&buf[size], bufsize-size, "<th>LinkQuality</th><th>lost</th><th>total</th><th>NLQ</th><th>ETX</th>\n");
--- 1007,1011 ----
  
    size += snprintf(&buf[size], bufsize-size, "<h2>Links</h2>\n");
!   size += snprintf(&buf[size], bufsize-size, "<table width=\"100%%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" align=\"center\"><tr><th>Local IP</th><th>Remote IP</th><th>Hysteresis</th>\n");
    if (olsr_cnf->lq_level > 0)
      size += snprintf(&buf[size], bufsize-size, "<th>LinkQuality</th><th>lost</th><th>total</th><th>NLQ</th><th>ETX</th>\n");
***************
*** 1016,1020 ****
        {
          size += snprintf(&buf[size], bufsize-size, "<tr>");
!         size += build_ipaddr_no_link(&buf[size], bufsize, &link->local_iface_addr, -1);
          size += build_ipaddr_with_link(&buf[size], bufsize, &link->neighbor_iface_addr, -1);
  	size += snprintf(&buf[size], bufsize-size,
--- 1017,1021 ----
        {
          size += snprintf(&buf[size], bufsize-size, "<tr>");
!         size += build_ipaddr_with_link(&buf[size], bufsize, &link->local_iface_addr, -1);
          size += build_ipaddr_with_link(&buf[size], bufsize, &link->neighbor_iface_addr, -1);
  	size += snprintf(&buf[size], bufsize-size,
***************
*** 1091,1095 ****
    struct tc_edge_entry *tc_edge;
  
!   size += snprintf(&buf[size], bufsize-size, "<h2>Topology entries</h2>\n<table width=\"100%%\" BORDER=0 CELLSPACING=0 CELLPADDING=0 ALIGN=center><tr><th>Destination IP</th><th>Last Hop IP</th>");
    if (olsr_cnf->lq_level > 0)
      size += snprintf(&buf[size], bufsize-size, "<th>LQ</th><th>ILQ</th><th>ETX</th>");
--- 1092,1100 ----
    struct tc_edge_entry *tc_edge;
  
!   size += snprintf(&buf[size], bufsize-size,
!                    "<h2>Topology entries</h2>\n"
!                    "<table width=\"100%%\" border=\"0 cellspacing=\"0\" cellpadding=\"0\" align=center>\n"
!                    "<tr><th%1$s>Destination IP</th><th%1$s>Last Hop IP</th>",
!                    resolve_ip_addresses ? " colspan=\"2\"" : "");
    if (olsr_cnf->lq_level > 0)
      size += snprintf(&buf[size], bufsize-size, "<th>LQ</th><th>ILQ</th><th>ETX</th>");