增加管理后台

2025-08-11 01:37:26 +08:00 · 2020-12-16 16:36:56 +08:00
parent 31b1f12dbe
commit a9584000c6
68 changed files with 2408 additions and 1281 deletions
--- a/sessdata/ip_pool.go
+++ b/sessdata/ip_pool.go
@@ -6,29 +6,16 @@ import (
 	"sync"
 	"time"

-	"github.com/bjdgyc/anylink/common"
+	"github.com/bjdgyc/anylink/base"
 	"github.com/bjdgyc/anylink/dbdata"
 )

-const (
-	// ip租期 (秒)
-	IpLease = 1209600
-)
-
 var (
-	IpPool  = &IpPoolConfig{}
-	macInfo = map[string]*MacIp{}
-	ipInfo  = map[string]*MacIp{}
+	IpPool   = &ipPoolConfig{}
+	ipActive = map[string]bool{}
 )

-type MacIp struct {
-	IsActive  bool
-	Ip        net.IP
-	MacAddr   string
-	LastLogin time.Time
-}
-
-type IpPoolConfig struct {
+type ipPoolConfig struct {
 	mux sync.Mutex
 	// 计算动态ip
 	Ipv4Gateway net.IP
@@ -37,25 +24,15 @@ type IpPoolConfig struct {
 	IpLongMax   uint32
 }

-func initIpMac() {
-	macs := dbdata.GetAllMacIp()
-	for _, v := range macs {
-		mi := &MacIp{}
-		CopyStruct(mi, v)
-		macInfo[v.MacAddr] = mi
-		ipInfo[v.Ip.String()] = mi
-	}
-}
-
 func initIpPool() {

 	// 地址处理
 	// ip地址
-	ip := net.ParseIP(common.ServerCfg.Ipv4Network)
+	ip := net.ParseIP(base.Cfg.Ipv4Network)
 	// 子网掩码
-	maskIp := net.ParseIP(common.ServerCfg.Ipv4Netmask).To4()
+	maskIp := net.ParseIP(base.Cfg.Ipv4Netmask).To4()
 	IpPool.Ipv4IPNet = net.IPNet{IP: ip, Mask: net.IPMask(maskIp)}
-	IpPool.Ipv4Gateway = net.ParseIP(common.ServerCfg.Ipv4Gateway)
+	IpPool.Ipv4Gateway = net.ParseIP(base.Cfg.Ipv4Gateway)

 	// 网络地址零值
 	// zero := binary.BigEndian.Uint32(ip.Mask(mask))
@@ -64,8 +41,8 @@ func initIpPool() {
 	// max := min | uint32(math.Pow(2, float64(32-one))-1)

 	// ip地址池
-	IpPool.IpLongMin = ip2long(net.ParseIP(common.ServerCfg.Ipv4Pool[0]))
-	IpPool.IpLongMax = ip2long(net.ParseIP(common.ServerCfg.Ipv4Pool[1]))
+	IpPool.IpLongMin = ip2long(net.ParseIP(base.Cfg.Ipv4Pool[0]))
+	IpPool.IpLongMax = ip2long(net.ParseIP(base.Cfg.Ipv4Pool[1]))
 }

 func long2ip(i uint32) net.IP {
@@ -80,79 +57,96 @@ func ip2long(ip net.IP) uint32 {
 }

 // 获取动态ip
-func AcquireIp(macAddr string) net.IP {
+func AcquireIp(username, macAddr string) net.IP {
 	IpPool.mux.Lock()
 	defer IpPool.mux.Unlock()
+
 	tNow := time.Now()

 	// 判断已经分配过
-	if mi, ok := macInfo[macAddr]; ok {
-		ip := mi.Ip
+	mi := &dbdata.IpMap{}
+	err := dbdata.One("MacAddr", macAddr, mi)
+	if err == nil {
+		ip := mi.IpAddr
+		ipStr := ip.String()
 		// 检测原有ip是否在新的ip池内
 		if IpPool.Ipv4IPNet.Contains(ip) {
-			mi.IsActive = true
+			mi.Username = username
 			mi.LastLogin = tNow
 			// 回写db数据
-			dbdata.Set(dbdata.BucketMacIp, macAddr, mi)
+			dbdata.Save(mi)
+			ipActive[ipStr] = true
 			return ip
 		} else {
-			delete(macInfo, macAddr)
-			delete(ipInfo, ip.String())
-			dbdata.Del(dbdata.BucketMacIp, macAddr)
+			dbdata.Del(mi)
 		}
 	}

-	farMac := &MacIp{LastLogin: tNow}
 	// 全局遍历未分配ip
+	// 优先获取没有使用的ip
 	for i := IpPool.IpLongMin; i <= IpPool.IpLongMax; i++ {
 		ip := long2ip(i)
 		ipStr := ip.String()
-		v, ok := ipInfo[ipStr]
-		// 该ip没有被使用
-		if !ok {
-			mi := &MacIp{IsActive: true, Ip: ip, MacAddr: macAddr, LastLogin: tNow}
-			macInfo[macAddr] = mi
-			ipInfo[ipStr] = mi
-			// 回写db数据
-			dbdata.Set(dbdata.BucketMacIp, macAddr, mi)
+		mi := &dbdata.IpMap{}
+		err := dbdata.One("IpAddr", ip, mi)
+		if err != nil && dbdata.CheckErrNotFound(err) {
+			// 该ip没有被使用
+			mi := &dbdata.IpMap{IpAddr: ip, MacAddr: macAddr, Username: username, LastLogin: tNow}
+			dbdata.Save(mi)
+			ipActive[ipStr] = true
+			return ip
+		}
+	}
+
+	farIp := &dbdata.IpMap{LastLogin: tNow}
+	// 遍历超过租期ip
+	for i := IpPool.IpLongMin; i <= IpPool.IpLongMax; i++ {
+		ip := long2ip(i)
+		ipStr := ip.String()
+
+		// 跳过活跃连接
+		if _, ok := ipActive[ipStr]; ok {
+			continue
+		}
+
+		v := &dbdata.IpMap{}
+		err := dbdata.One("IpAddr", ip, v)
+		if err != nil {
+			base.Error(err)
+			return nil
+		}
+		if v.Keep {
+			continue
+		}
+
+		// 已经超过租期
+		if tNow.Sub(v.LastLogin) > time.Duration(base.Cfg.IpLease)*time.Second {
+			dbdata.Del(v)
+			mi := &dbdata.IpMap{IpAddr: ip, MacAddr: macAddr, Username: username, LastLogin: tNow}
+			// 重写db数据
+			dbdata.Save(mi)
+			ipActive[ipStr] = true
 			return ip
 		}

-		// 跳过活跃连接
-		if v.IsActive {
-			continue
-		}
-		// 已经超过租期
-		if tNow.Sub(v.LastLogin) > IpLease*time.Second {
-			delete(macInfo, v.MacAddr)
-			mi := &MacIp{IsActive: true, Ip: ip, MacAddr: macAddr, LastLogin: tNow}
-			macInfo[macAddr] = mi
-			ipInfo[ipStr] = mi
-			// 回写db数据
-			dbdata.Del(dbdata.BucketMacIp, v.MacAddr)
-			dbdata.Set(dbdata.BucketMacIp, macAddr, mi)
-			return ip
-		}
-		// 其他情况判断最早登陆的mac
-		if v.LastLogin.Before(farMac.LastLogin) {
-			farMac = v
+		// 其他情况判断最早登陆
+		if v.LastLogin.Before(farIp.LastLogin) {
+			farIp = v
 		}
 	}

 	// 全都在线，没有数据可用
-	if farMac.MacAddr == "" {
+	if farIp.Id == 0 {
 		return nil
 	}

 	// 使用最早登陆的mac ip
-	delete(macInfo, farMac.MacAddr)
-	ip := farMac.Ip
-	mi := &MacIp{IsActive: true, Ip: ip, MacAddr: macAddr, LastLogin: tNow}
-	macInfo[macAddr] = mi
-	ipInfo[ip.String()] = mi
+	ip := farIp.IpAddr
+	ipStr := ip.String()
+	mi = &dbdata.IpMap{IpAddr: ip, MacAddr: macAddr, Username: username, LastLogin: tNow}
 	// 回写db数据
-	dbdata.Del(dbdata.BucketMacIp, farMac.MacAddr)
-	dbdata.Set(dbdata.BucketMacIp, macAddr, mi)
+	dbdata.Save(mi)
+	ipActive[ipStr] = true
 	return ip
 }

@@ -160,12 +154,12 @@ func AcquireIp(macAddr string) net.IP {
 func ReleaseIp(ip net.IP, macAddr string) {
 	IpPool.mux.Lock()
 	defer IpPool.mux.Unlock()
-	if mi, ok := macInfo[macAddr]; ok {
-		if mi.Ip.Equal(ip) {
-			mi.IsActive = false
-			mi.LastLogin = time.Now()
-			// 回写db数据
-			dbdata.Set(dbdata.BucketMacIp, macAddr, mi)
-		}
+
+	delete(ipActive, ip.String())
+	mi := &dbdata.IpMap{}
+	err := dbdata.One("IpAddr", ip, mi)
+	if err == nil {
+		mi.LastLogin = time.Now()
+		dbdata.Save(mi)
 	}
 }