mirror/netsampler-goflow2
1
0
Fork 0
mirror of https://github.com/netsampler/goflow2.git synced 2024-05-06 15:54:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52 from vincentbernat/fix/non-terminated-stream

Browse Source 
utils: copy payload before accepting another UDP packet
This commit is contained in:
Louis
2021-11-10 08:10:39 -08:00
committed by GitHub
parent 8fd64006ef 0f5528170d
commit bf66556023
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/utils.go
View File

@ -155,6 +155,7 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
type udpData struct {
size int
pktAddr *net.UDPAddr
payload []byte
}
stopped := atomic.Value{}
@ -165,6 +166,8 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
u := udpData{}
u.size, u.pktAddr, _ = udpconn.ReadFromUDP(payload)
if stopped.Load() == false {
u.payload = make([]byte, u.size)
copy(u.payload, payload[0:u.size])
udpDataCh <- u
} else {
return
@ -174,7 +177,7 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
for {
select {
case u := <-udpDataCh:
process(u.size, payload, u.pktAddr, processor, localIP, addrUDP, name)
process(u.size, u.payload, u.pktAddr, processor, localIP, addrUDP, name)
case <-stopCh:
stopped.Store(true)
udpconn.Close()
@ -185,13 +188,10 @@ func UDPStoppableRoutine(stopCh <-chan struct{}, name string, decodeFunc decoder
}
func process(size int, payload []byte, pktAddr *net.UDPAddr, processor decoder.Processor, localIP string, addrUDP net.UDPAddr, name string) {
payloadCut := make([]byte, size)
copy(payloadCut, payload[0:size])
baseMessage := BaseMessage{
Src: pktAddr.IP,
Port: pktAddr.Port,
Payload: payloadCut,
Payload: payload,
}
processor.ProcessMessage(baseMessage)