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

Bugfix: issues when reading a partial chunk of protobuf from stdin

Browse Source
This commit is contained in:
lspgn
2022-01-08 00:22:22 +01:00
parent 20e8e56709
commit 7acb84835b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/enricher/main.go
View File

@ -147,26 +147,28 @@ func main() {
rdr := bufio.NewReader(os.Stdin)
msg := &flowmessage.FlowMessageExt{}
msgLen := make([]byte, binary.MaxVarintLen64)
lenBufSize := len(msgLen)
lenBufSize := binary.MaxVarintLen64
for {
n, err := rdr.Read(msgLen)
msgLen, err := rdr.Peek(lenBufSize)
if err != nil && err != io.EOF {
log.Error(err)
continue
}
len, vn := proto.DecodeVarint(msgLen[0:n])
if len == 0 {
l, vn := proto.DecodeVarint(msgLen)
if l == 0 {
continue
}
line := make([]byte, len)
if vn < lenBufSize {
copy(line[0:lenBufSize-vn], msgLen[vn:lenBufSize])
_, err = rdr.Discard(vn)
if err != nil {
log.Error(err)
continue
}
n, err = io.ReadFull(rdr, line[lenBufSize-vn:])
line := make([]byte, l)
_, err = io.ReadFull(rdr, line)
if err != nil && err != io.EOF {
log.Error(err)
continue