Fix IP range search

macronut · Oct 30, 2023 · 0b956a4 · 0b956a4
1 parent 8b41804
commit 0b956a4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/phantomtcp/phantom.go b/phantomtcp/phantom.go
@@ -182,18 +182,20 @@ func (profile *PhantomProfile) GetInterfaceByIP(ip net.IP) *PhantomInterface {
 	ip4 := ip.To4()
 	if ip4 != nil {
 		ip := binary.BigEndian.Uint32(ip4)
-		index := sort.Search(len(profile.IPv4Ranges), func(i int) bool {
+		lenRanges := len(profile.IPv4Ranges)
+		index := sort.Search(lenRanges, func(i int) bool {
 			return profile.IPv4Ranges[i].End > ip
 		})
-		if ip >= profile.IPv4Ranges[index].Start {
+		if index >= 0 && index < lenRanges && ip >= profile.IPv4Ranges[index].Start {
 			return profile.IPv4Ranges[index].Interface
 		}
 	} else {
+		lenRanges := len(profile.IPv6Ranges)
 		ip := binary.BigEndian.Uint64(ip[:16])
 		index := sort.Search(len(profile.IPv6Ranges), func(i int) bool {
 			return profile.IPv6Ranges[i].End > ip
 		})
-		if ip >= profile.IPv6Ranges[index].Start {
+		if index >= 0 && index < lenRanges && ip >= profile.IPv6Ranges[index].Start {
 			return profile.IPv6Ranges[index].Interface
 		}
 	}

diff --git a/phantomtcp/proxy.go b/phantomtcp/proxy.go
@@ -290,7 +290,8 @@ func tcp_redirect(client net.Conn, addr *net.TCPAddr, domain string, header []by
 
 		var pface *PhantomInterface = nil
 		if domain == "" {
-			pface, ok := DefaultProfile.DomainMap[domain]
+			var ok bool
+			pface, ok = DefaultProfile.DomainMap[domain]
 			if !ok {
 				pface = DefaultProfile.GetInterfaceByIP(addr.IP)
 			}
@@ -301,6 +302,8 @@ func tcp_redirect(client net.Conn, addr *net.TCPAddr, domain string, header []by
 			pface = DefaultProfile.GetInterface(domain)
 		}
 
+		logPrintln(1, pface)
+
 		if pface != nil && (pface.Protocol != 0 || pface.Hint != 0) {
 			if pface.Hint&HINT_NOTCP != 0 {
 				time.Sleep(time.Second)

diff --git a/phantomtcp/raw.go b/phantomtcp/raw.go
@@ -363,13 +363,11 @@ func ModifyAndSendPacket(connInfo *ConnectionInfo, payload []byte, hint uint32,
 		}
 		defer f.Close()
 		fd := int(f.Fd())
-		level := syscall.IPPROTO_IP
-		name := syscall.IP_TTL
 		if network == "ip6:tcp" {
-			level = syscall.IPPROTO_IPV6
-			name = syscall.IPV6_UNICAST_HOPS
+			err = syscall.SetsockoptInt(fd, syscall.IPPROTO_IPV6, syscall.IPV6_UNICAST_HOPS, int(ttl))
+		} else {
+			err = syscall.SetsockoptInt(fd, syscall.IPPROTO_IP, syscall.IP_TTL, int(ttl))
 		}
-		err = syscall.SetsockoptInt(fd, level, name, int(ttl))
 		if err != nil {
 			return err
 		}