DNS自定义线路中增加CIDR、区域以及排除功能

pkg/configutils/ip.go

@@ -2,27 +2,71 @@ package configutils
 
 import (
 	"encoding/binary"
-	"github.com/cespare/xxhash/v2"
-	"math"
+	"math/big"
 	"net"
 	"strings"
 )
 
-// IP2Long 将IP转换为整型
+// IPString2Long 将IP转换为整型
 // 注意IPv6没有顺序
-func IP2Long(ip string) uint64 {
+func IPString2Long(ip string) uint64 {
 	if len(ip) == 0 {
 		return 0
 	}
-	s := net.ParseIP(ip)
-	if len(s) == 0 {
+	var netIP = net.ParseIP(ip)
+	if len(netIP) == 0 {
+		return 0
+	}
+	return IP2Long(netIP)
+}
+
+// IP2Long 将IP对象转换为整型
+func IP2Long(netIP net.IP) uint64 {
+	if len(netIP) == 0 {
 		return 0
 	}
 
-	if strings.Contains(ip, ":") {
-		return math.MaxUint32 + xxhash.Sum64(s)
+	var b4 = netIP.To4()
+	if b4 != nil {
+		return uint64(binary.BigEndian.Uint32(b4.To4()))
 	}
-	return uint64(binary.BigEndian.Uint32(s.To4()))
+
+	var i = big.NewInt(0)
+	i.SetBytes(netIP.To16())
+	return i.Uint64()
+}
+
+// IsIPv4 检查是否为IPv4
+func IsIPv4(netIP net.IP) bool {
+	if len(netIP) == 0 {
+		return false
+	}
+	return netIP.To4() != nil
+}
+
+// IsIPv6 检查是否为IPv6
+func IsIPv6(netIP net.IP) bool {
+	if len(netIP) == 0 {
+		return false
+	}
+	return netIP.To4() == nil && netIP.To16() != nil
+}
+
+// IPVersion 获取IP版本号
+func IPVersion(netIP net.IP) int {
+	if len(netIP) == 0 {
+		return 0
+	}
+
+	if netIP.To4() != nil {
+		return 4
+	}
+
+	if netIP.To16() != nil {
+		return 6
+	}
+
+	return 0
 }
 
 // ParseCIDR 计算CIDR最大值

pkg/configutils/ip_test.go

@@ -1,11 +1,41 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
 
-package configutils
+package configutils_test
 
-import "testing"
+import (
+	"fmt"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/iwind/TeaGo/assert"
+	"net"
+	"testing"
+)
 
 func TestParseCIDR(t *testing.T) {
-	t.Log(ParseCIDR("192.168.1.1/32"))
-	t.Log(ParseCIDR("192.168.1.1/24"))
-	t.Log(ParseCIDR("192.168.1.1/16"))
+	t.Log(configutils.ParseCIDR("192.168.1.1/32"))
+	t.Log(configutils.ParseCIDR("192.168.1.1/24"))
+	t.Log(configutils.ParseCIDR("192.168.1.1/16"))
+}
+
+func TestIPString2Long(t *testing.T) {
+	for _, ip := range []string{"127.0.0.1", "192.168.1.100", "::1", "fd00:6868:6868:0:10ac:d056:3bf6:7452", "fd00:6868:6868:0:10ac:d056:3bf6:7453", "2001:0db8:85a3:0000:0000:8a2e:0370:7334", "wrong ip"} {
+		t.Log(fmt.Sprintf("%42s", ip), "=>", configutils.IPString2Long(ip))
+	}
+}
+
+func TestIsIPv4(t *testing.T) {
+	t.Log(configutils.IsIPv4(net.ParseIP("192.168.1.100")))
+	t.Log(configutils.IsIPv4(net.ParseIP("::1")))
+}
+
+func TestIsIPv6(t *testing.T) {
+	t.Log(configutils.IsIPv6(net.ParseIP("192.168.1.100")))
+	t.Log(configutils.IsIPv6(net.ParseIP("::1")))
+}
+
+func TestIPVersion(t *testing.T) {
+	var a = assert.NewAssertion(t)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("192.168.1.100")) == 4)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("1.2.3")) == 0)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("::1")) == 6)
+	a.IsTrue(configutils.IPVersion(net.ParseIP("2001:0db8:85a3:0000:0000:8a2e:0370:7334")) == 6)
 }