Skip to content

Commit b1d1c2f

Browse files
committed
fix: 连接tcp失败时有概率崩溃软件
1 parent b5a7670 commit b1d1c2f

File tree

1 file changed

+33
-5
lines changed

1 file changed

+33
-5
lines changed

llcom/Pages/SocketClientPage.xaml.cs

+33-5
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ private void ConnectButton_Click(object sender, RoutedEventArgs e)
142142
return;
143143
}
144144

145-
if(so.isSSL)
145+
if (so.isSSL)
146146
{
147147
var networkStream = new NetworkStream(s);
148148
var ssl = new SslStream(
@@ -155,7 +155,7 @@ private void ConnectButton_Click(object sender, RoutedEventArgs e)
155155
{
156156
ssl.AuthenticateAsClient("llcom tcp ssl client");
157157
}
158-
catch(Exception ssle)
158+
catch (Exception ssle)
159159
{
160160
ShowData($"❗ SSL error {ssle.Message}");
161161
socketNow = null;
@@ -166,13 +166,41 @@ private void ConnectButton_Click(object sender, RoutedEventArgs e)
166166
ShowData("❌ Server disconnected");
167167
return;
168168
}
169-
socketNow = new SocketObj(ssl);
170-
ssl.BeginRead(so.buffer, 0, StateObject.BUFFER_SIZE, new AsyncCallback(Read_Callback), so);
169+
try
170+
{
171+
socketNow = new SocketObj(ssl);
172+
ssl.BeginRead(so.buffer, 0, StateObject.BUFFER_SIZE, new AsyncCallback(Read_Callback), so);
173+
}
174+
catch (Exception ex)
175+
{
176+
ShowData($"❗ Server connect error {ex.Message}");
177+
socketNow = null;
178+
IsConnected = false;
179+
Changeable = true;
180+
s.Close();
181+
s.Dispose();
182+
ShowData("❌ Server disconnected");
183+
return;
184+
}
171185
}
172186
else
173187
{
174188
so.workSocket = s;
175-
s.BeginReceive(so.buffer, 0, StateObject.BUFFER_SIZE, 0, new AsyncCallback(Read_Callback), so);
189+
try
190+
{
191+
s.BeginReceive(so.buffer, 0, StateObject.BUFFER_SIZE, 0, new AsyncCallback(Read_Callback), so);
192+
}
193+
catch(Exception ex)
194+
{
195+
ShowData($"❗ Server connect error {ex.Message}");
196+
socketNow = null;
197+
IsConnected = false;
198+
Changeable = true;
199+
s.Close();
200+
s.Dispose();
201+
ShowData("❌ Server disconnected");
202+
return;
203+
}
176204
}
177205
}), s);
178206
}

0 commit comments

Comments
 (0)