Skip to content

Avoid concurrent requests for getting RSD service for a device #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid concurrent requests for getting RSD service for a device #462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ios/rsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ import (
"io"
"net"
"strconv"
"sync"

"github.com/danielpaulus/go-ios/ios/http"
"github.com/danielpaulus/go-ios/ios/xpc"
log "github.com/sirupsen/logrus"
)

// _requestsMap stores a mutex for every request attempt to the trio formed by address, port, and TUN port. This allows to make sure that no more than one request is made at a time to a given trio, since doing so can lead to stuck requests and, therefore, stuck programs and/or goroutine leaks.
var _requestsMap = sync.Map{}

// RsdPortProvider is an interface to get a port for a service, or a service for a port from the Remote Service Discovery on the device.
// Used in iOS17+
type RsdPortProvider interface {
Expand Down Expand Up @@ -163,6 +167,12 @@ func (r RsdHandshakeResponse) GetServices() map[string]RsdServiceEntry {
// NewWithAddrPort creates a new RsdService with the given address and port 58783 using a HTTP2 based XPC connection,
// connecting to an operating system level TUN device.
func NewWithAddrPort(addr string, port int) (RsdService, error) {
key := fmt.Sprintf("%s-%d", addr, port)

mutex, _ := _requestsMap.LoadOrStore(key, &sync.Mutex{})

mutex.(*sync.Mutex).Lock()
defer mutex.(*sync.Mutex).Unlock()
conn, err := connectTUN(addr, port)
if err != nil {
return RsdService{}, fmt.Errorf("NewWithAddrPort: failed to connect to device: %w", err)
Expand All @@ -177,6 +187,12 @@ func NewWithAddrDevice(addr string, d DeviceEntry) (RsdService, error) {

// NewWithAddrPortDevice creates a new RsdService with the given address and port using a HTTP2 based XPC connection.
func NewWithAddrPortDevice(addr string, port int, d DeviceEntry) (RsdService, error) {
key := fmt.Sprintf("%s-%d-%d", addr, port, d.UserspaceTUNPort)

mutex, _ := _requestsMap.LoadOrStore(key, &sync.Mutex{})

mutex.(*sync.Mutex).Lock()
defer mutex.(*sync.Mutex).Unlock()
conn, err := ConnectTUNDevice(addr, port, d)
if err != nil {
return RsdService{}, fmt.Errorf("NewWithAddrPortTUNDevice: failed to connect to device: %w", err)
Expand Down
Loading