Skip to content

Fix nil handlers for client #63

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

Merged
jxx-gg merged 3 commits into from
Aug 19, 2022
Merged

Fix nil handlers for client #63

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c99cdb9
fix nil handlers for client
jxx-gg Aug 19, 2022
a2a24ae
more on the handlers
jxx-gg Aug 19, 2022
e8ed222
fix for Handler and RegisterHandler
jxx-gg Aug 19, 2022
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
19 changes: 16 additions & 3 deletions tunnel/tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ func (s *Server) newClientSession(ctx context.Context, session *tpb.Session, add
case s.sc.RegisterHandler != nil:
err = s.sc.RegisterHandler(ServerSession{addr, t})
default:
err = fmt.Errorf("no target %q of type %q registered", session.Target, session.TargetType)
err = fmt.Errorf("no target %q of type %q registered", session.Target, session.TargetType)
}
if err != nil {
if err := rs.Send(&tpb.RegisterOp{Registration: &tpb.RegisterOp_Session{Session: &tpb.Session{Tag: tag, Error: err.Error()}}}); err != nil {
Expand Down Expand Up @@ -973,7 +973,10 @@ func (c *Client) addPeerTarget(t *tpb.Target) error {

c.peerTypeTargets[t.TargetType][Target{ID: t.Target, Type: t.TargetType}] = struct{}{}

return c.cc.PeerAddHandler(Target{ID: t.Target, Type: t.TargetType})
if c.cc.PeerAddHandler != nil {
return c.cc.PeerAddHandler(Target{ID: t.Target, Type: t.TargetType})
}
return nil
}

// PeerTargets returns all the peer targets matching the given type. If type is an empty string, it will return all targets.
Expand All @@ -999,7 +1002,10 @@ func (c *Client) deletePeerTarget(t *tpb.Target) error {
if _, ok := c.peerTypeTargets[t.TargetType]; !ok {
delete(c.peerTypeTargets[t.TargetType], Target{ID: t.Target, Type: t.TargetType})
}
return c.cc.PeerDelHandler(Target{ID: t.Target, Type: t.TargetType})
if c.cc.PeerDelHandler != nil {
return c.cc.PeerDelHandler(Target{ID: t.Target, Type: t.TargetType})
}
return nil
}

// NewSession requests a new stream identified on the client side by uniqueID.
Expand Down Expand Up @@ -1338,6 +1344,10 @@ func (c *Client) streamHandler(ctx context.Context, tag int32, t Target) (e erro
return nil
}
// Otherwise we attempt to handle the new target ID.
if c.cc.RegisterHandler == nil {
e = fmt.Errorf("no RegisterHandler provided")
return
}
if err = c.cc.RegisterHandler(t); err != nil {
e = fmt.Errorf("returnStream: error from RegisterHandler: %v", err)
return
Expand Down Expand Up @@ -1377,6 +1387,9 @@ func (c *Client) newClientStream(ctx context.Context, tag int32, t Target) error
if err != nil {
return err
}
if c.cc.Handler == nil {
return fmt.Errorf("no Handler provided")
}
return c.cc.Handler(t, stream)
}

Expand Down