Merge remote-tracking branch 'origin/master'

This commit is contained in:
Daniel Roesler 2015-01-28 18:47:03 -08:00
commit f08f997c22

View file

@ -79,8 +79,8 @@
var li = document.createElement("li"); var li = document.createElement("li");
li.textContent = ip; li.textContent = ip;
//local IPs (TODO: 172.16.0.0/12) //local IPs
if(ip.indexOf("10.") === 0 || ip.indexOf("192.168.") === 0) if (ip.match(/^(192\.168\.|10\.|172\.(1[6-9]|2\d|3[01]))/))
document.getElementsByTagName("ul")[0].appendChild(li); document.getElementsByTagName("ul")[0].appendChild(li);
//assume the rest are public IPs //assume the rest are public IPs