Skip to content

Commit daae796

Browse files
seayxuseayxu
committed
add encoding for tcp sender
1 parent 16430be commit daae796

19 files changed

Lines changed: 98 additions & 89 deletions

File tree

‎build/version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Condition="'$(AssemblyName)'=='GodSharp.Socket'">
33
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
4-
<Version>1.0.2-preview3</Version>
4+
<Version>1.0.2-preview4</Version>
55
</PropertyGroup>
66
</Project>

‎sample/Tcp/Chat/GodSharp.Chat/UI/Client/FormClient.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,15 +101,15 @@ private void SetConnected(bool connected=true)
101101
this.tsmiServerDisconnect.Enabled = connected;
102102
}
103103

104-
private void OnConnected(Sender sender)
104+
private void OnConnected(TcpSender sender)
105105
{
106106
Debug.WriteLine($"connected to server {sender.RemoteEndPoint}");
107107

108108
SetSendButton(true);
109109
//AppendMessage(sender.LocalEndPoint.ToString(), "join(you).", MessageType.Join, true);
110110
}
111111

112-
private void OnData(Sender sender, byte[] bytes)
112+
private void OnData(TcpSender sender, byte[] bytes)
113113
{
114114
length = bytes.Length;
115115
if (bytes[0]==0x02)
@@ -160,7 +160,7 @@ private void OnData(Sender sender, byte[] bytes)
160160
}
161161
}
162162

163-
private void OnClosed(Sender sender)
163+
private void OnClosed(TcpSender sender)
164164
{
165165
Debug.WriteLine($"disconnect from server {sender.RemoteEndPoint}");
166166
//AppendMessage(sender.LocalEndPoint.ToString(), "leave(you).", MessageType.Leave, true);
@@ -169,7 +169,7 @@ private void OnClosed(Sender sender)
169169
SetSendButton(false);
170170
}
171171

172-
private void OnException(Sender sender, Exception exception)
172+
private void OnException(TcpSender sender, Exception exception)
173173
{
174174
Debug.WriteLine($"{sender.RemoteEndPoint.ToString()} throw exception : {exception.Message},TargetSite : {exception.TargetSite}");
175175
}

‎sample/Tcp/Chat/GodSharp.Chat/UI/Server/FormServer.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ private void btnStop_Click(object sender, EventArgs e)
6262
btnStop.Enabled = !server.Running;
6363
}
6464

65-
private void OnConnected(Sender sender)
65+
private void OnConnected(TcpSender sender)
6666
{
6767
AppendMessage(sender.RemoteEndPoint.ToString(), sender.RemoteEndPoint.ToString() + " join.", MessageType.Join);
6868
clientNumber = server.Clients.Count;
@@ -85,7 +85,7 @@ private void OnConnected(Sender sender)
8585
Send(sender, buffer);
8686
}
8787

88-
private void OnData(Sender sender,byte[] bytes)
88+
private void OnData(TcpSender sender,byte[] bytes)
8989
{
9090
byte[] tmp = sender.Guid.ToByteArray();
9191
byte[] buffer = new byte[tmp.Length + bytes.Length + 3];
@@ -98,7 +98,7 @@ private void OnData(Sender sender,byte[] bytes)
9898
Send(sender, buffer);
9999
}
100100

101-
private void OnClosed(Sender sender)
101+
private void OnClosed(TcpSender sender)
102102
{
103103
AppendMessage(sender.RemoteEndPoint.ToString(), sender.RemoteEndPoint.ToString() + " leave.", MessageType.Leave);
104104
clientNumber = server.Clients.Count;
@@ -119,14 +119,14 @@ private void OnClosed(Sender sender)
119119
Send(sender, buffer);
120120
}
121121

122-
private void OnException(Sender sender, Exception exception)
122+
private void OnException(TcpSender sender, Exception exception)
123123
{
124124
Debug.WriteLine($"{sender.RemoteEndPoint.ToString()} throw exception : {exception.Message},TargetSite : {exception.TargetSite}");
125125
}
126126

