From 598ec35701b769c630b604129d3bba688a715c17 Mon Sep 17 00:00:00 2001
From: gVisor bot <gvisor-bot@google.com>
Date: Fri, 18 Mar 2022 05:17:47 +0800
Subject: [PATCH] Chore: make fake ip pool start with the third ip

---
 component/fakeip/pool.go                      |  6 ++---
 component/fakeip/pool_test.go                 | 23 ++++++++++---------
 listener/tun/ipstack/commons/router_darwin.go | 21 +++++++++--------
 listener/tun/tun_adapter.go                   | 10 ++++----
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/component/fakeip/pool.go b/component/fakeip/pool.go
index 43b9cee1..68484899 100644
--- a/component/fakeip/pool.go
+++ b/component/fakeip/pool.go
@@ -147,10 +147,10 @@ type Options struct {
 
 // New return Pool instance
 func New(options Options) (*Pool, error) {
-	min := ipToUint(options.IPNet.IP) + 2
+	min := ipToUint(options.IPNet.IP) + 3
 
 	ones, bits := options.IPNet.Mask.Size()
-	total := 1<<uint(bits-ones) - 3
+	total := 1<<uint(bits-ones) - 4
 
 	if total <= 0 {
 		return nil, errors.New("ipnet don't have valid ip")
@@ -160,7 +160,7 @@ func New(options Options) (*Pool, error) {
 	pool := &Pool{
 		min:       min,
 		max:       max,
-		gateway:   min - 1,
+		gateway:   min - 2,
 		broadcast: max + 1,
 		host:      options.Host,
 		ipnet:     options.IPNet,
diff --git a/component/fakeip/pool_test.go b/component/fakeip/pool_test.go
index 0556d78a..1e30bd94 100644
--- a/component/fakeip/pool_test.go
+++ b/component/fakeip/pool_test.go
@@ -49,7 +49,7 @@ func createCachefileStore(options Options) (*Pool, string, error) {
 }
 
 func TestPool_Basic(t *testing.T) {
-	_, ipnet, _ := net.ParseCIDR("192.168.0.1/29")
+	_, ipnet, _ := net.ParseCIDR("192.168.0.0/28")
 	pools, tempfile, err := createPools(Options{
 		IPNet: ipnet,
 		Size:  10,
@@ -62,21 +62,22 @@ func TestPool_Basic(t *testing.T) {
 		last := pool.Lookup("bar.com")
 		bar, exist := pool.LookBack(last)
 
-		assert.True(t, first.Equal(net.IP{192, 168, 0, 2}))
-		assert.Equal(t, pool.Lookup("foo.com"), net.IP{192, 168, 0, 2})
-		assert.True(t, last.Equal(net.IP{192, 168, 0, 3}))
+		assert.True(t, first.Equal(net.IP{192, 168, 0, 3}))
+		assert.Equal(t, pool.Lookup("foo.com"), net.IP{192, 168, 0, 3})
+		assert.True(t, last.Equal(net.IP{192, 168, 0, 4}))
 		assert.True(t, exist)
 		assert.Equal(t, bar, "bar.com")
 		assert.Equal(t, pool.Gateway(), net.IP{192, 168, 0, 1})
+		assert.Equal(t, pool.Broadcast(), net.IP{192, 168, 0, 15})
 		assert.Equal(t, pool.IPNet().String(), ipnet.String())
-		assert.True(t, pool.Exist(net.IP{192, 168, 0, 3}))
-		assert.False(t, pool.Exist(net.IP{192, 168, 0, 4}))
+		assert.True(t, pool.Exist(net.IP{192, 168, 0, 4}))
+		assert.False(t, pool.Exist(net.IP{192, 168, 0, 5}))
 		assert.False(t, pool.Exist(net.ParseIP("::1")))
 	}
 }
 
 func TestPool_CycleUsed(t *testing.T) {
-	_, ipnet, _ := net.ParseCIDR("192.168.0.1/29")
+	_, ipnet, _ := net.ParseCIDR("192.168.0.16/28")
 	pools, tempfile, err := createPools(Options{
 		IPNet: ipnet,
 		Size:  10,
@@ -87,7 +88,7 @@ func TestPool_CycleUsed(t *testing.T) {
 	for _, pool := range pools {
 		foo := pool.Lookup("foo.com")
 		bar := pool.Lookup("bar.com")
-		for i := 0; i < 2; i++ {
+		for i := 0; i < 9; i++ {
 			pool.Lookup(fmt.Sprintf("%d.com", i))
 		}
 		baz := pool.Lookup("baz.com")
@@ -98,7 +99,7 @@ func TestPool_CycleUsed(t *testing.T) {
 }
 
 func TestPool_Skip(t *testing.T) {
-	_, ipnet, _ := net.ParseCIDR("192.168.0.1/30")
+	_, ipnet, _ := net.ParseCIDR("192.168.0.1/29")
 	tree := trie.New()
 	tree.Insert("example.com", tree)
 	pools, tempfile, err := createPools(Options{
@@ -169,8 +170,8 @@ func TestPool_Clone(t *testing.T) {
 
 	first := pool.Lookup("foo.com")
 	last := pool.Lookup("bar.com")
-	assert.True(t, first.Equal(net.IP{192, 168, 0, 2}))
-	assert.True(t, last.Equal(net.IP{192, 168, 0, 3}))
+	assert.True(t, first.Equal(net.IP{192, 168, 0, 3}))
+	assert.True(t, last.Equal(net.IP{192, 168, 0, 4}))
 
 	newPool, _ := New(Options{
 		IPNet: ipnet,
diff --git a/listener/tun/ipstack/commons/router_darwin.go b/listener/tun/ipstack/commons/router_darwin.go
index 97233144..b57ed7ba 100644
--- a/listener/tun/ipstack/commons/router_darwin.go
+++ b/listener/tun/ipstack/commons/router_darwin.go
@@ -20,7 +20,7 @@ func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int,
 	var (
 		interfaceName = dev.Name()
 		ip            = addr.Masked().Addr().Next()
-		gw            = ip
+		gw            = ip.Next()
 		netmask       = IPv4MaskString(addr.Bits())
 	)
 
@@ -31,10 +31,10 @@ func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int,
 		return err
 	}
 
-	// _, err = cmd.ExecCmd(fmt.Sprintf("ipconfig set %s automatic-v6", interfaceName))
-	// if err != nil {
-	//	return err
-	// }
+	_, err = cmd.ExecCmd(fmt.Sprintf("ipconfig set %s automatic-v6", interfaceName))
+	if err != nil {
+		return err
+	}
 
 	if autoRoute {
 		err = configInterfaceRouting(interfaceName, addr)
@@ -43,15 +43,18 @@ func ConfigInterfaceAddress(dev device.Device, addr netip.Prefix, forceMTU int,
 }
 
 func configInterfaceRouting(interfaceName string, addr netip.Prefix) error {
-	routes := append(Routes, addr.String())
+	var (
+		routes  = append(Routes, addr.String())
+		gateway = addr.Masked().Addr().Next()
+	)
 
-	for _, route := range routes {
-		if err := execRouterCmd("add", "-inet", route, interfaceName); err != nil {
+	for _, destination := range routes {
+		if _, err := cmd.ExecCmd(fmt.Sprintf("route add -net %s %s", destination, gateway)); err != nil {
 			return err
 		}
 	}
 
-	// return execRouterCmd("add", "-inet6", "2000::/3", interfaceName)
+	return execRouterCmd("add", "-inet6", "2000::/3", interfaceName)
 	return nil
 }
 
diff --git a/listener/tun/tun_adapter.go b/listener/tun/tun_adapter.go
index 5c9361c5..333a85bd 100644
--- a/listener/tun/tun_adapter.go
+++ b/listener/tun/tun_adapter.go
@@ -25,11 +25,11 @@ import (
 // New TunAdapter
 func New(tunConf *config.Tun, tunAddressPrefix string, tcpIn chan<- C.ConnContext, udpIn chan<- *inbound.PacketAdapter) (ipstack.Stack, error) {
 	var (
-		tunAddress = netip.MustParsePrefix(tunAddressPrefix)
-		devName    = tunConf.Device
-		stackType  = tunConf.Stack
-		autoRoute  = tunConf.AutoRoute
-		mtu        = 9000
+		tunAddress, _ = netip.ParsePrefix(tunAddressPrefix)
+		devName       = tunConf.Device
+		stackType     = tunConf.Stack
+		autoRoute     = tunConf.AutoRoute
+		mtu           = 9000
 
 		tunDevice device.Device
 		tunStack  ipstack.Stack