daxi20/fgbgp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add EOF handling for MRT

Browse Source 
* Fixes #1
This commit is contained in:
Louis Poinsignon
2018-08-09 09:40:05 -07:00
parent a57fe8cf1e
commit 1599ecf0fb
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mrt/mrt.go
View File

@@ -780,32 +780,35 @@ func DecodeBGP4TD2(buf io.Reader, timestamp time.Time, subtype uint16, length ui
return nil, nil return nil, nil
} }
type mrtBinaryHeader struct {
Timestamp uint32
Mrttype uint16
Mrtsubtype uint16
Mrtlength uint32
}
func DecodeSingle(buf io.Reader) (Mrt, error) { func DecodeSingle(buf io.Reader) (Mrt, error) {
var timestamp uint32 hdr := mrtBinaryHeader{}
var mrttype uint16
var mrtsubtype uint16
var mrtlength uint32
binary.Read(buf, binary.BigEndian, &timestamp) e := binary.Read(buf, binary.BigEndian, &hdr)
binary.Read(buf, binary.BigEndian, &mrttype) if e != nil { return nil, e }
binary.Read(buf, binary.BigEndian, &mrtsubtype)
binary.Read(buf, binary.BigEndian, &mrtlength)
timestampP := time.Unix(int64(timestamp), 0) timestampP := time.Unix(int64(hdr.Timestamp), 0)
content := make([]byte, mrtlength) content := make([]byte, hdr.Mrtlength)
binary.Read(buf, binary.BigEndian, &content) e = binary.Read(buf, binary.BigEndian, &content)
if e != nil { return nil, e }
tmpbuf := bytes.NewBuffer(content) tmpbuf := bytes.NewBuffer(content)
var mrt Mrt var mrt Mrt
var err error var err error
switch mrttype { switch hdr.Mrttype {
case TYPE_BGP4MP: case TYPE_BGP4MP:
mrt, err = DecodeBGP4MP(tmpbuf, timestampP, mrtsubtype, mrtlength) mrt, err = DecodeBGP4MP(tmpbuf, timestampP, hdr.Mrtsubtype, hdr.Mrtlength)
case TYPE_TABLE_DUMPV2: case TYPE_TABLE_DUMPV2:
mrt, err = DecodeBGP4TD2(tmpbuf, timestampP, mrtsubtype, mrtlength) mrt, err = DecodeBGP4TD2(tmpbuf, timestampP, hdr.Mrtsubtype, hdr.Mrtlength)
default: default:
err = errors.New(fmt.Sprintf("Decoding of type %v not implemented", mrttype)) err = errors.New(fmt.Sprintf("Decoding of type %v not implemented", hdr.Mrttype))
} }
return mrt, err return mrt, err