修改ip pool策略

2025-08-07 23:04:17 +08:00 · 2023-04-19 18:12:50 +08:00
parent bc9248e16b
commit 638c601c02
15 changed files with 452 additions and 9919 deletions
--- a/server/sessdata/ip_pool.go
+++ b/server/sessdata/ip_pool.go
@@ -13,8 +13,10 @@ import (
 var (
 	IpPool   = &ipPoolConfig{}
 	ipActive = map[string]bool{}
+	ipAll    = map[string]*dbdata.IpMap{}
+	ipKeep   = map[string]bool{}
 	// ipKeep and ipLease  ipAddr => type
-	ipLease   = map[string]bool{}
+	// ipLease   = map[string]bool{}
 	ipPoolMux sync.Mutex
 )

@@ -49,33 +51,69 @@ func initIpPool() {
 	IpPool.IpLongMax = utils.Ip2long(net.ParseIP(base.Cfg.Ipv4End))

 	// 获取IpLease数据
-	//go cronIpLease()
+	// go cronIpLease()
+	getIpMapAll()
 }

-func cronIpLease() {
-	getIpLease()
-	tick := time.NewTicker(time.Minute * 30)
-	for range tick.C {
-		getIpLease()
-	}
-}
+// func cronIpLease() {
+// 	getIpLease()
+// 	tick := time.NewTicker(time.Minute * 30)
+// 	for range tick.C {
+// 		getIpLease()
+// 	}
+// }
+//
+// func getIpLease() {
+// 	xdb := dbdata.GetXdb()
+// 	keepIpMaps := []dbdata.IpMap{}
+// 	sNow := time.Now().Add(-1 * time.Duration(base.Cfg.IpLease) * time.Second)
+// 	err := xdb.Cols("ip_addr").Where("keep=?", true).
+// 		Or("unique_mac=? and last_login>?", true, sNow).Find(&keepIpMaps)
+// 	if err != nil {
+// 		base.Error(err)
+// 	}
+// 	// fmt.Println(keepIpMaps)
+// 	ipPoolMux.Lock()
+// 	ipLease = map[string]bool{}
+// 	for _, v := range keepIpMaps {
+// 		ipLease[v.IpAddr] = true
+// 	}
+// 	ipPoolMux.Unlock()
+// }

-func getIpLease() {
-	xdb := dbdata.GetXdb()
-	keepIpMaps := []dbdata.IpMap{}
-	sNow := time.Now().Add(-1 * time.Duration(base.Cfg.IpLease) * time.Second)
-	err := xdb.Cols("ip_addr").Where("keep=?", true).
-		Or("unique_mac=? and last_login>?", true, sNow).Find(&keepIpMaps)
-	if err != nil {
-		base.Error(err)
-	}
-	// fmt.Println(keepIpMaps)
+func IpAllSet(v *dbdata.IpMap) {
 	ipPoolMux.Lock()
-	ipLease = map[string]bool{}
-	for _, v := range keepIpMaps {
-		ipLease[v.IpAddr] = true
+	defer ipPoolMux.Unlock()
+
+	ipAll[v.IpAddr] = v
+	if v.Keep {
+		ipKeep[v.IpAddr] = true
+	} else {
+		delete(ipKeep, v.IpAddr)
+	}
+}
+
+func IpAllDel(v *dbdata.IpMap) {
+	ipPoolMux.Lock()
+	defer ipPoolMux.Unlock()
+
+	delete(ipAll, v.IpAddr)
+	delete(ipKeep, v.IpAddr)
+}
+
+func getIpMapAll() {
+	xdb := dbdata.GetXdb()
+	ipMaps := []dbdata.IpMap{}
+	err := xdb.Find(&ipMaps)
+	if err != nil {
+		base.Fatal(err)
+	}
+	for _, v := range ipMaps {
+		ipAll[v.IpAddr] = &v
+		if v.Keep {
+			ipKeep[v.IpAddr] = true
+		}
 	}
-	ipPoolMux.Unlock()
 }

 // AcquireIp 获取动态ip
@@ -84,21 +122,23 @@ func AcquireIp(username, macAddr string, uniqueMac bool) net.IP {
 	defer ipPoolMux.Unlock()

 	var (
-		err       error
-		tNow      = time.Now()
-		leaseTime = time.Now().Add(-1 * time.Duration(base.Cfg.IpLease) * time.Second)
+		err  error
+		tNow = time.Now()
 	)

+	// 唯一mac
 	if uniqueMac {
 		// 判断是否已经分配过
 		mi := &dbdata.IpMap{}
 		err = dbdata.One("mac_addr", macAddr, mi)
-		// 查询报错
 		if err != nil {
-			if !dbdata.CheckErrNotFound(err) {
-				base.Error(err)
-				return nil
+			// 没有查询到数据
+			if dbdata.CheckErrNotFound(err) {
+				return loopIp(username, macAddr, uniqueMac)
 			}
+			// 查询报错
+			base.Error(err)
+			return nil
 		}

 		// 存在ip记录
@@ -107,59 +147,73 @@ func AcquireIp(username, macAddr string, uniqueMac bool) net.IP {
 		// 跳过活跃连接
 		_, ok := ipActive[ipStr]
 		// 检测原有ip是否在新的ip池内
-		if IpPool.Ipv4IPNet.Contains(ip) && !ok &&
-			utils.Ip2long(ip) >= IpPool.IpLongMin &&
-			utils.Ip2long(ip) <= IpPool.IpLongMax {
+		// IpPool.Ipv4IPNet.Contains(ip) &&
+		if utils.Ip2long(ip) >= IpPool.IpLongMin &&
+			utils.Ip2long(ip) <= IpPool.IpLongMax && !ok {
 			mi.Username = username
 			mi.LastLogin = tNow
 			mi.UniqueMac = uniqueMac
 			// 回写db数据
 			_ = dbdata.Set(mi)
 			ipActive[ipStr] = true
+			ipAll[ipStr] = mi
 			return ip
 		}
+		// 原有ip不符合
 		_ = dbdata.Del(mi)
+		delete(ipAll, ipStr)
+		return loopIp(username, macAddr, uniqueMac)
+	}

-	} else {
-		ipMaps := []dbdata.IpMap{}
-		err = dbdata.FindWhere(&ipMaps, 50, 1, "username=? and unique_mac=?", username, false)
-		// 查询报错
-		if err != nil {
-			if !dbdata.CheckErrNotFound(err) {
-				base.Error(err)
-				return nil
-			}
+	// 没有获取到mac
+	ipMaps := []dbdata.IpMap{}
+	err = dbdata.FindWhere(&ipMaps, 50, 1, "username=? and unique_mac=?", username, false)
+	if err != nil {
+		// 没有查询到数据
+		if dbdata.CheckErrNotFound(err) {
+			return loopIp(username, macAddr, uniqueMac)
 		}
-
-		//遍历mac记录
-		for _, mi := range ipMaps {
-			ipStr := mi.IpAddr
-			ip := net.ParseIP(ipStr)
-
-			// 跳过活跃连接
-			if _, ok := ipActive[ipStr]; ok {
-				continue
-			}
-			//跳过保留ip
-			if mi.Keep {
-				continue
-			}
-
-			if IpPool.Ipv4IPNet.Contains(ip) &&
-				mi.LastLogin.Before(leaseTime) && // 说明已经超过租期，可以直接使用
-				utils.Ip2long(ip) >= IpPool.IpLongMin &&
-				utils.Ip2long(ip) <= IpPool.IpLongMax {
-				mi.LastLogin = tNow
-				mi.MacAddr = macAddr
-				mi.UniqueMac = uniqueMac
-				// 回写db数据
-				_ = dbdata.Set(mi)
-				ipActive[ipStr] = true
-				return ip
-			}
+		// 查询报错
+		base.Error(err)
+		return nil
+	}
+	// 遍历 用户的 mac记录
+	for _, im := range ipMaps {
+		mi := &im
+		ipStr := mi.IpAddr
+		ip := net.ParseIP(ipStr)
+		// 跳过活跃连接
+		if _, ok := ipActive[ipStr]; ok {
+			continue
+		}
+		// 跳过保留ip
+		if mi.Keep {
+			continue
+		}
+		// 没有租期限制
+		if utils.Ip2long(ip) >= IpPool.IpLongMin &&
+			utils.Ip2long(ip) <= IpPool.IpLongMax {
+			mi.LastLogin = tNow
+			mi.MacAddr = macAddr
+			mi.UniqueMac = uniqueMac
+			// 回写db数据
+			_ = dbdata.Set(mi)
+			ipActive[ipStr] = true
+			ipAll[ipStr] = mi
+			return ip
 		}
 	}

+	return loopIp(username, macAddr, uniqueMac)
+}
+
+// 遍历ip
+func loopIp(username, macAddr string, uniqueMac bool) net.IP {
+	var (
+		tNow      = time.Now()
+		leaseTime = time.Now().Add(-1 * time.Duration(base.Cfg.IpLease) * time.Second)
+	)
+
 	// 全局遍历超过租期和未保留的ip
 	for i := IpPool.IpLongMin; i <= IpPool.IpLongMax; i++ {
 		ip := utils.Long2ip(i)
@@ -169,41 +223,37 @@ func AcquireIp(username, macAddr string, uniqueMac bool) net.IP {
 		if _, ok := ipActive[ipStr]; ok {
 			continue
 		}
-
-		mi := &dbdata.IpMap{}
-		err = dbdata.One("ip_addr", ipStr, mi)
-		if err == nil {
-			//跳过保留ip
-			if mi.Keep {
-				continue
-			}
-			if mi.LastLogin.Before(leaseTime) {
-				// 存在记录，说明已经超过租期，可以直接使用
-				mi.LastLogin = tNow
-				mi.MacAddr = macAddr
-				mi.UniqueMac = uniqueMac
-				// 回写db数据
-				_ = dbdata.Set(mi)
-				ipActive[ipStr] = true
-				return ip
-			}
+		// 跳过保留ip
+		if _, ok := ipKeep[ipStr]; ok {
+			continue
 		}

-		if dbdata.CheckErrNotFound(err) {
-			// 该ip没有被使用
-			mi := &dbdata.IpMap{IpAddr: ipStr, MacAddr: macAddr, UniqueMac: uniqueMac, Username: username, LastLogin: tNow}
+		mi, ok := ipAll[ipStr]
+		if !ok {
+			// 该ip没有被使用 直接返回
+			mi = &dbdata.IpMap{IpAddr: ipStr, MacAddr: macAddr, UniqueMac: uniqueMac, Username: username, LastLogin: tNow}
 			_ = dbdata.Add(mi)
 			ipActive[ipStr] = true
+			ipAll[ipStr] = mi
 			return ip
 		}

-		// 查询报错
-		if err != nil {
-			base.Error(err)
-			return nil
+		// 存在记录
+		if mi.LastLogin.Before(leaseTime) {
+			// 存在记录，说明已经超过租期，可以直接使用
+			mi.LastLogin = tNow
+			mi.MacAddr = macAddr
+			mi.UniqueMac = uniqueMac
+			// 回写db数据
+			_ = dbdata.Set(mi)
+			ipActive[ipStr] = true
+			ipAll[ipStr] = mi
+			return ip
 		}
 	}

+	// 最后从未超过租期的记录获取一个
+
 	base.Warn("no ip available, please see ip_map table row")
 	return nil
 }
@@ -220,5 +270,6 @@ func ReleaseIp(ip net.IP, macAddr string) {
 	if err == nil {
 		mi.LastLogin = time.Now()
 		_ = dbdata.Set(mi)
+		ipAll[mi.IpAddr] = mi
 	}
 }