@@ -450,7 +450,10 @@ private struct PacketLossCache
450450
451451 private RelayServerData m_RelayServerData ;
452452
453- internal NetworkManager NetworkManager ;
453+ /// <summary>
454+ /// NetworkManager associated to this transport instance
455+ /// </summary>
456+ protected NetworkManager m_NetworkManager ;
454457
455458 private IRealTimeProvider m_RealTimeProvider ;
456459
@@ -795,10 +798,10 @@ private void SendBatchedMessages(SendTarget sendTarget, BatchedSendQueue queue)
795798 }
796799
797800 var mtu = 0 ;
798- if ( NetworkManager )
801+ if ( m_NetworkManager )
799802 {
800- var ngoClientId = NetworkManager . ConnectionManager . TransportIdToClientId ( sendTarget . ClientId ) ;
801- mtu = NetworkManager . GetPeerMTU ( ngoClientId ) ;
803+ var ngoClientId = m_NetworkManager . ConnectionManager . TransportIdToClientId ( sendTarget . ClientId ) ;
804+ mtu = m_NetworkManager . GetPeerMTU ( ngoClientId ) ;
802805 }
803806
804807 new SendBatchedMessagesJob
@@ -947,7 +950,7 @@ private void Update()
947950 }
948951
949952#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
950- if ( NetworkManager )
953+ if ( m_NetworkManager )
951954 {
952955 ExtractNetworkMetrics ( ) ;
953956 }
@@ -963,16 +966,16 @@ private void OnDestroy()
963966#if MULTIPLAYER_TOOLS_1_0_0_PRE_7
964967 private void ExtractNetworkMetrics ( )
965968 {
966- if ( NetworkManager . IsServer )
969+ if ( m_NetworkManager . IsServer )
967970 {
968- var ngoConnectionIds = NetworkManager . ConnectedClients . Keys ;
971+ var ngoConnectionIds = m_NetworkManager . ConnectedClients . Keys ;
969972 foreach ( var ngoConnectionId in ngoConnectionIds )
970973 {
971- if ( ngoConnectionId == 0 && NetworkManager . IsHost )
974+ if ( ngoConnectionId == 0 && m_NetworkManager . IsHost )
972975 {
973976 continue ;
974977 }
975- var transportClientId = NetworkManager . ConnectionManager . ClientIdToTransportId ( ngoConnectionId ) ;
978+ var transportClientId = m_NetworkManager . ConnectionManager . ClientIdToTransportId ( ngoConnectionId ) ;
976979 ExtractNetworkMetricsForClient ( transportClientId ) ;
977980 }
978981 }
@@ -992,10 +995,10 @@ private void ExtractNetworkMetricsForClient(ulong transportClientId)
992995 ExtractNetworkMetricsFromPipeline ( m_UnreliableSequencedFragmentedPipeline , networkConnection ) ;
993996 ExtractNetworkMetricsFromPipeline ( m_ReliableSequencedPipeline , networkConnection ) ;
994997
995- var rttValue = NetworkManager . IsServer ? 0 : ExtractRtt ( networkConnection ) ;
998+ var rttValue = m_NetworkManager . IsServer ? 0 : ExtractRtt ( networkConnection ) ;
996999 NetworkMetrics . UpdateRttToServer ( rttValue ) ;
9971000
998- var packetLoss = NetworkManager . IsServer ? 0 : ExtractPacketLoss ( networkConnection ) ;
1001+ var packetLoss = m_NetworkManager . IsServer ? 0 : ExtractPacketLoss ( networkConnection ) ;
9991002 NetworkMetrics . UpdatePacketLoss ( packetLoss ) ;
10001003 }
10011004
@@ -1199,9 +1202,9 @@ public override ulong GetCurrentRtt(ulong clientId)
11991202 // use the transport client ID) or from a user (which will be using the NGO client ID).
12001203 // So we just try both cases (ExtractRtt returns 0 for invalid connections).
12011204
1202- if ( NetworkManager != null )
1205+ if ( m_NetworkManager != null )
12031206 {
1204- var transportId = NetworkManager . ConnectionManager . ClientIdToTransportId ( clientId ) ;
1207+ var transportId = m_NetworkManager . ConnectionManager . ClientIdToTransportId ( clientId ) ;
12051208
12061209 var rtt = ExtractRtt ( ParseClientId ( transportId ) ) ;
12071210 if ( rtt > 0 )
@@ -1221,14 +1224,14 @@ public override void Initialize(NetworkManager networkManager = null)
12211224 {
12221225 Debug . Assert ( sizeof ( ulong ) == UnsafeUtility . SizeOf < NetworkConnection > ( ) , "Netcode connection id size does not match UTP connection id size" ) ;
12231226
1224- NetworkManager = networkManager ;
1227+ m_NetworkManager = networkManager ;
12251228
1226- if ( NetworkManager && NetworkManager . PortOverride . Overidden )
1229+ if ( m_NetworkManager && m_NetworkManager . PortOverride . Overidden )
12271230 {
1228- ConnectionData . Port = NetworkManager . PortOverride . Value ;
1231+ ConnectionData . Port = m_NetworkManager . PortOverride . Value ;
12291232 }
12301233
1231- m_RealTimeProvider = NetworkManager ? NetworkManager . RealTimeProvider : new RealTimeProvider ( ) ;
1234+ m_RealTimeProvider = m_NetworkManager ? m_NetworkManager . RealTimeProvider : new RealTimeProvider ( ) ;
12321235
12331236 m_NetworkSettings = new NetworkSettings ( Allocator . Persistent ) ;
12341237
@@ -1322,7 +1325,7 @@ public override void Send(ulong clientId, ArraySegment<byte> payload, NetworkDel
13221325 // provide any reliability guarantees anymore. Disconnect the client since at
13231326 // this point they're bound to become desynchronized.
13241327
1325- var ngoClientId = NetworkManager ? . ConnectionManager . TransportIdToClientId ( clientId ) ?? clientId ;
1328+ var ngoClientId = m_NetworkManager ? . ConnectionManager . TransportIdToClientId ( clientId ) ?? clientId ;
13261329 Debug . LogError ( $ "Couldn't add payload of size { payload . Count } to reliable send queue. " +
13271330 $ "Closing connection { ngoClientId } as reliability guarantees can't be maintained.") ;
13281331
@@ -1479,7 +1482,7 @@ private void ConfigureSimulatorForUtp1()
14791482
14801483 protected override NetworkTopologyTypes OnCurrentTopology ( )
14811484 {
1482- return NetworkManager != null ? NetworkManager . NetworkConfig . NetworkTopology : NetworkTopologyTypes . ClientServer ;
1485+ return m_NetworkManager != null ? m_NetworkManager . NetworkConfig . NetworkTopology : NetworkTopologyTypes . ClientServer ;
14831486 }
14841487
14851488 private string m_ServerPrivateKey ;
@@ -1555,7 +1558,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
15551558 heartbeatTimeoutMS: transport. m_HeartbeatTimeoutMS ) ;
15561559
15571560#if UNITY_WEBGL && ! UNITY_EDITOR
1558- if ( NetworkManager . IsServer && m_ProtocolType != ProtocolType . RelayUnityTransport )
1561+ if ( m_NetworkManager . IsServer && m_ProtocolType != ProtocolType . RelayUnityTransport )
15591562 {
15601563 throw new Exception ( "WebGL as a server is not supported by Unity Transport, outside the Editor." ) ;
15611564 }
@@ -1577,7 +1580,7 @@ public void CreateDriver(UnityTransport transport, out NetworkDriver driver,
15771580 }
15781581 else
15791582 {
1580- if ( NetworkManager . IsServer )
1583+ if ( m_NetworkManager . IsServer )
15811584 {
15821585 if ( string . IsNullOrEmpty ( m_ServerCertificate ) || string . IsNullOrEmpty ( m_ServerPrivateKey ) )
15831586 {
0 commit comments