Skip to content

Commit

Permalink
gbn+mailbox: fix linter issues
Browse files Browse the repository at this point in the history
  • Loading branch information
ellemouton committed Nov 20, 2023
1 parent ada573d commit 11d9c51
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
24 changes: 17 additions & 7 deletions gbn/gbn_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,17 @@ func NewClientConn(ctx context.Context, n uint8, sendFunc sendBytesFunc,

// clientHandshake initiates the client side GBN handshake.
// The handshake sequence from the client side is as follows:
// 1. The client sends SYN to the server along with the N value that the
// 1. The client sends SYN to the server along with the N value that the
// client wishes to use for the connection.
// 2. The client then waits for the server to respond with SYN.
// 2. The client then waits for the server to respond with SYN.
//
// 3a. If the client receives SYN from the server then the client sends back
// SYNACK.
//
// SYNACK.
//
// 3b. If the client does not receive SYN from the server within a given
// timeout, then the client restarts the handshake from step 1.
//
// timeout, then the client restarts the handshake from step 1.
func (g *GoBackNConn) clientHandshake() error {
// Spin off the recv function in a goroutine so that we can use
// a select to choose to timeout waiting for data from the receive
Expand Down Expand Up @@ -94,7 +98,10 @@ func (g *GoBackNConn) clientHandshake() error {
}
}()

var resp Message
var (
resp Message
respSYN *PacketSYN
)
handshake:
for {
// start Handshake
Expand Down Expand Up @@ -142,8 +149,10 @@ handshake:
}

log.Debugf("Client got %T", resp)
switch resp.(type) {
switch r := resp.(type) {
case *PacketSYN:
respSYN = r

break handshake
default:
}
Expand All @@ -155,7 +164,8 @@ handshake:
}

log.Debugf("Client got SYN")
if resp.(*PacketSYN).N != g.n {

if respSYN.N != g.n {
return io.EOF
}

Expand Down
2 changes: 1 addition & 1 deletion gbn/gbn_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ type GoBackNConn struct {
pongTicker *IntervalAwareForceTicker
pongWait chan struct{}

ctx context.Context
ctx context.Context //nolint:containedctx
cancel func()

// remoteClosed is closed if the remote party initiated the FIN sequence.
Expand Down
2 changes: 1 addition & 1 deletion mailbox/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type Server struct {

sid [64]byte

ctx context.Context
ctx context.Context //nolint:containedctx

quit chan struct{}
cancel func()
Expand Down

0 comments on commit 11d9c51

Please sign in to comment.