corrade-vassal – Diff between revs 20 and 22

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 20 Rev 22
Line 9... Line 9...
9 using System.Diagnostics; 9 using System.Diagnostics;
10 using System.Drawing; 10 using System.Drawing;
11 using System.Drawing.Imaging; 11 using System.Drawing.Imaging;
12 using System.IO; 12 using System.IO;
13 using System.Linq; 13 using System.Linq;
14 using System.Net; -  
15 using System.Net.Http.Headers; 14 using System.Net.Http.Headers;
16 using System.Net.Sockets; 15 using System.Net.Sockets;
17 using System.Reflection; 16 using System.Reflection;
18 using System.Text; 17 using System.Text;
19 using System.Text.RegularExpressions; 18 using System.Text.RegularExpressions;
20 using System.Threading; 19 using System.Threading;
21 using System.Windows.Forms; 20 using System.Windows.Forms;
22 using OpenMetaverse; 21 using OpenMetaverse;
23 using wasSharp; 22 using wasSharp;
-   23 using wasSharp.Web;
-   24 using wasSharp.Web.Utilities;
24 using Parallel = System.Threading.Tasks.Parallel; 25 using Parallel = System.Threading.Tasks.Parallel;
25 using Timer = System.Timers.Timer; 26 using Timer = System.Timers.Timer;
Line 26... Line 27...
26   27  
27 namespace Vassal 28 namespace Vassal
Line 38... Line 39...
38 public static volatile int regionsStateCheckIndex; 39 public static volatile int regionsStateCheckIndex;
39 public static VassalConfiguration vassalConfiguration = new VassalConfiguration(); 40 public static VassalConfiguration vassalConfiguration = new VassalConfiguration();
40 public static Vassal vassalForm; 41 public static Vassal vassalForm;
41 public static readonly object ClientInstanceTeleportLock = new object(); 42 public static readonly object ClientInstanceTeleportLock = new object();
42 public static readonly object RegionsStateCheckLock = new object(); 43 public static readonly object RegionsStateCheckLock = new object();
43 public static Web.wasHTTPClient HTTPClient; 44 public static wasHTTPClient HTTPClient;
Line 44... Line 45...
44   45  
45 /// <summary> 46 /// <summary>
46 /// Corrade version. 47 /// Corrade version.
47 /// </summary> 48 /// </summary>
Line 57... Line 58...
57 foreach (var filter in vassalConfiguration.InputFilters) 58 foreach (var filter in vassalConfiguration.InputFilters)
58 { 59 {
59 switch (filter) 60 switch (filter)
60 { 61 {
61 case Filter.RFC1738: 62 case Filter.RFC1738:
62 o = Web.URLUnescapeDataString(o); 63 o = Extensions.URLUnescapeDataString(o);
63 break; 64 break;
64 case Filter.RFC3986: 65 case Filter.RFC3986:
65 o = Web.URIUnescapeDataString(o); 66 o = Extensions.URIUnescapeDataString(o);
66 break; 67 break;
67 case Filter.ENIGMA: 68 case Filter.ENIGMA:
68 o = Cryptography.ENIGMA(o, vassalConfiguration.ENIGMA.rotors.ToArray(), 69 o = Cryptography.ENIGMA(o, vassalConfiguration.ENIGMA.rotors.ToArray(),
69 vassalConfiguration.ENIGMA.plugs.ToArray(), 70 vassalConfiguration.ENIGMA.plugs.ToArray(),
70 vassalConfiguration.ENIGMA.reflector); 71 vassalConfiguration.ENIGMA.reflector);
Line 93... Line 94...
93 foreach (var filter in vassalConfiguration.OutputFilters) 94 foreach (var filter in vassalConfiguration.OutputFilters)
94 { 95 {
95 switch (filter) 96 switch (filter)
96 { 97 {
97 case Filter.RFC1738: 98 case Filter.RFC1738:
98 o = Web.URLEscapeDataString(o); 99 o = Extensions.URLEscapeDataString(o);
99 break; 100 break;
100 case Filter.RFC3986: 101 case Filter.RFC3986:
101 o = Web.URIEscapeDataString(o); 102 o = Extensions.URIEscapeDataString(o);
102 break; 103 break;
103 case Filter.ENIGMA: 104 case Filter.ENIGMA:
104 o = Cryptography.ENIGMA(o, vassalConfiguration.ENIGMA.rotors.ToArray(), 105 o = Cryptography.ENIGMA(o, vassalConfiguration.ENIGMA.rotors.ToArray(),
105 vassalConfiguration.ENIGMA.plugs.ToArray(), 106 vassalConfiguration.ENIGMA.plugs.ToArray(),
106 vassalConfiguration.ENIGMA.reflector); 107 vassalConfiguration.ENIGMA.reflector);
Line 433... Line 434...
433 default: 434 default:
434 mediaType = @"text/plain"; 435 mediaType = @"text/plain";
435 break; 436 break;
436 } 437 }
437 // Create HTTP Client 438 // Create HTTP Client
438 HTTPClient = new Web.wasHTTPClient(new ProductInfoHeaderValue(@"Vassal", 439 HTTPClient = new wasHTTPClient(new ProductInfoHeaderValue(@"Vassal",
439 VASSAL_VERSION), mediaType, vassalConfiguration.ServicesTimeout); 440 VASSAL_VERSION), mediaType, vassalConfiguration.ServicesTimeout);
440 } 441 }
Line 441... Line 442...
441   442  
442 // Get all the regions if they exist. 443 // Get all the regions if they exist.