diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-26 08:41:04 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2020-03-26 08:41:04 +0200 |
| commit | 7594cea7dc1b3fef5be77fa06c71a954d024723d (patch) | |
| tree | e70e25ef61e938b8c20c1bcdbad164441a3b8542 /Software/Visual_Studio/Tango.Transport | |
| parent | d6a9f6a9ca9346bdf048c62d810667852bb80d1c (diff) | |
| download | Tango-7594cea7dc1b3fef5be77fa06c71a954d024723d.tar.gz Tango-7594cea7dc1b3fef5be77fa06c71a954d024723d.zip | |
Added support for public IP address on SignalR connection.
Fixed issue with ExternalBridgeScanner.
Added Connection Time.
Diffstat (limited to 'Software/Visual_Studio/Tango.Transport')
| -rw-r--r-- | Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs | 8 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs b/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs index a8f272292..def4cd741 100644 --- a/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs +++ b/Software/Visual_Studio/Tango.Transport/Adapters/SignalRTransportAdapter.cs @@ -78,7 +78,7 @@ namespace Tango.Transport.Adapters /// <param name="mode">The adapter mode.</param> /// <param name="serialNumber">The machine serial number (when creating session).</param> /// <param name="sessionID">The session identifier (when joining session).</param> - public SignalRTransportAdapter(String url, String hub, SignalRTransportAdapterMode mode, String serialNumber = null, String sessionID = null) : this() + public SignalRTransportAdapter(String url, String hub, SignalRTransportAdapterMode mode, String serialNumber = null, String sessionID = null, String ipAddress = null) : this() { Url = url; Hub = hub; @@ -86,6 +86,11 @@ namespace Tango.Transport.Adapters SerialNumber = serialNumber; SessionID = sessionID; Address = sessionID; + + if (!String.IsNullOrWhiteSpace(ipAddress)) + { + Address = ipAddress; + } } /// <summary> @@ -184,7 +189,6 @@ namespace Tango.Transport.Adapters { LogManager.Log("Creating SignalR adapter Session..."); SessionID = await _proxy.Invoke<String>("CreateSession", SerialNumber); - Address = SessionID; } else { diff --git a/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs b/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs index 2696f5698..bdcf0ee64 100644 --- a/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs +++ b/Software/Visual_Studio/Tango.Transport/TransportAdapterBase.cs @@ -77,10 +77,16 @@ namespace Tango.Transport protected set { _transferRate = value; RaisePropertyChanged(nameof(TransferRate)); } } + private String _address; /// <summary> /// Gets or sets the channel address. /// </summary> - public String Address { get; set; } + public String Address + { + get { return _address; } + set { _address = value; RaisePropertyChangedAuto(); } + } + private TransportComponentState _state; /// <summary> |
