purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-29 08:36:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix IPv6 random IP logic error (#3232)

Browse Source 
* Update handler.go

fix CIDR6

* Update handler.go
This commit is contained in:
Aubrey Yang 2024-04-07 06:01:07 +08:00 committed by GitHub
parent ec3b2b0907
commit 8374d59ce6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/proxyman/outbound/handler.go
View File

@ -2,12 +2,8 @@ package outbound
import ( import (
"context" "context"
"crypto/rand"
"errors" "errors"
"io"
"math/rand"
gonet "net"
"os"
"github.com/xtls/xray-core/app/proxyman" "github.com/xtls/xray-core/app/proxyman"
"github.com/xtls/xray-core/common" "github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf" "github.com/xtls/xray-core/common/buf"
@ -25,6 +21,10 @@ import (
"github.com/xtls/xray-core/transport/internet/stat" "github.com/xtls/xray-core/transport/internet/stat"
"github.com/xtls/xray-core/transport/internet/tls" "github.com/xtls/xray-core/transport/internet/tls"
"github.com/xtls/xray-core/transport/pipe" "github.com/xtls/xray-core/transport/pipe"
"io"
"math/big"
gonet "net"
"os"
) )
func getStatCounter(v *core.Instance, tag string) (stats.Counter, stats.Counter) { func getStatCounter(v *core.Instance, tag string) (stats.Counter, stats.Counter) {
@ -319,16 +319,21 @@ func (h *Handler) Close() error {
return nil return nil
} }
// Return random IPv6 in a CIDR block
func ParseRandomIPv6(address net.Address, prefix string) net.Address { func ParseRandomIPv6(address net.Address, prefix string) net.Address {
addr := address.IP().String() _, network, _ := gonet.ParseCIDR(address.IP().String() + "/" + prefix)
_, network, _ := gonet.ParseCIDR(addr + "/" + prefix)
ipv6 := network.IP.To16() maskSize, totalBits := network.Mask.Size()
prefixLen, _ := network.Mask.Size() subnetSize := big.NewInt(1).Lsh(big.NewInt(1), uint(totalBits-maskSize))
for i := prefixLen / 8; i < 16; i++ {
ipv6[i] = byte(rand.Intn(256))
}
return net.ParseAddress(gonet.IP(ipv6).String()) // random
randomBigInt, _ := rand.Int(rand.Reader, subnetSize)
startIPBigInt := big.NewInt(0).SetBytes(network.IP.To16())
randomIPBigInt := big.NewInt(0).Add(startIPBigInt, randomBigInt)
randomIPBytes := randomIPBigInt.Bytes()
randomIPBytes = append(make([]byte, 16-len(randomIPBytes)), randomIPBytes...)
return net.ParseAddress(gonet.IP(randomIPBytes).String())
} }