Fix UpdatePathAggregator4ByteAs() ignores 32bit value

Signed-off-by: Jeremiah Millay <jmillay@fastly.com>
osrg · Jun 12, 2023 · 79d301f · 79d301f
1 parent 0cc8a98
commit 79d301f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/internal/pkg/table/message.go b/internal/pkg/table/message.go
@@ -240,6 +240,8 @@ func UpdatePathAggregator4ByteAs(msg *bgp.BGPUpdate) error {
 			if attr.Value.Askind == reflect.Uint16 {
 				aggAttr = attr
 				aggAttr.Value.Askind = reflect.Uint32
+			} else if attr.Value.Askind == reflect.Uint32 {
+				aggAttr = attr
 			}
 		case *bgp.PathAttributeAs4Aggregator:
 			agg4Attr = agg

diff --git a/pkg/server/fsm.go b/pkg/server/fsm.go
@@ -1083,7 +1083,11 @@ func (h *fsmHandler) recvMessageWithError() (*fsmMsg, error) {
 					}
 				}
 
-				table.UpdatePathAttrs4ByteAs(h.fsm.logger, body)
+				if err = table.UpdatePathAttrs4ByteAs(h.fsm.logger, body); err != nil {
+					fmsg.MsgData = err
+					return fmsg, err
+				}
+
 				if err = table.UpdatePathAggregator4ByteAs(body); err != nil {
 					fmsg.MsgData = err
 					return fmsg, err