curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-2797: Fix panic in SetConnDigest by making mutexes values.

This commit is contained in:
Adam Chalmers 2020-03-10 01:36:14 -05:00
parent 5bd4028ea7
commit db9b6541d0
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
origin/supervisor.go
View File

@ -59,13 +59,13 @@ type Supervisor struct {
logger *logrus.Entry logger *logrus.Entry
jwtLock *sync.RWMutex jwtLock sync.RWMutex
jwt []byte jwt []byte
eventDigestLock *sync.RWMutex eventDigestLock sync.RWMutex
eventDigest []byte eventDigest []byte
connDigestLock *sync.RWMutex connDigestLock sync.RWMutex
connDigest []byte connDigest []byte
bufferPool *buffer.Pool bufferPool *buffer.Pool
@ -101,8 +101,6 @@ func NewSupervisor(config *TunnelConfig, u uuid.UUID) (*Supervisor, error) {
tunnelErrors: make(chan tunnelError), tunnelErrors: make(chan tunnelError),
tunnelsConnecting: map[int]chan struct{}{}, tunnelsConnecting: map[int]chan struct{}{},
logger: config.Logger.WithField("subsystem", "supervisor"), logger: config.Logger.WithField("subsystem", "supervisor"),
jwtLock: &sync.RWMutex{},
eventDigestLock: &sync.RWMutex{},
bufferPool: buffer.NewPool(512 * 1024), bufferPool: buffer.NewPool(512 * 1024),
}, nil }, nil
} }