From b40cab15f4d01a4e8455e5808ca82e40ff291a92 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Wed, 6 Jan 2021 12:12:39 +0100
Subject: Renaming VPN stuff to wireguard.

---
 .../main/java/io/trygvis/rules/acme/IpCalc.java    | 67 ----------------------
 1 file changed, 67 deletions(-)
 delete mode 100644 module/ri-engine/src/main/java/io/trygvis/rules/acme/IpCalc.java

(limited to 'module/ri-engine/src/main/java/io/trygvis/rules/acme')

diff --git a/module/ri-engine/src/main/java/io/trygvis/rules/acme/IpCalc.java b/module/ri-engine/src/main/java/io/trygvis/rules/acme/IpCalc.java
deleted file mode 100644
index 5369d62..0000000
--- a/module/ri-engine/src/main/java/io/trygvis/rules/acme/IpCalc.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.trygvis.rules.acme;
-
-import io.trygvis.rules.network.Ipv4Cidr;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-public class IpCalc {
-    private static final Pattern pattern = Pattern.compile("([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})/([0-9]{1,3})");
-
-    public static class FirstLast {
-        public final int first;
-        public final int last;
-
-        public FirstLast(int first, int last) {
-            this.first = first;
-            this.last = last;
-        }
-    }
-
-    public static Ipv4Cidr cidr(String cidr) {
-        var matcher = pattern.matcher(cidr);
-        if (!matcher.matches()) {
-            throw new IllegalArgumentException("Not a CIDR: " + cidr);
-        }
-
-        var b1 = matcher.group(1);
-        var b2 = matcher.group(2);
-        var b3 = matcher.group(3);
-        var b4 = matcher.group(4);
-
-        int network = parse(b1) << 24 |
-                parse(b2) << 16 |
-                parse(b3) << 8 |
-                parse(b4);
-
-//        System.out.printf("network = %x%n", network);
-
-        var l = matcher.group(5);
-        var bits = Integer.parseInt(l);
-        var hostBits = 32 - bits;
-        int size = 1 << hostBits;
-
-        int netmask = (-1 >> hostBits) << hostBits;
-//        System.out.printf("netmask = %08x%n", netmask);
-
-        int x = network & ~netmask;
-
-        if (x != 0) {
-            throw new IllegalArgumentException("Not a CIDR: " + cidr);
-        }
-
-        return new Ipv4Cidr(network, netmask, size, bits);
-    }
-
-    private static int parse(String s) {
-        var i = Integer.parseInt(s);
-        if (i > 255) {
-            throw new IllegalArgumentException("Not a CIDR");
-        }
-
-        return i;
-    }
-}
-- 
cgit v1.2.3