Merge remote branch 'remotes/origin/Teaman-IPTraffic' into Teaman-NDTeaman-ND-1.28.0006
commitfc9bbf6a1764ba59a80eae3846955c0029805fbf
authorAugusto Bott <augusto@bott.com.br>
Fri, 9 Sep 2011 10:22:04 +0000 (9 07:22 -0300)
committerAugusto Bott <augusto@bott.com.br>
Fri, 9 Sep 2011 10:22:04 +0000 (9 07:22 -0300)
tree4bd02a7ca12b9d9effa4a82ef27555199e414da3
parent53c6c263e5c297339766a70be80f97005f0512d3
parent9b58fc1854c93a2b3d8e6d9f32a7bf9e89ada1b7
Merge remote branch 'remotes/origin/Teaman-IPTraffic' into Teaman-ND

* remotes/origin/Teaman-IPTraffic:
  Bugfix: tx/rx info fixed on IP Traffic Transfer Rates page
  IP Traffic visual enhancements
  Static ARP binding
  IPTraffic history is now kept only for configured addresses
  cstats fixes, improvements on IP Traffic and QoS pages
  Experimental/alternative IP Traffic monitor
  Proper calculation of DHCP ranges for a subnet (first/last IP available, broadcast, subnet on IPv4)

Conflicts:
release/src/router/Makefile
release/src/router/httpd/bwm.c
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c
release/src/router/rc/Makefile
release/src/router/rc/arpbind.c
release/src/router/rc/firewall.c
release/src/router/rc/init.c
release/src/router/www/about.asp
release/src/router/www/basic-static.asp
release/src/router/www/bwm-common.js
release/src/router/www/ipt-24.asp
release/src/router/www/ipt-daily.asp
release/src/router/www/ipt-details.asp
release/src/router/www/ipt-monthly.asp
release/src/router/www/ipt-realtime.asp
release/src/router/www/qos-ctrate.asp
release/src/router/www/qos-detailed.asp
release/src/router/www/tomato.js
15 files changed:
release/src/router/httpd/bwm.c
release/src/router/httpd/tomato.c
release/src/router/nvram/defaults.c
release/src/router/rc/Makefile
release/src/router/rc/arpbind.c
release/src/router/rc/firewall.c
release/src/router/rc/rc.h
release/src/router/rc/services.c
release/src/router/www/about.asp
release/src/router/www/basic-network.asp
release/src/router/www/basic-static.asp
release/src/router/www/bwm-common.js
release/src/router/www/ipt-24.asp
release/src/router/www/ipt-realtime.asp
release/src/router/www/tomato.js