mirror/osrg-gobgp
1
0
Fork 0
mirror of https://github.com/osrg/gobgp.git synced 2024-05-11 05:55:10 +00:00
Code Issues Releases Activity

pkg/packet/mrt: restore compatibility

Browse Source 
restore the API breakage due to c801e18495.

However, this is a hack. Should be removed with the major version updated.

Signed-off-by: FUJITA Tomonori <[email protected]>
This commit is contained in:
FUJITA Tomonori
2023-07-01 13:35:40 +09:00
parent c801e18495
commit d4d97da220
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/packet/mrt/mrt.go
+23 -4
View File
@@ -365,7 +365,7 @@ type RibEntry struct {
var errNotAllRibEntryBytesAvailable = errors.New("not all RibEntry bytes are available")
func (e *RibEntry) DecodeFromBytes(data []byte, prefix bgp.AddrPrefixInterface) ([]byte, error) {
func (e *RibEntry) DecodeFromBytes(data []byte, prefix ...bgp.AddrPrefixInterface) ([]byte, error) {
if len(data) < 8 {
return nil, errNotAllRibEntryBytesAvailable
}
@@ -384,7 +384,16 @@ func (e *RibEntry) DecodeFromBytes(data []byte, prefix bgp.AddrPrefixInterface)
if err != nil {
return nil, err
}
err = p.DecodeFromBytes(data, &bgp.MarshallingOption{ImplicitPrefix: prefix})
// HACK: keeps compatibility
switch len(prefix) {
case 0:
err = p.DecodeFromBytes(data)
case 1:
err = p.DecodeFromBytes(data, &bgp.MarshallingOption{ImplicitPrefix: prefix[0]})
default:
return nil, fmt.Errorf("only one prefix should be used")
}
if err != nil {
return nil, err
}
@@ -398,11 +407,21 @@ func (e *RibEntry) DecodeFromBytes(data []byte, prefix bgp.AddrPrefixInterface)
return data, nil
}
func (e *RibEntry) Serialize(prefix bgp.AddrPrefixInterface) ([]byte, error) {
func (e *RibEntry) Serialize(prefix ...bgp.AddrPrefixInterface) ([]byte, error) {
pbuf := make([]byte, 0)
totalLen := 0
for _, pattr := range e.PathAttributes {
pb, err := pattr.Serialize(&bgp.MarshallingOption{ImplicitPrefix: prefix})
var pb []byte
var err error
// HACK: keeps compatibility
switch len(prefix) {
case 0:
pb, err = pattr.Serialize()
case 1:
pb, err = pattr.Serialize(&bgp.MarshallingOption{ImplicitPrefix: prefix[0]})
default:
return nil, fmt.Errorf("only one prefix should be used")
}
if err != nil {
return nil, err
}
pkg/packet/mrt/mrt_test.go
+4 -4
View File
@@ -116,13 +116,13 @@ func TestMrtRibEntry(t *testing.T) {
}
e1 := NewRibEntry(1, uint32(time.Now().Unix()), 0, p, false)
b1, err := e1.Serialize(nil)
b1, err := e1.Serialize()
if err != nil {
t.Fatal(err)
}
e2 := &RibEntry{}
rest, err := e2.DecodeFromBytes(b1, nil)
rest, err := e2.DecodeFromBytes(b1)
if err != nil {
t.Fatal(err)
}
@@ -145,13 +145,13 @@ func TestMrtRibEntryWithAddPath(t *testing.T) {
bgp.NewPathAttributeLocalPref(1 << 22),
}
e1 := NewRibEntry(1, uint32(time.Now().Unix()), 200, p, true)
b1, err := e1.Serialize(nil)
b1, err := e1.Serialize()
if err != nil {
t.Fatal(err)
}
e2 := &RibEntry{isAddPath: true}
rest, err := e2.DecodeFromBytes(b1, nil)
rest, err := e2.DecodeFromBytes(b1)
if err != nil {
t.Fatal(err)
}