Skip to content

Commit a28d137

Browse files
committed
Cleanup
1 parent 0c4aea4 commit a28d137

File tree

5 files changed

+54
-13
lines changed

5 files changed

+54
-13
lines changed

WindowsFirewallHelper.Sample/EditPortForm.cs

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,50 @@ public FirewallProtocol FirewallProtocol
1818
switch (cb_protocol.Text?.ToUpper().Trim())
1919
{
2020
case "ALL":
21+
2122
return FirewallProtocol.Any;
2223
case "TCP":
24+
2325
return FirewallProtocol.TCP;
2426
case "UDP":
27+
2528
return FirewallProtocol.UDP;
2629
default:
2730
FirewallProtocol protocol;
31+
2832
if (FirewallProtocol.TryParse(cb_protocol.Text, out protocol))
33+
{
2934
return protocol;
35+
}
36+
3037
return null;
3138
}
3239
}
3340
set
3441
{
3542
if (value == FirewallProtocol.Any)
43+
{
3644
cb_protocol.SelectedItem = "ALL";
45+
}
3746
else if (value == FirewallProtocol.TCP)
47+
{
3848
cb_protocol.SelectedItem = "TCP";
49+
}
3950
else if (value == FirewallProtocol.UDP)
51+
{
4052
cb_protocol.SelectedItem = "UDP";
53+
}
4154
else
55+
{
4256
cb_protocol.SelectedItem = FirewallProtocol.ProtocolNumber.ToString();
57+
}
4358
}
4459
}
4560

4661
public ushort PortNumber
4762
{
48-
get { return (ushort) nud_port.Value; }
49-
set { nud_port.Value = value; }
63+
get => (ushort) nud_port.Value;
64+
set => nud_port.Value = value;
5065
}
5166

5267
private void FormSubmit(object sender, EventArgs e)

