WingMan – Diff between revs 35 and 36

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 35 Rev 36
Line 61... Line 61...
61   61  
Line 62... Line 62...
62 public string Nick { get; set; } 62 public string Nick { get; set; }
Line 63... Line 63...
63   63  
Line 64... Line 64...
64 private IPAddress IpAddress { get; set; } 64 private IPAddress IpAddress { get; set; }
Line 65... Line 65...
65   65  
Line 157... Line 157...
157 return Running; 157 return Running;
158 } 158 }
Line 159... Line 159...
159   159  
160 private async Task StopClient() 160 private async Task StopClient()
161 { -  
162 UnbindClientHandlers(); -  
163   161 {
-   162 await Client.StopAsync();
-   163  
164 await Client.StopAsync(); 164 UnbindClientHandlers();
Line 165... Line 165...
165 } 165 }
166   166  
167 public void BindClientHandlers() 167 public void BindClientHandlers()
Line 184... Line 184...
184 { 184 {
185 try 185 try
186 { 186 {
187 using (var inputStream = new MemoryStream(e.ApplicationMessage.Payload)) 187 using (var inputStream = new MemoryStream(e.ApplicationMessage.Payload))
188 { 188 {
189 using (var decryptedStream = await AES.Decrypt(inputStream, Password)) 189 using (var decryptedStream = await Aes.Decrypt(inputStream, Password))
190 { 190 {
191 using (var lz4Decompress = new LZ4Stream(decryptedStream, CompressionMode.Decompress)) 191 using (var lz4Decompress = new LZ4Stream(decryptedStream, CompressionMode.Decompress))
192 { 192 {
193 var outpuStream = new MemoryStream(); 193 var outpuStream = new MemoryStream();
194 await lz4Decompress.CopyToAsync(outpuStream); 194 await lz4Decompress.CopyToAsync(outpuStream);
Line 252... Line 252...
252 return Running; 252 return Running;
253 } 253 }
Line 254... Line 254...
254   254  
255 private async Task StopServer() 255 private async Task StopServer()
256 { -  
257 UnbindServerHandlers(); -  
258   256 {
-   257 await Server.StopAsync();
-   258  
259 await Server.StopAsync(); 259 UnbindServerHandlers();
Line 260... Line 260...
260 } 260 }
261   261  
262 private void BindServerHandlers() 262 private void BindServerHandlers()
Line 285... Line 285...
285 { 285 {
286 try 286 try
287 { 287 {
288 using (var inputStream = new MemoryStream(e.ApplicationMessage.Payload)) 288 using (var inputStream = new MemoryStream(e.ApplicationMessage.Payload))
289 { 289 {
290 using (var decryptedStream = await AES.Decrypt(inputStream, Password)) 290 using (var decryptedStream = await Aes.Decrypt(inputStream, Password))
291 { 291 {
292 using (var lz4Decompress = new LZ4Stream(decryptedStream, CompressionMode.Decompress)) 292 using (var lz4Decompress = new LZ4Stream(decryptedStream, CompressionMode.Decompress))
293 { 293 {
294 var outpuStream = new MemoryStream(); 294 var outpuStream = new MemoryStream();
295 await lz4Decompress.CopyToAsync(outpuStream); 295 await lz4Decompress.CopyToAsync(outpuStream);
Line 381... Line 381...
381 await lz4Stream.WriteAsync(payload, 0, payload.Length); 381 await lz4Stream.WriteAsync(payload, 0, payload.Length);
382 await lz4Stream.FlushAsync(); 382 await lz4Stream.FlushAsync();
Line 383... Line 383...
383   383  
Line 384... Line 384...
384 compressStream.Position = 0L; 384 compressStream.Position = 0L;
385   385  
386 using (var outputStream = await AES.Encrypt(compressStream, Password)) 386 using (var outputStream = await Aes.Encrypt(compressStream, Password))
387 { 387 {
388 var data = outputStream.ToArray(); 388 var data = outputStream.ToArray();
389 switch (Type) 389 switch (Type)