Skip to content

Suppress superflous errors generated closing a forwarding connection #639

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
briankrznarich wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Suppress superflous errors generated closing a forwarding connection #639

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
22 changes: 15 additions & 7 deletions ios/forward/forward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ type iosproxy struct {
}

type ConnListener struct {
listener net.Listener
quit chan interface{}
listener net.Listener
quit chan interface{}
closedCleanly bool
}

// Forward forwards every connection made to the hostPort to whatever service runs inside an app on the device on phonePort.
Expand All @@ -40,6 +41,7 @@ func Forward(device ios.DeviceEntry, hostPort uint16, phonePort uint16) (*ConnLi

// Close stops listening on the host port for the forwarded connection
func (cl *ConnListener) Close() error {
cl.closedCleanly = true
close(cl.quit)

err := cl.listener.Close()
Expand All @@ -59,16 +61,19 @@ func connectionAccept(cl *ConnListener, deviceID int, phonePort uint16) {
default:
clientConn, err := cl.listener.Accept()
if err != nil {
if cl.closedCleanly {
return
}
log.Errorf("Error accepting new connection %v", err)
continue
}
log.WithFields(log.Fields{"conn": fmt.Sprintf("%#v", cl)}).Info("new client connected")
go StartNewProxyConnection(context.TODO(), clientConn, deviceID, phonePort)
go StartNewProxyConnection(context.TODO(), clientConn, deviceID, phonePort, cl)
}
}
}

func StartNewProxyConnection(ctx context.Context, clientConn io.ReadWriteCloser, deviceID int, phonePort uint16) error {
func StartNewProxyConnection(ctx context.Context, clientConn io.ReadWriteCloser, deviceID int, phonePort uint16, cl *ConnListener) error {
usbmuxConn, err := ios.NewUsbMuxConnectionSimple()
if err != nil {
log.Errorf("could not connect to usbmuxd: %+v", err)
Expand Down Expand Up @@ -98,8 +103,9 @@ func StartNewProxyConnection(ctx context.Context, clientConn io.ReadWriteCloser,
deviceConn.Close()
closed = true
}

log.Errorf("forward: close clientConn <-- deviceConn")
if !cl.closedCleanly {
log.Errorf("forward: close clientConn <-- deviceConn")
}
wg.Done()
}()

Expand All @@ -113,7 +119,9 @@ func StartNewProxyConnection(ctx context.Context, clientConn io.ReadWriteCloser,
closed = true
}

log.Errorf("forward: close clientConn --> deviceConn")
if !cl.closedCleanly {
log.Errorf("forward: close clientConn --> deviceConn")
}
wg.Done()
}()

Expand Down