Skip to content

Agent Mesh

mobile: make Android DNS cancellation event-driven

Antonio Ojea174a03a11933
diff --git a/mobile/sam-node-ffi/ffi/dns_android.go b/mobile/sam-node-ffi/ffi/dns_android.go
index 1ecdd38f..60672939 100644
--- a/mobile/sam-node-ffi/ffi/dns_android.go
+++ b/mobile/sam-node-ffi/ffi/dns_android.go
@@ -77,12 +77,35 @@ func (resolver androidDNSResolver) LookupTXT(ctx context.Context, name string) (
}
func waitAndroidDNS(ctx context.Context, descriptor int) error {
- descriptors := []unix.PollFd{{Fd: int32(descriptor), Events: unix.POLLIN}}
+ if err := ctx.Err(); err != nil {
+ return err
+ }
+ var cancelPipe [2]int
+ if err := unix.Pipe2(cancelPipe[:], unix.O_CLOEXEC); err != nil {
+ return fmt.Errorf("creating Android DNS cancellation pipe: %w", err)
+ }
+ cancelDone := make(chan struct{})
+ stopCancel := context.AfterFunc(ctx, func() {
+ _ = unix.Close(cancelPipe[1])
+ close(cancelDone)
+ })
+ defer func() {
+ if stopCancel() {
+ _ = unix.Close(cancelPipe[1])
+ } else {
+ <-cancelDone
+ }
+ _ = unix.Close(cancelPipe[0])
+ }()
+ descriptors := []unix.PollFd{
+ {Fd: int32(descriptor), Events: unix.POLLIN},
+ {Fd: int32(cancelPipe[0]), Events: unix.POLLIN},
+ }
for {
if err := ctx.Err(); err != nil {
return err
}
- ready, err := unix.Poll(descriptors, 50)
+ ready, err := unix.Poll(descriptors, -1)
if err == unix.EINTR {
continue
}
diff --git a/mobile/sam-node-ffi/ffi/dns_android_test.go b/mobile/sam-node-ffi/ffi/dns_android_test.go
index 5be0ad19..e76cdd7a 100644
--- a/mobile/sam-node-ffi/ffi/dns_android_test.go
+++ b/mobile/sam-node-ffi/ffi/dns_android_test.go
@@ -6,6 +6,7 @@ import (
"context"
"errors"
"net"
+ "os"
"reflect"
"testing"
"time"
@@ -80,4 +81,56 @@ func TestAndroidDNSWait(t *testing.T) {
if err := waitAndroidDNS(ctx, descriptors[0]); err != nil {
t.Fatalf("ready socket error = %v", err)
}
+ if err := waitAndroidDNS(context.Background(), descriptors[0]); err != nil {
+ t.Fatalf("ready socket without deadline error = %v", err)
+ }
+ cancel()
+ if err := waitAndroidDNS(ctx, descriptors[0]); !errors.Is(err, context.Canceled) {
+ t.Fatalf("canceled context with ready socket error = %v, want context.Canceled", err)
+ }
+}
+
+func TestAndroidDNSWaitCancellationRace(t *testing.T) {
+ descriptors, err := unix.Socketpair(unix.AF_UNIX, unix.SOCK_STREAM|unix.SOCK_CLOEXEC, 0)
+ if err != nil {
+ t.Fatal(err)
+ }
+ t.Cleanup(func() {
+ _ = unix.Close(descriptors[0])
+ _ = unix.Close(descriptors[1])
+ })
+ before, err := os.ReadDir("/proc/self/fd")
+ if err != nil {
+ t.Fatal(err)
+ }
+ for attempt := range 200 {
+ ctx, cancel := context.WithCancel(t.Context())
+ writeDone := make(chan error, 1)
+ go func() {
+ if attempt%2 == 0 {
+ cancel()
+ }
+ _, err := unix.Write(descriptors[1], []byte{1})
+ cancel()
+ writeDone <- err
+ }()
+ waitErr := waitAndroidDNS(ctx, descriptors[0])
+ if err := <-writeDone; err != nil {
+ t.Fatal(err)
+ }
+ if waitErr != nil && !errors.Is(waitErr, context.Canceled) {
+ t.Fatalf("attempt %d: wait error = %v", attempt, waitErr)
+ }
+ var received [1]byte
+ if _, err := unix.Read(descriptors[0], received[:]); err != nil {
+ t.Fatal(err)
+ }
+ }
+ after, err := os.ReadDir("/proc/self/fd")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if len(after) != len(before) {
+ t.Fatalf("file descriptors before = %d, after = %d", len(before), len(after))
+ }
}