eburet-oss/sing-tun-lx
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ping: Fix on android

Browse source
This commit is contained in:
世界 2025-08-24 10:47:15 +08:00
parent 86d96064d5
commit dd18aa2b86
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ping/ping.go
View file

@ -40,7 +40,7 @@ func Connect(privileged bool, controlFunc control.Func, destination netip.Addr)
} }
func (c *Conn) ReadIP(buffer *buf.Buffer) error { func (c *Conn) ReadIP(buffer *buf.Buffer) error {
if c.destination.Is6() || runtime.GOOS == "linux" && !c.privileged { if c.destination.Is6() || (runtime.GOOS == "linux" || runtime.GOOS == "android") && !c.privileged {
var readMsg func(b, oob []byte) (n, oobn int, addr netip.Addr, err error) var readMsg func(b, oob []byte) (n, oobn int, addr netip.Addr, err error)
switch conn := c.conn.(type) { switch conn := c.conn.(type) {
case *net.IPConn: case *net.IPConn:
@ -163,7 +163,7 @@ func (c *Conn) ReadICMP(buffer *buf.Buffer) error {
if err != nil { if err != nil {
return err return err
} }
if c.destination.Is6() || runtime.GOOS == "linux" && !c.privileged { if c.destination.Is6() || (runtime.GOOS == "linux" || runtime.GOOS == "android") && !c.privileged {
return nil return nil
} }
if !c.destination.Is6() { if !c.destination.Is6() {

2
ping/socket_unix.go
View file

@ -47,7 +47,7 @@ func connect(privileged bool, controlFunc control.Func, destination netip.Addr)
return nil, E.Cause(err, "connect()") return nil, E.Cause(err, "connect()")
} }
if destination.Is4() && runtime.GOOS == "linux" { if destination.Is4() && (runtime.GOOS == "linux" || runtime.GOOS == "android") {
//err = unix.SetsockoptInt(fd, unix.IPPROTO_IP, unix.IP_RECVTOS, 1) //err = unix.SetsockoptInt(fd, unix.IPPROTO_IP, unix.IP_RECVTOS, 1)
//if err != nil { //if err != nil {
// return nil, err // return nil, err