apps/peerguard
1
0
Fork 0
mirror of https://github.com/rkonfj/peerguard.git synced 2024-08-11 11:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

peermap: remove func peer.close

Browse Source
This commit is contained in:
rkonfj 2024-07-25 20:31:24 +08:00
parent 00a064b5d9
commit 6434208cc5
No known key found for this signature in database
GPG Key ID: 9595E3A991503741
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
peermap/peermap.go
View File

@ -77,13 +77,6 @@ func (p *Peer) writeWS(messageType int, b []byte) error {
return p.conn.WriteMessage(messageType, b) return p.conn.WriteMessage(messageType, b)
} }
func (p *Peer) close() error {
p.peerMap.removePeer(p.networkSecret.Network, p.id)
_ = p.conn.WriteControl(websocket.CloseMessage,
websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""), time.Now().Add(2*time.Second))
return p.conn.Close()
}
func (p *Peer) Read(b []byte) (n int, err error) { func (p *Peer) Read(b []byte) (n int, err error) {
defer func() { defer func() {
if p.connRRL != nil && n > 0 { if p.connRRL != nil && n > 0 {
@ -126,10 +119,14 @@ func (p *Peer) Write(b []byte) (n int, err error) {
func (p *Peer) Close() error { func (p *Peer) Close() error {
p.closeOnce.Do(func() { p.closeOnce.Do(func() {
p.peerMap.removePeer(p.networkSecret.Network, p.id)
_ = p.conn.WriteControl(websocket.CloseMessage,
websocket.FormatCloseMessage(websocket.CloseNormalClosure, ""), time.Now().Add(2*time.Second))
p.conn.Close()
close(p.exitSig) close(p.exitSig)
close(p.connData) close(p.connData)
}) })
return p.close() return nil
} }
func (p *Peer) String() string { func (p *Peer) String() string {
@ -270,7 +267,7 @@ func (p *Peer) keepalive() {
p.updateSecret() p.updateSecret()
} }
} }
p.close() p.Close()
} }
func (p *Peer) updateSecret() error { func (p *Peer) updateSecret() error {
@ -309,7 +306,7 @@ func (p *Peer) checkAlive() bool {
p.conn.WriteControl(websocket.PingMessage, nil, time.Now().Add(time.Second)) p.conn.WriteControl(websocket.PingMessage, nil, time.Now().Add(time.Second))
time.Sleep(200 * time.Millisecond) time.Sleep(200 * time.Millisecond)
} }
p.close() p.Close()
return false return false
} }