Skip to content

Commit

Permalink
ipn/proxies: m new pin error
Browse files Browse the repository at this point in the history
  • Loading branch information
ignoramous committed Nov 22, 2024
1 parent b424996 commit 3316da3
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions intra/ipn/proxies.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ var (
errMissingRev = errors.New("proxy: missing reverse proxy")
errNoAuto464XLAT = errors.New("auto: no 464xlat")
errNotPinned = errors.New("auto: another proxy pinned")
errCannotPin = errors.New("proxy: cannot pin")
errInvalidAddr = errors.New("proxy: invaild ip:port")
errUnreachable = errors.New("proxy: destination unreachable")
errNoRouteToHost = errors.New("proxy: no route to host")
Expand Down Expand Up @@ -407,7 +408,7 @@ func (px *proxifier) ProxyTo(ipp netip.AddrPort, uid string, pids []string) (_ P
func (px *proxifier) pinID(uid string, ipp netip.AddrPort, id string) (Proxy, error) {
p, err := px.ProxyFor(id)
if err != nil {
return nil, err
return nil, core.JoinErr(err, errCannotPin)
}
err = px.pin(uid, ipp, p)
return p, err
Expand All @@ -421,7 +422,7 @@ func (px *proxifier) pin(uid string, ipp netip.AddrPort, p Proxy) error {
}
logev(err)("proxy: pin: ok? %t; %s from %s; err? %v",
err == nil, ipp, p.ID(), err)
return err
return core.JoinErr(err, errCannotPin)
}

func (px *proxifier) delpin(uid string, ipp netip.AddrPort) {
Expand Down Expand Up @@ -481,6 +482,7 @@ func (px *proxifier) ProxyFor(id string) (Proxy, error) {
return nil, errGetProxyTimeout
}
if p == nil || core.IsNil(p) {
log.W("proxy: for: %s; not found", id)
return nil, errProxyNotFound
}
return p, nil
Expand Down

0 comments on commit 3316da3

Please sign in to comment.