neale
/
netshovel
mirror of https://github.com/dirtbags/netshovel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug with Stream.Read(0)

This commit is contained in:
Neale Pickett 2018-07-24 20:11:50 +00:00
parent 6c33780900
commit 994d434f52
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
stream.go
View File

@ -37,7 +37,6 @@ func NewStream(net, transport gopacket.Flow) Stream {
} }
func (stream *Stream) Reassembled(rs []tcpassembly.Reassembly) { func (stream *Stream) Reassembled(rs []tcpassembly.Reassembly) {
// XXX: How do we send timestamps?
ret := Utterance{ ret := Utterance{
When: rs[0].Seen, When: rs[0].Seen,
} }
@ -59,19 +58,26 @@ func (stream *Stream) ReassemblyComplete() {
} }
func (stream *Stream) Read(length int) (Utterance, error) { func (stream *Stream) Read(length int) (Utterance, error) {
// This probably indicates a problem, but we assume you know what you're doing
if length == 0 {
return Utterance{}, nil
}
// Special case: length=-1 means "give me the next utterance" // Special case: length=-1 means "give me the next utterance"
if length == -1 { if length == -1 {
var ret Utterance
var err error = nil
if stream.pending.Data.Length() > 0 { if stream.pending.Data.Length() > 0 {
ret := stream.pending ret = stream.pending
stream.pending.Data = gapstring.GapString{} stream.pending.Data = gapstring.GapString{}
return ret, nil
} else { } else {
ret, more := <- stream.conversation r, more := <- stream.conversation
if ! more { if ! more {
return ret, io.EOF err = io.EOF
} }
return ret, nil ret = r
} }
return ret, err
} }
// Pull in utterances until we have enough data. // Pull in utterances until we have enough data.