corrade-vassal – Diff between revs 7 and 13
?pathlinks?
Rev 7 | Rev 13 | |||
---|---|---|---|---|
Line 8... | Line 8... | |||
8 | using System.Collections.Generic; |
8 | using System.Collections.Generic; |
|
9 | using System.ComponentModel; |
9 | using System.ComponentModel; |
|
10 | using System.IO; |
10 | using System.IO; |
|
11 | using System.Linq; |
11 | using System.Linq; |
|
12 | using System.Text; |
12 | using System.Text; |
|
13 | using System.Threading.Tasks; |
- | ||
14 | using System.Xml.Serialization; |
13 | using System.Xml.Serialization; |
|
Line 15... | Line 14... | |||
15 | |
14 | |
|
16 | namespace Vassal |
15 | namespace Vassal |
|
17 | { |
16 | { |
|
18 | /// <summary> |
17 | /// <summary> |
|
19 | /// Possible input and output filters. |
18 | /// Possible input and output filters. |
|
20 | /// </summary> |
19 | /// </summary> |
|
21 | public enum Filter : uint |
20 | public enum Filter : uint |
|
22 | { |
21 | { |
|
23 | [XmlEnum(Name = "none")] |
- | ||
24 | [Description("none")] |
- | ||
25 | NONE = 0, |
22 | [XmlEnum(Name = "none")] [Description("none")] NONE = 0, |
|
26 | [XmlEnum(Name = "RFC1738")] |
- | ||
27 | [Description("RFC1738")] |
- | ||
28 | RFC1738, |
23 | [XmlEnum(Name = "RFC1738")] [Description("RFC1738")] RFC1738, |
|
29 | [XmlEnum(Name = "RFC3986")] |
- | ||
30 | [Description("RFC3986")] |
- | ||
31 | RFC3986, |
24 | [XmlEnum(Name = "RFC3986")] [Description("RFC3986")] RFC3986, |
|
32 | [XmlEnum(Name = "ENIGMA")] |
- | ||
33 | [Description("ENIGMA")] |
- | ||
34 | ENIGMA, |
25 | [XmlEnum(Name = "ENIGMA")] [Description("ENIGMA")] ENIGMA, |
|
35 | [XmlEnum(Name = "VIGENERE")] |
- | ||
36 | [Description("VIGENERE")] |
- | ||
37 | VIGENERE, |
26 | [XmlEnum(Name = "VIGENERE")] [Description("VIGENERE")] VIGENERE, |
|
38 | [XmlEnum(Name = "ATBASH")] |
- | ||
39 | [Description("ATBASH")] |
- | ||
40 | ATBASH, |
27 | [XmlEnum(Name = "ATBASH")] [Description("ATBASH")] ATBASH, |
|
41 | [XmlEnum(Name = "BASE64")] |
- | ||
42 | [Description("BASE64")] |
- | ||
43 | BASE64 |
28 | [XmlEnum(Name = "BASE64")] [Description("BASE64")] BASE64 |
|
Line 44... | Line 29... | |||
44 | } |
29 | } |
|
45 | |
30 | |
|
46 | /// <summary> |
31 | /// <summary> |
|
Line 50... | Line 35... | |||
50 | { |
35 | { |
|
51 | public char[] plugs; |
36 | public char[] plugs; |
|
52 | public char reflector; |
37 | public char reflector; |
|
53 | public char[] rotors; |
38 | public char[] rotors; |
|
54 | } |
39 | } |
|
55 | |
40 | |
|
56 | [Serializable] |
41 | [Serializable] |
|
57 | public class VassalConfiguration |
42 | public class VassalConfiguration |
|
58 | { |
43 | { |
|
59 | private static readonly object VassalConfigurationLock = new object(); |
44 | private static readonly object VassalConfigurationLock = new object(); |
|
60 | |
- | ||
61 | private string _HTTPServerURL = @"http://127.0.0.1:8080/"; |
- | ||
62 | private string _group = string.Empty; |
45 | private uint _dataTimeout = 15000; |
|
63 | private string _password = string.Empty; |
- | ||
Line 64... | Line 46... | |||
64 | |
46 | |
|
65 | private ENIGMA _enigma = new ENIGMA |
47 | private ENIGMA _enigma = new ENIGMA |
|
66 | { |
48 | { |
|
67 | rotors = new[] { '3', 'g', '1' }, |
49 | rotors = new[] {'3', 'g', '1'}, |
|
68 | plugs = new[] { 'z', 'p', 'q' }, |
50 | plugs = new[] {'z', 'p', 'q'}, |
|
69 | reflector = 'b' |
51 | reflector = 'b' |
|
- | 52 | }; |
||
- | 53 | |
||
- | 54 | private string _group = string.Empty; |
||
70 | }; |
55 | private string _HTTPServerURL = @"http://127.0.0.1:8080/"; |
|
71 | private List<Filter> _inputFilters = new List<Filter>(); |
56 | private List<Filter> _inputFilters = new List<Filter>(); |
|
72 | private List<Filter> _outputFilters = new List<Filter>(); |
57 | private List<Filter> _outputFilters = new List<Filter>(); |
|
73 | private string _vigenereSecret = string.Empty; |
- | ||
74 | private uint _teleportTimeout = 30000; |
- | ||
75 | private uint _dataTimeout = 15000; |
58 | private string _password = string.Empty; |
|
- | 59 | private uint _regionRestartDelay = 120; |
||
- | 60 | private uint _teleportTimeout = 30000; |
||
Line 76... | Line 61... | |||
76 | private uint _regionRestartDelay = 120; |
61 | private string _vigenereSecret = string.Empty; |
|
77 | |
62 | |
|
78 | public string Group |
63 | public string Group |
|
79 | { |
64 | { |
|
Line 151... | Line 136... | |||
151 | { |
136 | { |
|
152 | get |
137 | get |
|
153 | { |
138 | { |
|
154 | lock (VassalConfigurationLock) |
139 | lock (VassalConfigurationLock) |
|
155 | { |
140 | { |
|
156 | return !_inputFilters.Any() ? new List<Filter> { Filter.RFC1738 } : _inputFilters; |
141 | return !_inputFilters.Any() ? new List<Filter> {Filter.RFC1738} : _inputFilters; |
|
157 | } |
142 | } |
|
158 | } |
143 | } |
|
159 | set |
144 | set |
|
160 | { |
145 | { |
|
161 | lock (VassalConfigurationLock) |
146 | lock (VassalConfigurationLock) |
|
Line 169... | Line 154... | |||
169 | { |
154 | { |
|
170 | get |
155 | get |
|
171 | { |
156 | { |
|
172 | lock (VassalConfigurationLock) |
157 | lock (VassalConfigurationLock) |
|
173 | { |
158 | { |
|
174 | return !_outputFilters.Any() ? new List<Filter> { Filter.RFC1738 } : _outputFilters; |
159 | return !_outputFilters.Any() ? new List<Filter> {Filter.RFC1738} : _outputFilters; |
|
175 | } |
160 | } |
|
176 | } |
161 | } |
|
177 | set |
162 | set |
|
178 | { |
163 | { |
|
179 | lock (VassalConfigurationLock) |
164 | lock (VassalConfigurationLock) |
|
Line 259... | Line 244... | |||
259 | { |
244 | { |
|
260 | lock (VassalConfigurationLock) |
245 | lock (VassalConfigurationLock) |
|
261 | { |
246 | { |
|
262 | using (StreamWriter writer = new StreamWriter(file, false, Encoding.UTF8)) |
247 | using (StreamWriter writer = new StreamWriter(file, false, Encoding.UTF8)) |
|
263 | { |
248 | { |
|
264 | XmlSerializer serializer = new XmlSerializer(typeof(VassalConfiguration)); |
249 | XmlSerializer serializer = new XmlSerializer(typeof (VassalConfiguration)); |
|
265 | serializer.Serialize(writer, configuration); |
250 | serializer.Serialize(writer, configuration); |
|
266 | //writer.Flush(); |
251 | //writer.Flush(); |
|
267 | } |
252 | } |
|
268 | } |
253 | } |
|
269 | } |
254 | } |
|
Line 273... | Line 258... | |||
273 | lock (VassalConfigurationLock) |
258 | lock (VassalConfigurationLock) |
|
274 | { |
259 | { |
|
275 | using (StreamReader stream = new StreamReader(file, Encoding.UTF8)) |
260 | using (StreamReader stream = new StreamReader(file, Encoding.UTF8)) |
|
276 | { |
261 | { |
|
277 | XmlSerializer serializer = |
262 | XmlSerializer serializer = |
|
278 | new XmlSerializer(typeof(VassalConfiguration)); |
263 | new XmlSerializer(typeof (VassalConfiguration)); |
|
279 | configuration = (VassalConfiguration)serializer.Deserialize(stream); |
264 | configuration = (VassalConfiguration) serializer.Deserialize(stream); |
|
280 | } |
265 | } |
|
281 | } |
266 | } |
|
282 | } |
267 | } |
|
283 | } |
268 | } |
|
284 | } |
269 | } |
|
285 | |
270 | |