resident: fix

Author: xcolwell

connect/resident.go

@@ -108,6 +108,7 @@ type ExchangeSettings struct {
 
 	IngressSecurityPolicyGenerator func(*connect.SecurityPolicyStatsCollector) connect.SecurityPolicy
 	EgressSecurityPolicyGenerator  func(*connect.SecurityPolicyStatsCollector) connect.SecurityPolicy
+	ClientSettingsGenerator        func() *connect.ClientSettings
 
 	ExchangeChaosSettings
 }
@@ -1595,6 +1596,7 @@ func (self *Resident) ResidentProxyDevice() *ResidentProxyDevice {
 		settings := DefaultResidentProxyDeviceSettings()
 		settings.IngressSecurityPolicyGenerator = self.exchange.settings.IngressSecurityPolicyGenerator
 		settings.EgressSecurityPolicyGenerator = self.exchange.settings.EgressSecurityPolicyGenerator
+		settings.ClientSettingsGenerator = self.exchange.settings.ClientSettingsGenerator
 		residentProxyDevice, err := NewResidentProxyDevice(
 			self.ctx,
 			self.exchange,
@@ -1756,7 +1758,9 @@ func (self *Resident) handleClientForward(path connect.TransferPath, transferFra
 
 		if forward == nil || !forward.UpdateActivity() {
 			forward = nextForward()
+		}
 
+		if forward != nil {
 			var replacedForward *ResidentForward
 			// func() {
 			// 	self.stateLock.Lock()
@@ -1768,7 +1772,6 @@ func (self *Resident) handleClientForward(path connect.TransferPath, transferFra
 				replacedForward.Cancel()
 			}
 			glog.V(1).Infof("[rf]open %s->%s\n", sourceId, destinationId)
-
 		}
 
 		return forward