Skip to content

Fix data race #26 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
charlysotelo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix data race #26 #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions interfaceListener.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package GoSNMPServer

import "net"
import "github.com/pkg/errors"
import (
"net"
"sync"

"github.com/pkg/errors"
)

type ISnmpServerListener interface {
SetupLogger(ILogger)
Expand All @@ -17,6 +21,7 @@ type IReplyer interface {

type UDPListener struct {
conn *net.UDPConn
mutex sync.RWMutex
logger ILogger
}

Expand All @@ -43,19 +48,26 @@ func (udp *UDPListener) Address() net.Addr {
}

func (udp *UDPListener) NextSnmp() ([]byte, IReplyer, error) {
var msg [4096]byte
if udp.conn == nil {
udp.mutex.RLock()
conn := udp.conn
udp.mutex.RUnlock()

if conn == nil {
return nil, nil, errors.New("Connection Not Listen")
}
counts, udpAddr, err := udp.conn.ReadFromUDP(msg[:])
var msg [4096]byte
counts, udpAddr, err := conn.ReadFromUDP(msg[:])
if err != nil {
return nil, nil, errors.Wrap(err, "UDP Read Error")
}
udp.logger.Infof("udp request from %v. size=%v", udpAddr, counts)
return msg[:counts], &UDPReplyer{udpAddr, udp.conn}, nil
return msg[:counts], &UDPReplyer{udpAddr, conn}, nil
}

func (udp *UDPListener) Shutdown() {
udp.mutex.Lock()
defer udp.mutex.Unlock()

if udp.conn != nil {
udp.conn.Close()
udp.conn = nil
Expand Down