Fix NetFlow mutex issue

lspgn · lspgn · commit 877bf88f6985 · 2020-03-29T15:40:48.000-07:00
diff --git a/utils/netflow.go b/utils/netflow.go
@@ -68,7 +68,7 @@ func (s *StateNetFlow) DecodeFlow(msg interface{}) error {
 		samplerAddress = samplerAddress.To4()
 	}
 
-	s.templateslock.RLock()
+	s.templateslock.Lock()
 	templates, ok := s.templates[key]
 	if !ok {
 		templates = &TemplateSystem{
@@ -77,14 +77,14 @@ func (s *StateNetFlow) DecodeFlow(msg interface{}) error {
 		}
 		s.templates[key] = templates
 	}
-	s.templateslock.RUnlock()
-	s.samplinglock.RLock()
+	s.templateslock.Unlock()
+	s.samplinglock.Lock()
 	sampling, ok := s.sampling[key]
 	if !ok {
 		sampling = producer.CreateSamplingSystem()
 		s.sampling[key] = sampling
 	}
-	s.samplinglock.RUnlock()
+	s.samplinglock.Unlock()
 
 	ts := uint64(time.Now().UTC().Unix())
 	if pkt.SetTime {

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func (s *StateNetFlow) DecodeFlow(msg interface{}) error {`
`68`	`68`	`samplerAddress = samplerAddress.To4()`
`69`	`69`	`}`
`70`	`70`
`71`		`- s.templateslock.RLock()`
	`71`	`+ s.templateslock.Lock()`
`72`	`72`	`templates, ok := s.templates[key]`
`73`	`73`	`if !ok {`
`74`	`74`	`templates = &TemplateSystem{`
`@@ -77,14 +77,14 @@ func (s *StateNetFlow) DecodeFlow(msg interface{}) error {`
`77`	`77`	`}`
`78`	`78`	`s.templates[key] = templates`
`79`	`79`	`}`
`80`		`- s.templateslock.RUnlock()`
`81`		`- s.samplinglock.RLock()`
	`80`	`+ s.templateslock.Unlock()`
	`81`	`+ s.samplinglock.Lock()`
`82`	`82`	`sampling, ok := s.sampling[key]`
`83`	`83`	`if !ok {`
`84`	`84`	`sampling = producer.CreateSamplingSystem()`
`85`	`85`	`s.sampling[key] = sampling`
`86`	`86`	`}`
`87`		`- s.samplinglock.RUnlock()`
	`87`	`+ s.samplinglock.Unlock()`
`88`	`88`
`89`	`89`	`ts := uint64(time.Now().UTC().Unix())`
`90`	`90`	`if pkt.SetTime {`