diff options
author | Parménides GV <parmegv@sdf.org> | 2014-05-14 20:05:30 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-05-14 20:05:30 +0200 |
commit | b79fd315dd89e7a9f648c6a500b41ce7d9970081 (patch) | |
tree | 862d3f5c68773589c1bed0e82ac1efda2d8ba541 /app/src/main/java/se/leap/openvpn/CIDRIP.java | |
parent | 0125b1a65c7c7cb31f0fde597b12d722c289e3f4 (diff) |
Copy all java files from ics-openvpn.
imports from se.leap.bitmaskclient java files have also been updated.
WARNING: compiling errors for de.blinkt.openvpn.R, aidl.de.blinkt.openvpn.
Diffstat (limited to 'app/src/main/java/se/leap/openvpn/CIDRIP.java')
-rw-r--r-- | app/src/main/java/se/leap/openvpn/CIDRIP.java | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/app/src/main/java/se/leap/openvpn/CIDRIP.java b/app/src/main/java/se/leap/openvpn/CIDRIP.java deleted file mode 100644 index 8c4b6709..00000000 --- a/app/src/main/java/se/leap/openvpn/CIDRIP.java +++ /dev/null @@ -1,58 +0,0 @@ -package se.leap.openvpn; - -class CIDRIP{ - String mIp; - int len; - public CIDRIP(String ip, String mask){ - mIp=ip; - long netmask=getInt(mask); - - // Add 33. bit to ensure the loop terminates - netmask += 1l << 32; - - int lenZeros = 0; - while((netmask & 0x1) == 0) { - lenZeros++; - netmask = netmask >> 1; - } - // Check if rest of netmask is only 1s - if(netmask != (0x1ffffffffl >> lenZeros)) { - // Asume no CIDR, set /32 - len=32; - } else { - len =32 -lenZeros; - } - - } - @Override - public String toString() { - return String.format("%s/%d",mIp,len); - } - - public boolean normalise(){ - long ip=getInt(mIp); - - long newip = ip & (0xffffffffl << (32 -len)); - if (newip != ip){ - mIp = String.format("%d.%d.%d.%d", (newip & 0xff000000) >> 24,(newip & 0xff0000) >> 16, (newip & 0xff00) >> 8 ,newip & 0xff); - return true; - } else { - return false; - } - } - static long getInt(String ipaddr) { - String[] ipt = ipaddr.split("\\."); - long ip=0; - - ip += Long.parseLong(ipt[0])<< 24; - ip += Integer.parseInt(ipt[1])<< 16; - ip += Integer.parseInt(ipt[2])<< 8; - ip += Integer.parseInt(ipt[3]); - - return ip; - } - public long getInt() { - return getInt(mIp); - } - -}
\ No newline at end of file |