aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorRoy <roy.mail.net@gmail.com>2017-11-10 23:27:53 +0200
committerRoy <roy.mail.net@gmail.com>2017-11-10 23:27:53 +0200
commit92d805a20292ad69f6bc5d9c414bbd215365adf5 (patch)
treeb66f9792e172cfef5b85f175f7f08b78c9bd0e2e /Software
parent22ba0c01b8ada9a23221d73a3997ca37bb9d1cf9 (diff)
downloadTango-92d805a20292ad69f6bc5d9c414bbd215365adf5.tar.gz
Tango-92d805a20292ad69f6bc5d9c414bbd215365adf5.zip
Moved TcpServer to Transport.Servers.
Diffstat (limited to 'Software')
-rw-r--r--Software/Visual Studio/Tango.Emulator/MainWindow.xaml.cs2
-rw-r--r--Software/Visual Studio/Tango.Integration/Emulators/MachineEmulator.cs2
-rw-r--r--Software/Visual Studio/Tango.Integration/TCP/ClientConnectedEventArgs.cs19
-rw-r--r--Software/Visual Studio/Tango.Integration/Tango.Integration.csproj2
-rw-r--r--Software/Visual Studio/Tango.Transport/Servers/ClientConnectedEventArgs.cs30
-rw-r--r--Software/Visual Studio/Tango.Transport/Servers/TcpServer.cs (renamed from Software/Visual Studio/Tango.Integration/TCP/TcpServer.cs)5
-rw-r--r--Software/Visual Studio/Tango.Transport/Tango.Transport.csproj2
7 files changed, 38 insertions, 24 deletions
diff --git a/Software/Visual Studio/Tango.Emulator/MainWindow.xaml.cs b/Software/Visual Studio/Tango.Emulator/MainWindow.xaml.cs
index b7a827813..6e32d9f2d 100644
--- a/Software/Visual Studio/Tango.Emulator/MainWindow.xaml.cs
+++ b/Software/Visual Studio/Tango.Emulator/MainWindow.xaml.cs
@@ -15,7 +15,7 @@ using System.Windows.Navigation;
using System.Windows.Shapes;
using Tango.Transport.Adapters;
using Tango.Integration.Emulators;
-using Tango.Integration.TCP;
+using Tango.Transport.Servers;
using Tango.Transport.Transporters;
using Tango.Logging;
using Tango.PMR;
diff --git a/Software/Visual Studio/Tango.Integration/Emulators/MachineEmulator.cs b/Software/Visual Studio/Tango.Integration/Emulators/MachineEmulator.cs
index 31113151f..0767791d2 100644
--- a/Software/Visual Studio/Tango.Integration/Emulators/MachineEmulator.cs
+++ b/Software/Visual Studio/Tango.Integration/Emulators/MachineEmulator.cs
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using Tango.Integration.TCP;
+using Tango.Transport.Servers;
using Tango.Logging;
using Tango.PMR;
using Tango.PMR.Common;
diff --git a/Software/Visual Studio/Tango.Integration/TCP/ClientConnectedEventArgs.cs b/Software/Visual Studio/Tango.Integration/TCP/ClientConnectedEventArgs.cs
deleted file mode 100644
index 21e311b19..000000000
--- a/Software/Visual Studio/Tango.Integration/TCP/ClientConnectedEventArgs.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Tango.Integration.TCP
-{
- public class ClientConnectedEventArgs : EventArgs
- {
- public TcpClient Socket { get; set; }
-
- public ClientConnectedEventArgs(TcpClient socket)
- {
- Socket = socket;
- }
- }
-}
diff --git a/Software/Visual Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual Studio/Tango.Integration/Tango.Integration.csproj
index f5624e0db..f0bda4170 100644
--- a/Software/Visual Studio/Tango.Integration/Tango.Integration.csproj
+++ b/Software/Visual Studio/Tango.Integration/Tango.Integration.csproj
@@ -65,8 +65,6 @@
</Compile>
<Compile Include="Emulators\MachineEmulator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="TCP\ClientConnectedEventArgs.cs" />
- <Compile Include="TCP\TcpServer.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Tango.Core\Tango.Core.csproj">
diff --git a/Software/Visual Studio/Tango.Transport/Servers/ClientConnectedEventArgs.cs b/Software/Visual Studio/Tango.Transport/Servers/ClientConnectedEventArgs.cs
new file mode 100644
index 000000000..976a749cc
--- /dev/null
+++ b/Software/Visual Studio/Tango.Transport/Servers/ClientConnectedEventArgs.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.Transport.Servers
+{
+ /// <summary>
+ /// Represents a <see cref="TcpServer"/> new client event arguments.
+ /// </summary>
+ /// <seealso cref="System.EventArgs" />
+ public class ClientConnectedEventArgs : EventArgs
+ {
+ /// <summary>
+ /// Gets or sets the new socket.
+ /// </summary>
+ public TcpClient Socket { get; set; }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="ClientConnectedEventArgs"/> class.
+ /// </summary>
+ /// <param name="socket">The socket.</param>
+ public ClientConnectedEventArgs(TcpClient socket)
+ {
+ Socket = socket;
+ }
+ }
+}
diff --git a/Software/Visual Studio/Tango.Integration/TCP/TcpServer.cs b/Software/Visual Studio/Tango.Transport/Servers/TcpServer.cs
index 94e9bcbbc..8ce79757a 100644
--- a/Software/Visual Studio/Tango.Integration/TCP/TcpServer.cs
+++ b/Software/Visual Studio/Tango.Transport/Servers/TcpServer.cs
@@ -8,8 +8,11 @@ using System.Threading;
using System.Threading.Tasks;
using Tango.Logging;
-namespace Tango.Integration.TCP
+namespace Tango.Transport.Servers
{
+ /// <summary>
+ /// Represents a TCP/IP listener wrapper.
+ /// </summary>
public class TcpServer
{
private TaskScheduler scheduler;
diff --git a/Software/Visual Studio/Tango.Transport/Tango.Transport.csproj b/Software/Visual Studio/Tango.Transport/Tango.Transport.csproj
index f17a85752..0f383b699 100644
--- a/Software/Visual Studio/Tango.Transport/Tango.Transport.csproj
+++ b/Software/Visual Studio/Tango.Transport/Tango.Transport.csproj
@@ -70,6 +70,8 @@
<Compile Include="Adapters\TcpTransportAdapter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ITransporter.cs" />
+ <Compile Include="Servers\ClientConnectedEventArgs.cs" />
+ <Compile Include="Servers\TcpServer.cs" />
<Compile Include="TransportAdapterBase.cs" />
<Compile Include="TransportComponentState.cs" />
<Compile Include="TransporterBase.cs" />