extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-06-21 18:22:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set to blocking the message queue

Browse Source
This commit is contained in:
Zoltán Papp 2024-05-21 16:21:29 +02:00
parent 13eb457132
commit e82c0a55a3
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
relay/client/client.go
View File

@ -146,6 +146,11 @@ func (c *Client) readLoop() {
log := log.WithField("client_id", c.peerID) log := log.WithField("client_id", c.peerID)
var errExit error var errExit error
var n int var n int
err := c.relayConn.SetReadDeadline(time.Time{})
if err != nil {
log.Errorf("failed to set read deadline: %s", err)
return
}
for { for {
buf := make([]byte, bufferSize) // todo optimise buffer size, use pool buf := make([]byte, bufferSize) // todo optimise buffer size, use pool
n, errExit = c.relayConn.Read(buf) n, errExit = c.relayConn.Read(buf)
@ -175,7 +180,13 @@ func (c *Client) readLoop() {
log.Errorf("failed to parse transport message: %v", err) log.Errorf("failed to parse transport message: %v", err)
continue continue
} }
go c.handleTransport(channelId, buf[:n]) container, ok := c.channels[channelId]
if !ok {
log.Errorf("unexpected transport message for channel: %d", channelId)
return
}
container.messages <- buf[:n]
} }
} }
@ -194,7 +205,7 @@ func (c *Client) handleBindResponse(channelId uint16, peerId string) {
} }
delete(c.channelsPending, peerId) delete(c.channelsPending, peerId)
messageBuffer := make(chan []byte, 10) messageBuffer := make(chan []byte, 2)
conn := NewConn(c, channelId, c.generateConnReaderFN(messageBuffer)) conn := NewConn(c, channelId, c.generateConnReaderFN(messageBuffer))
c.channels[channelId] = &connContainer{ c.channels[channelId] = &connContainer{
@ -206,20 +217,6 @@ func (c *Client) handleBindResponse(channelId uint16, peerId string) {
bindSuccessChan <- conn bindSuccessChan <- conn
} }
func (c *Client) handleTransport(channelId uint16, msg []byte) {
container, ok := c.channels[channelId]
if !ok {
log.Errorf("unexpected transport message for channel: %d", channelId)
return
}
select {
case container.messages <- msg:
default:
log.Errorf("dropping message for channel: %d", channelId)
}
}
func (c *Client) writeTo(channelID uint16, payload []byte) (int, error) { func (c *Client) writeTo(channelID uint16, payload []byte) (int, error) {
msg := messages.MarshalTransportMsg(channelID, payload) msg := messages.MarshalTransportMsg(channelID, payload)
n, err := c.relayConn.Write(msg) n, err := c.relayConn.Write(msg)