Fix how to get src, dst of SR Policy from state report

nttcom · Jun 10, 2024 · d239fce · d239fce
1 parent 26d5e2b
commit d239fce
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/pkg/packet/pcep/object.go b/pkg/packet/pcep/object.go
@@ -1287,6 +1287,15 @@ func (o *AssociationObject) Preference() uint32 {
 	return 0
 }
 
+func (o *AssociationObject) Endpoint() netip.Addr {
+	for _, tlv := range o.TLVs {
+		if t, ok := tlv.(*ExtendedAssociationID); ok {
+			return t.Endpoint
+		}
+	}
+	return netip.Addr{}
+}
+
 // VENDOR-INFORMATION Object (RFC7470 4)
 const (
 	OT_VENDOR_SPECIFIC_CONSTRAINTS uint8 = 1

diff --git a/pkg/server/session.go b/pkg/server/session.go
@@ -377,12 +377,19 @@ func (ss *Session) RegisterSRPolicy(sr pcep.StateReport) {
 		}
 	} else {
 		// create
+		var src, dst netip.Addr
+		if src = sr.LspObject.SrcAddr; !src.IsValid() {
+			src = sr.AssociationObject.AssocSrc
+		}
+		if dst = sr.LspObject.DstAddr; !dst.IsValid() {
+			dst = sr.AssociationObject.Endpoint()
+		}
 		p := table.NewSRPolicy(
 			sr.LspObject.PlspID,
 			sr.LspObject.Name,
 			sr.EroObject.ToSegmentList(),
-			sr.LspObject.SrcAddr,
-			sr.LspObject.DstAddr,
+			src,
+			dst,
 			color,
 			preference,
 			lspID,