correctly set CBS parameters on talker, not listener port

PADL · Dec 19, 2024 · cbc81a3 · cbc81a3
1 parent ad9fa0e
commit cbc81a3
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/Sources/MRP/Applications/MSRP/MSRPApplication.swift b/Sources/MRP/Applications/MSRP/MSRPApplication.swift
@@ -946,7 +946,7 @@ extension MSRPApplication {
   }
 
   private func _updateDynamicReservationEntries(
-    participant: Participant<MSRPApplication>,
+    port: P,
     portState: MSRPPortState<P>,
     streamID: MSRPStreamID,
     declarationType: MSRPDeclarationType?,
@@ -962,20 +962,20 @@ extension MSRPApplication {
       try await bridge.register(
         macAddress: talkerRegistration.dataFrameParameters.destinationAddress,
         vlan: talkerRegistration.dataFrameParameters.vlanIdentifier,
-        on: [participant.port]
+        on: [port]
       )
     } else {
       _logger.debug("MSRP: deregistering FDB entries for \(talkerRegistration.dataFrameParameters)")
       try? await bridge.deregister(
         macAddress: talkerRegistration.dataFrameParameters.destinationAddress,
         vlan: talkerRegistration.dataFrameParameters.vlanIdentifier,
-        from: [participant.port]
+        from: [port]
       )
     }
   }
 
   private func _updateOperIdleSlope(
-    participant: Participant<MSRPApplication>,
+    port: P,
     portState: MSRPPortState<P>,
     streamID: MSRPStreamID,
     talkerRegistration: any MSRPTalkerValue
@@ -984,6 +984,11 @@ extension MSRPApplication {
       return
     }
 
+    guard let participant = try? findParticipant(port: port) else {
+      _logger.info("MSRP: failed to find participant for port \(port)")
+      return
+    }
+
     let talkers = await participant.findAttributes(
       attributeType: MSRPAttributeType.talkerAdvertise.rawValue,
       matching: .matchAny
@@ -1002,11 +1007,11 @@ extension MSRPApplication {
       }
     }
 
-    _logger.debug("MSRP: adjusting idle slope, port \(participant.port), streams \(streams)")
+    _logger.debug("MSRP: adjusting idle slope, port \(port), streams \(streams)")
 
     try await bridge.adjustCreditBasedShaper(
       application: self,
-      port: participant.port,
+      port: port,
       portState: portState,
       streams: streams
     )
@@ -1038,22 +1043,22 @@ extension MSRPApplication {
       if mergedDeclarationType == .listenerReady || mergedDeclarationType == .listenerReadyFailed {
         // increase (if necessary) bandwidth first before updating dynamic reservation entries
         try await _updateOperIdleSlope(
-          participant: talkerRegistration.0,
+          port: port,
           portState: portState,
           streamID: streamID,
           talkerRegistration: talkerRegistration.1
         )
       }
       try await _updateDynamicReservationEntries(
-        participant: talkerRegistration.0,
+        port: port,
         portState: portState,
         streamID: streamID,
         declarationType: mergedDeclarationType,
         talkerRegistration: talkerRegistration.1
       )
       if mergedDeclarationType == nil || mergedDeclarationType == .listenerAskingFailed {
         try await _updateOperIdleSlope(
-          participant: talkerRegistration.0,
+          port: port,
           portState: portState,
           streamID: streamID,
           talkerRegistration: talkerRegistration.1