127-
private void Send(Sender sender, byte[] bytes)
127+
private void Send(TcpSender sender, byte[] bytes)
128128
{
129-
foreach (Sender item in server.Clients)
129+
foreach (TcpSender item in server.Clients)
130130
{
131131
if (item.Guid != sender.Guid)
132132
{

‎src/GodSharp.Socket/GodSharp.Socket.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<None Remove="Object\**" />
4646
</ItemGroup>
4747
<ItemGroup>
48-
<Compile Remove="Base\SenderCollection.cs" />
49-
<Compile Remove="Internal\Listener\ListenerCollection.cs" />
48+
<Compile Remove="Tcp\Base\SenderCollection.cs" />
49+
<Compile Remove="Tcp\Listener\ListenerCollection.cs" />
5050
</ItemGroup>
5151

5252
<Import Project="..\..\build\version.props" />

‎src/GodSharp.Socket/Internal/Extension/EndPointExtension.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Net;
22

3-
namespace GodSharp.Sockets.Internal.Extension
3+
namespace GodSharp.Sockets
44
{
55
internal static class EndPointExtension
66
{

‎src/GodSharp.Socket/Internal/Extension/SocketExtension.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Net.Sockets;
44
using System.Text;
55

6-
namespace GodSharp.Sockets.Internal.Extension
6+
namespace GodSharp.Sockets
77
{
88
internal static class SocketExtension
99
{

‎src/GodSharp.Socket/Internal/Listener/ListenerType.cs‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/GodSharp.Socket/Internal/Util/Utils.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Security.Cryptography;
44
using System.Text;
55

6-
namespace GodSharp.Sockets.Internal.Util
6+
namespace GodSharp.Sockets
77
{
88
/// <summary>
99
/// Socket utils.

src/GodSharp.Socket/Base/SocketBase.cs renamed to src/GodSharp.Socket/Tcp/Base/SocketBase.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using GodSharp.Sockets.Internal.Util;
2-
using System;
1+
using System;
32
using System.Net.Sockets;
43
using System.Text;
54

@@ -69,31 +68,31 @@ public abstract class SocketBase
6968
/// <value>
7069
/// The on connected.
7170
/// </value>
72-
public Action<Sender> OnConnected { get; set; } = null;
71+
public Action<TcpSender> OnConnected { get; set; } = null;
7372

7473
/// <summary>
7574
/// Gets or sets the on data.
7675
/// </summary>
7776
/// <value>
7877
/// The on data.
7978
/// </value>
80-
public Action<Sender, byte[]> OnData { get; set; } = null;
79+
public Action<TcpSender, byte[]> OnData { get; set; } = null;
8180

8281
/// <summary>
8382
/// Gets or sets the on exception.
8483
/// </summary>
8584
/// <value>
8685
/// The on exception.
8786
/// </value>
88-
public Action<Sender, Exception> OnException { get; set; } = null;
87+
public Action<TcpSender, Exception> OnException { get; set; } = null;
8988

9089
/// <summary>
9190
/// Gets or sets the on closed.
9291
/// </summary>
9392
/// <value>
9493
/// The on closed.
9594
/// </value>
96-
public Action<Sender> OnClosed { get; set; } = null;
95+
public Action<TcpSender> OnClosed { get; set; } = null;
9796

9897
/// <summary>
9998
/// Start Socket.

‎src/GodSharp.Socket/Tcp/Client/SocketClient.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using GodSharp.Sockets.Internal.Extension;
2-
using System;
1+
using System;
32
using System.Net;
43
using System.Net.Sockets;
54

@@ -10,7 +9,7 @@ namespace GodSharp.Sockets
109
/// </summary>
1110
public partial class SocketClient:SocketBase
1211
{
13-
private Listener listener = null;
12+
private TcpListener listener = null;
1413

1514
/// <summary>
1615
/// Gets or sets the client identifier.
@@ -26,7 +25,7 @@ public partial class SocketClient:SocketBase
2625
/// <value>
2726
/// The sender.
2827
/// </value>
29-
public Sender Sender => listener?.Sender;
28+
public TcpSender Sender => listener?.Sender;
3029

3130
/// <summary>
3231
/// Gets the remote end point.
@@ -75,7 +74,7 @@ public void Connect()
7574

7675
listener?.Stop();
7776

78-
listener = new Listener(this, socket, Internal.ListenerType.Client);
77+
listener = new TcpListener(this, socket, TcpListenerType.Client);
7978

8079
SetOnConnectedFun();
8180
}
@@ -111,7 +110,7 @@ public void Connect(EndPoint endPoint)
111110

112111
listener?.Stop();
113112

114-
listener = new Listener(this, socket, Internal.ListenerType.Client);
113+
listener = new TcpListener(this, socket, TcpListenerType.Client);
115114

116115
SetOnConnectedFun();
117116
}
@@ -143,7 +142,7 @@ public void Connect(string host, int port)
143142

144143
listener?.Stop();
145144

146-
listener = new Listener(this, socket, Internal.ListenerType.Client);
145+
listener = new TcpListener(this, socket, TcpListenerType.Client);
147146

148147
SetOnConnectedFun();
149148
}
@@ -181,7 +180,7 @@ public void Connect(IPAddress address, int port)
181180

182181
listener?.Stop();
183182

184-
listener = new Listener(this, socket, Internal.ListenerType.Client);
183+
listener = new TcpListener(this, socket, TcpListenerType.Client);
185184

186185
SetOnConnectedFun();
187186
}

0 commit comments

Comments
 (0)