Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2025-01-02 19:29:30 +00:00
Code Issues Projects Releases Wiki Activity

Restore lines that were excluded for VC++ test build

Browse Source
This commit is contained in:
David Kopf 2011-06-28 08:59:39 -04:00
parent 46de21e771
commit cfd3198fda
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/webserver/httpd-cgi.c
View File

@ -159,7 +159,6 @@ make_tcp_stats(void *arg)
conn = &uip_conns[s->u.count]; conn = &uip_conns[s->u.count];
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
{
char buf[48]; char buf[48];
httpd_sprint_ip6(conn->ripaddr, buf); httpd_sprint_ip6(conn->ripaddr, buf);
return snprintf((char *)uip_appdata, uip_mss(), return snprintf((char *)uip_appdata, uip_mss(),
@ -172,7 +171,6 @@ make_tcp_stats(void *arg)
conn->timer, conn->timer,
(uip_outstanding(conn))? '*':' ', (uip_outstanding(conn))? '*':' ',
(uip_stopped(conn))? '!':' '); (uip_stopped(conn))? '!':' ');
}
#else #else
return snprintf((char *)uip_appdata, uip_mss(), return snprintf((char *)uip_appdata, uip_mss(),
"<tr align=\"center\"><td>%d</td><td>%u.%u.%u.%u:%u</td><td>%s</td><td>%u</td><td>%u</td><td>%c %c</td></tr>\r\n", "<tr align=\"center\"><td>%d</td><td>%u.%u.%u.%u:%u</td><td>%s</td><td>%u</td><td>%u</td><td>%c %c</td></tr>\r\n",
@ -252,7 +250,7 @@ uint16_t numprinted;
for (i=0; i<UIP_DS6_ADDR_NB;i++) { for (i=0; i<UIP_DS6_ADDR_NB;i++) {
if (uip_ds6_if.addr_list[i].isused) { if (uip_ds6_if.addr_list[i].isused) {
j++; j++;
// numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_if.addr_list[i].ipaddr, uip_appdata + numprinted);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb);
} }
} }
@ -280,7 +278,7 @@ uint16_t numprinted;
for (i=0; i<UIP_DS6_NBR_NB;i++) { for (i=0; i<UIP_DS6_NBR_NB;i++) {
if (uip_ds6_nbr_cache[i].isused) { if (uip_ds6_nbr_cache[i].isused) {
j++; j++;
// numprinted += httpd_cgi_sprint_ip6(uip_ds6_nbr_cache[i].ipaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_nbr_cache[i].ipaddr, uip_appdata + numprinted);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_addrb);
} }
} }
@ -311,11 +309,10 @@ uint16_t numprinted;
for (i=0; i<UIP_DS6_ROUTE_NB;i++) { for (i=0; i<UIP_DS6_ROUTE_NB;i++) {
if (uip_ds6_routing_table[i].isused) { if (uip_ds6_routing_table[i].isused) {
j++; j++;
// numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].ipaddr, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].ipaddr, uip_appdata + numprinted);
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes1, uip_ds6_routing_table[i].length); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes1, uip_ds6_routing_table[i].length);
// numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].nexthop, uip_appdata + numprinted); numprinted += httpd_cgi_sprint_ip6(uip_ds6_routing_table[i].nexthop, uip_appdata + numprinted);
if(uip_ds6_routing_table[i].state.lifetime < 3600*24) { if(uip_ds6_routing_table[i].state.lifetime < 3600*24) {
//if(uip_ds6_routing_table[i].state.lifetime < 3600) {
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes2, uip_ds6_routing_table[i].state.lifetime); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes2, uip_ds6_routing_table[i].state.lifetime);
} else { } else {
numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes3); numprinted += httpd_snprintf((char *)uip_appdata+numprinted, uip_mss()-numprinted, httpd_cgi_rtes3);