Skip to content
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

[client] Add NB_SKIP_SOCKET_MARK & fix crash instead of returing an error #2899

Merged
merged 2 commits into from
Nov 19, 2024
Merged

[client] Add NB_SKIP_SOCKET_MARK & fix crash instead of returing an error #2899

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a700fc1
dialer: fix crash instead of returning error
nazarewk Nov 19, 2024
4ed0d72
add NB_SKIP_SOCKET_MARK
nazarewk Nov 19, 2024
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
Next Next commit
dialer: fix crash instead of returning error 
found during investigation of #2530
  • Loading branch information
@nazarewk
nazarewk committed Nov 19, 2024
commit a700fc19bb6ad3df233fefec831836c7e04b71ee
9 changes: 7 additions & 2 deletions util/grpc/dialer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ package grpc
import (
"context"
"crypto/tls"
"fmt"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"net"
"os/user"
"runtime"
Expand All @@ -23,20 +26,22 @@ func WithCustomDialer() grpc.DialOption {
if runtime.GOOS == "linux" {
currentUser, err := user.Current()
if err != nil {
log.Fatalf("failed to get current user: %v", err)
return nil, status.Errorf(codes.FailedPrecondition, "failed to get current user: %v", err)
}

// the custom dialer requires root permissions which are not required for use cases run as non-root
if currentUser.Uid != "0" {
log.Debug("Not running as root, using standard dialer")
dialer := &net.Dialer{}
return dialer.DialContext(ctx, "tcp", addr)
}
}

log.Debug("Using nbnet.NewDialer()")
conn, err := nbnet.NewDialer().DialContext(ctx, "tcp", addr)
if err != nil {
log.Errorf("Failed to dial: %s", err)
return nil, err
return nil, fmt.Errorf("nbnet.NewDialer().DialContext: %w", err)
}
return conn, nil
})
Expand Down