WindowsFirewallHelper.Sample/MainForm.cs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private void AddPortRule(object sender, EventArgs e)
3737
try
3838
{
3939
var portDialog = new EditPortForm();
40+
4041
if (portDialog.ShowDialog() == DialogResult.OK)
4142
{
4243
var rule = FirewallManager.Instance.CreatePortRule(
@@ -58,6 +59,7 @@ private void DeleteRule(object sender, EventArgs e)
5859
try
5960
{
6061
var rule = treeView.SelectedNode.Tag as IRule;
62+
6163
if (rule != null)
6264
{
6365
FirewallManager.Instance.Rules.Remove(rule);
@@ -80,7 +82,9 @@ private void FormLoad(object sender, EventArgs e)
8082
private void ItemClicked(object sender, EventArgs e)
8183
{
8284
if (treeView.SelectedNode != null)
85+
{
8386
NodeDiscovery(treeView.SelectedNode);
87+
}
8488
}
8589

8690
private void ItemSelected(object sender, TreeViewEventArgs e)
@@ -97,21 +101,36 @@ private void ItemSelected(object sender, TreeViewEventArgs e)
97101
private void NodeDiscovery(TreeNode node)
98102
{
99103
var o = node.Tag;
104+
100105
if (o == null)
106+
{
101107
return;
108+
}
109+
102110
node.Nodes.Clear();
111+
103112
if (o.GetType().GetInterfaces().Contains(typeof(IEnumerable)))
113+
{
104114
foreach (var item in (IEnumerable) o)
115+
{
105116
node.Nodes.Add(new TreeNode(item.ToString()) {Tag = item});
117+
}
118+
}
106119
else if (!o.GetType().IsValueType)
120+
{
107121
foreach (var propertyInfo in o.GetType().GetProperties())
122+
{
108123
if (propertyInfo.PropertyType.GetInterfaces().Contains(typeof(IEnumerable)) &&
109-
(propertyInfo.PropertyType != typeof(string)))
124+
propertyInfo.PropertyType != typeof(string))
125+
{
110126
if (!propertyInfo.GetGetMethod().IsStatic)
111127
{
112128
var value = propertyInfo.GetValue(o, null);
113129
node.Nodes.Add(new TreeNode("[" + propertyInfo.Name + "] ") {Tag = value});
114130
}
131+
}
132+
}
133+
}
115134
}
116135

117136
private void RefreshTreeView()

WindowsFirewallHelper/FirewallAPIv1/FirewallProfile.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public bool BlockAllInboundTraffic
3131
/// <summary>
3232
/// Gets the global default behavior regarding inbound traffic
3333
/// </summary>
34-
/// <exception cref="T:WindowsFirewallHelper.FirewallAPIv1.FirewallAPIv1NotSupportedException">Setting a value for this property is not supported</exception>
34+
/// <exception cref="T:WindowsFirewallHelper.FirewallAPIv1.FirewallAPIv1NotSupportedException">
35+
/// Setting a value for this
36+
/// property is not supported
37+
/// </exception>
3538
public FirewallAction DefaultInboundAction
3639
{
3740
get => FirewallAction.Block;
@@ -42,7 +45,10 @@ public FirewallAction DefaultInboundAction
4245
/// <summary>
4346
/// Gets the global default behavior regarding outbound traffic
4447
/// </summary>
45-
/// <exception cref="T:WindowsFirewallHelper.FirewallAPIv1.FirewallAPIv1NotSupportedException">Setting a value for this property is not supported</exception>
48+
/// <exception cref="T:WindowsFirewallHelper.FirewallAPIv1.FirewallAPIv1NotSupportedException">
49+
/// Setting a value for this
50+
/// property is not supported
51+
/// </exception>
4652
public FirewallAction DefaultOutboundAction
4753
{
4854
get => FirewallAction.Allow;

WindowsFirewallHelper/FirewallAPIv2/Rules/StandardRuleWin7.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ public EdgeTraversalAction EdgeTraversalOptions
9393
{
9494
if (!Enum.IsDefined(typeof(EdgeTraversalAction), UnderlyingObjectV2.EdgeTraversalOptions))
9595
{
96-
throw new NotSupportedException();;
96+
throw new NotSupportedException();
97+
;
9798
}
9899

99100
return (EdgeTraversalAction) UnderlyingObjectV2.EdgeTraversalOptions;

WindowsFirewallHelper/Helpers/EnumerableHelper.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ public static IEnumerable<T> ToEnumerable<T>(this IEnumVARIANT enumVariant)
1111
{
1212
enumVariant.Reset();
1313
int bufferLength;
14+
1415
do
1516
{
1617
var buffer = new object[1];
17-
var bufferLengthPointer = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(Int32)));
18+
var bufferLengthPointer = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(int)));
1819
enumVariant.Next(buffer.Length, buffer, bufferLengthPointer);
1920
bufferLength = Marshal.ReadInt32(bufferLengthPointer);
2021
Marshal.FreeCoTaskMem(bufferLengthPointer);
2122

22-
for (int i = 0; i < Math.Min(bufferLength, buffer.Length); i++)
23+
for (var i = 0; i < Math.Min(bufferLength, buffer.Length); i++)
2324
{
2425
yield return (T) buffer[i];
2526
}
@@ -31,16 +32,15 @@ public static IEnumerable<T> ToEnumerable<T>(this IEnumVARIANT enumVariant, int
3132
enumVariant.Reset();
3233

3334
var buffer = new object[count];
34-
var bufferLengthPointer = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(Int32)));
35+
var bufferLengthPointer = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(int)));
3536
enumVariant.Next(buffer.Length, buffer, bufferLengthPointer);
3637
var bufferLength = Marshal.ReadInt32(bufferLengthPointer);
3738
Marshal.FreeCoTaskMem(bufferLengthPointer);
3839

39-
for (int i = 0; i < Math.Min(bufferLength, count); i++)
40+
for (var i = 0; i < Math.Min(bufferLength, count); i++)
4041
{
41-
yield return (T)buffer[i];
42+
yield return (T) buffer[i];
4243
}
4344
}
44-
4545
}
46-
}
46+
}

0 commit comments

Comments
 (0)