sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-05-01 14:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

use single latest message buf

Browse Source
This commit is contained in:
Pascal Fischer
2025-10-08 17:40:51 +02:00
parent 7f4f6e0553
commit c813b6ef50
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
signal/server/signal.go
View File

@@ -68,7 +68,8 @@ type Server struct {
successHeader metadata.MD successHeader metadata.MD
sendTimeout time.Duration sendTimeout time.Duration
directSendDisabled bool
} }
// NewServer creates a new Signal server // NewServer creates a new Signal server
@@ -103,6 +104,11 @@ func NewServer(ctx context.Context, meter metric.Meter, opts *Options) (*Server,
disableSendWithDeliveryCheck: opts.DisableSendWithDeliveryCheck, disableSendWithDeliveryCheck: opts.DisableSendWithDeliveryCheck,
} }
if directSendDisabled := os.Getenv("NB_SIGNAL_DIRECT_SEND_DISABLED"); directSendDisabled == "true" {
s.directSendDisabled = true
log.Warn("direct send to connected peers is disabled")
}
if opts.DisableSendWithDeliveryCheck { if opts.DisableSendWithDeliveryCheck {
log.Warn("SendWithDeliveryCheck method is disabled") log.Warn("SendWithDeliveryCheck method is disabled")
} }
@@ -114,7 +120,7 @@ func NewServer(ctx context.Context, meter metric.Meter, opts *Options) (*Server,
func (s *Server) Send(ctx context.Context, msg *proto.EncryptedMessage) (*proto.EncryptedMessage, error) { func (s *Server) Send(ctx context.Context, msg *proto.EncryptedMessage) (*proto.EncryptedMessage, error) {
log.Tracef("received a new message to send from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey) log.Tracef("received a new message to send from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey)
if _, found := s.registry.Get(msg.RemoteKey); found { if _, found := s.registry.Get(msg.RemoteKey); found && !s.directSendDisabled {
_ = s.forwardMessageToPeer(ctx, msg) _ = s.forwardMessageToPeer(ctx, msg)
return &proto.EncryptedMessage{}, nil return &proto.EncryptedMessage{}, nil
} }
@@ -138,7 +144,7 @@ func (s *Server) SendWithDeliveryCheck(ctx context.Context, msg *proto.Encrypted
} }
log.Tracef("received a new message to send from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey) log.Tracef("received a new message to send from peer [%s] to peer [%s]", msg.Key, msg.RemoteKey)
if _, found := s.registry.Get(msg.RemoteKey); found { if _, found := s.registry.Get(msg.RemoteKey); found && !s.directSendDisabled {
if err := s.forwardMessageToPeer(ctx, msg); err != nil { if err := s.forwardMessageToPeer(ctx, msg); err != nil {
if errors.Is(err, ErrPeerNotConnected) { if errors.Is(err, ErrPeerNotConnected) {
return nil, status.Errorf(codes.NotFound, "remote peer not connected") return nil, status.Errorf(codes.NotFound, "remote peer not connected")