Skip to content

Commit 9c90344

Browse files
committed
Update
1 parent 9807fe2 commit 9c90344

28 files changed

Lines changed: 193 additions & 71 deletions

Source/NETworkManager/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public partial class App : Application
1616
// Single instance unique identifier
1717
private const string Guid = "6A3F34B2-161F-4F70-A8BC-A19C40F79CFB";
1818
Mutex _mutex;
19-
19+
2020
private bool _singleInstanceClose = false;
2121

2222
public App()

Source/NETworkManager/Helpers/RegexHelper.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,8 @@ public static class RegexHelper
4343

4444
// Test for http|https uris
4545
public const string httpAndHttpsUriRegex = @"^http(s)?:\/\/([\w-]+.)+[\w-]+(\/[\w- ./?%&=])?$";
46+
47+
// OID (SNMP)
48+
public const string OIDRegex = @"^([1-9][0-9]{0,3}|0)(\.([1-9][0-9]{0,3}|0)){5,13}$";
4649
}
4750
}

Source/NETworkManager/Models/Network/SNMP.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,14 @@ public void Walkv3Async(IPAddress ipAddress, string oid, SNMPv3Security security
184184

185185
public void Setv1v2cAsync(SNMPVersion version, IPAddress ipAddress, string communtiy, string oid, string data, SNMPOptions options)
186186
{
187-
/* Task.Run(() =>
187+
Task.Run(() =>
188188
{
189189
try
190-
{*/
190+
{
191191
var result = Messenger.Set(version == SNMPVersion.v1 ? VersionCode.V1 : VersionCode.V2, new IPEndPoint(ipAddress, options.Port), new OctetString(communtiy), new List<Variable> { new Variable(new ObjectIdentifier(oid), new OctetString(data)) }, options.Timeout);
192-
Debug.Write(result);
192+
193193
OnComplete();
194-
/*}
194+
}
195195
catch (Lextm.SharpSnmpLib.Messaging.TimeoutException)
196196
{
197197
OnTimeout();
@@ -200,7 +200,7 @@ public void Setv1v2cAsync(SNMPVersion version, IPAddress ipAddress, string commu
200200
{
201201
OnError();
202202
}
203-
});*/
203+
});
204204
}
205205

206206
// noAuthNoPriv
@@ -247,12 +247,14 @@ public enum SNMPVersion
247247
v3
248248
}
249249

250+
// Trap and Inform not implemented
250251
public enum SNMPMode
251252
{
252253
Get,
253254
Walk,
254255
Set,
255-
Trap
256+
Trap,
257+
Inform
256258
}
257259

258260
public enum SNMPv3Security

Source/NETworkManager/NETworkManager.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
<Compile Include="Models\Settings\RemoteDesktopSessionInfo.cs" />
221221
<Compile Include="Models\Update\UpdateAvailableArgs.cs" />
222222
<Compile Include="Models\Update\Updater.cs" />
223+
<Compile Include="Validators\OIDValidator.cs" />
223224
<Compile Include="Validators\Int32Validator.cs" />
224225
<Compile Include="Validators\MultipleIPAddressesValidator.cs" />
225226
<Compile Include="Validators\MultipleHostsValidator.cs" />

Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -489,25 +489,26 @@
489489
<system:String x:Key="String_Progress_FixGatewayAfterDHCPEnabled">Fixe Gateway nachdem DHCP aktiviert wurde...</system:String>
490490

491491
<!-- Validate (User Input in GUI) -->
492-
<system:String x:Key="String_ValidateError_FieldEmpty">Feld darf nicht leer sein!</system:String>
493-
<system:String x:Key="String_ValidateError_EnterValidMACAddress">Geben Sie eine gültige MAC-Addresse (z.B. 00:F1:23:AB:F2:35) ein!</system:String>
494-
<system:String x:Key="String_ValidateError_EnterValidPort">Geben Sie einen gültigen Port ein (1 - 65535)!</system:String>
495-
<system:String x:Key="String_ValidateError_EnterValidIPv4Address">Geben Sie eine gültige IPv4-Adresse ein!</system:String>
496-
<system:String x:Key="String_ValidateError_FolderDoesNotExist">Ordner existiert nicht!</system:String>
497-
<system:String x:Key="String_ValidateError_EnterValidSubnetmask">Geben Sie eine gültige Subnetzmaske ein (z.B. 255.255.255.0)!</system:String>
498-
<system:String x:Key="String_ValidateError_EnterValidSubnetmaskOrCIDR">Geben Sie eine gültige Subnetzmaske oder CIDR ein (z.B. 255.255.255.0 oder /24)!</system:String>
499-
<system:String x:Key="String_ValidateError_EnterValidIPScanRange">Geben Sie einen gültigen IP-Bereich ein!</system:String>
500-
<system:String x:Key="String_ValidateError_FileDoesNotExist">Datei existiert nicht!</system:String>
501-
<system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Geben Sie einen gültigen Port und/oder Port-Bereich ein (1 - 65535)!</system:String>
502-
<system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Es dürfen nur Zahlen eingegeben werden!</system:String>
503-
<system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Geben Sie einen gültigen Wert ein zwischen 10 und 100!</system:String>
504-
<system:String x:Key="String_ValidateError_EnterValidIPAddress">Geben Sie eine gültige IP-Adresse ein!</system:String>
505-
<system:String x:Key="String_ValidateError_EnterValidSubnet">Geben Sie ein gültiges Subnetz ein (z.B. 192.168.178.133/26)</system:String>
506-
<system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Geben Sie eine gültige Webseite ein (z.B. https://example.com/index.html)</system:String>
507-
<system:String x:Key="String_ValidateError_EnterValidHosts">Geben Sie gültige Hosts ein (mehrere Hosts dürfen nicht mit ";" enden)!</system:String>
508-
<system:String x:Key="String_ValidateError_EnterValidNumber">Geben Sie eine gültige Zahl ein!</system:String>
509-
<system:String x:Key="String_ValidateError_EnterOneOrMoreValidIPAddresses">Geben Sie eine oder mehrere gültige IP-Adressen ein!</system:String>
510-
492+
<system:String x:Key="String_ValidationError_FieldEmpty">Feld darf nicht leer sein!</system:String>
493+
<system:String x:Key="String_ValidationError_EnterValidMACAddress">Geben Sie eine gültige MAC-Addresse (z.B. 00:F1:23:AB:F2:35) ein!</system:String>
494+
<system:String x:Key="String_ValidationError_EnterValidPort">Geben Sie einen gültigen Port ein (1 - 65535)!</system:String>
495+
<system:String x:Key="String_ValidationError_EnterValidIPv4Address">Geben Sie eine gültige IPv4-Adresse ein!</system:String>
496+
<system:String x:Key="String_ValidationError_FolderDoesNotExist">Ordner existiert nicht!</system:String>
497+
<system:String x:Key="String_ValidationError_EnterValidSubnetmask">Geben Sie eine gültige Subnetzmaske ein (z.B. 255.255.255.0)!</system:String>
498+
<system:String x:Key="String_ValidationError_EnterValidSubnetmaskOrCIDR">Geben Sie eine gültige Subnetzmaske oder CIDR ein (z.B. 255.255.255.0 oder /24)!</system:String>
499+
<system:String x:Key="String_ValidationError_EnterValidIPScanRange">Geben Sie einen gültigen IP-Bereich ein!</system:String>
500+
<system:String x:Key="String_ValidationError_FileDoesNotExist">Datei existiert nicht!</system:String>
501+
<system:String x:Key="String_ValidationError_EnterValidPortOrPortRange">Geben Sie einen gültigen Port und/oder Port-Bereich ein (1 - 65535)!</system:String>
502+
<system:String x:Key="String_ValidationError_OnlyNumbersCanBeEntered">Es dürfen nur Zahlen eingegeben werden!</system:String>
503+
<system:String x:Key="String_ValidationError_EnterValidValueBetween10and100">Geben Sie einen gültigen Wert ein zwischen 10 und 100!</system:String>
504+
<system:String x:Key="String_ValidationError_EnterValidIPAddress">Geben Sie eine gültige IP-Adresse ein!</system:String>
505+
<system:String x:Key="String_ValidationError_EnterValidSubnet">Geben Sie ein gültiges Subnetz ein (z.B. 192.168.178.133/26)</system:String>
506+
<system:String x:Key="String_ValidationError_EnterValidWebsiteUri">Geben Sie eine gültige Webseite ein (z.B. https://example.com/index.html)</system:String>
507+
<system:String x:Key="String_ValidationError_EnterValidHosts">Geben Sie gültige Hosts ein (mehrere Hosts dürfen nicht mit ";" enden)!</system:String>
508+
<system:String x:Key="String_ValidationError_EnterValidNumber">Geben Sie eine gültige Zahl ein!</system:String>
509+
<system:String x:Key="String_ValidationError_EnterOneOrMoreValidIPAddresses">Geben Sie eine oder mehrere gültige IP-Adressen ein!</system:String>
510+
<system:String x:Key="String_ValidationError_EnterValidOID">Geben Sie eine gültige OID ein!</system:String>
511+
511512
<!-- ApplicationInfo.Name -->
512513
<system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>
513514
<system:String x:Key="String_ApplicationName_NetworkInterface">Netzwerkinterface</system:String>

Source/NETworkManager/Resources/Localization/Resources.en-US.xaml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -489,24 +489,25 @@
489489
<system:String x:Key="String_Progress_FixGatewayAfterDHCPEnabled">Fix gateway after DHCP is enabled...</system:String>
490490

491491
<!-- Validate (User Input in GUI) -->
492-
<system:String x:Key="String_ValidateError_FieldEmpty">Field cannot be empty!</system:String>
493-
<system:String x:Key="String_ValidateError_EnterValidMACAddress">Enter a valid MAC address like 00:F1:23:AB:F2:35!</system:String>
494-
<system:String x:Key="String_ValidateError_EnterValidPort">Enter a valid port (1 - 65535)!</system:String>
495-
<system:String x:Key="String_ValidateError_EnterValidIPv4Address">Enter a valid IPv4 address!</system:String>
496-
<system:String x:Key="String_ValidateError_FolderDoesNotExist">Folder does not exists!</system:String>
497-
<system:String x:Key="String_ValidateError_EnterValidSubnetmask">Enter a valid subnetmask (like 255.255.255.0)!</system:String>
498-
<system:String x:Key="String_ValidateError_EnterValidSubnetmaskOrCIDR">Enter a valid subnetmask or CIDR (like 255.255.255.0 or 24)!</system:String>
499-
<system:String x:Key="String_ValidateError_EnterValidIPScanRange">Enter a valid ip range!</system:String>
500-
<system:String x:Key="String_ValidateError_FileDoesNotExist">File does not exists!</system:String>
501-
<system:String x:Key="String_ValidateError_EnterValidPortOrPortRange">Enter a valid port and/or port range (1 - 65535)!</system:String>
502-
<system:String x:Key="String_ValidateError_OnlyNumbersCanBeEntered">Only numbers can be entered!</system:String>
503-
<system:String x:Key="String_ValidateError_EnterValidValueBetween10and100">Enter a valid value between 10 and 100!</system:String>
504-
<system:String x:Key="String_ValidateError_EnterValidIPAddress">Enter a valid IP address!</system:String>
505-
<system:String x:Key="String_ValidateError_EnterValidSubnet">Enter a valid subnet (like 192.168.178.133/26)</system:String>
506-
<system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Enter a valid website (like https://example.com/index.html)</system:String>
507-
<system:String x:Key="String_ValidateError_EnterValidHosts">Enter valid hosts (multiple hosts can not end with ";")!</system:String>
508-
<system:String x:Key="String_ValidateError_EnterValidNumber">Enter a valid number!</system:String>
509-
<system:String x:Key="String_ValidateError_EnterOneOrMoreValidIPAddresses">Enter one or more valid IP addresses!</system:String>
492+
<system:String x:Key="String_ValidationError_FieldEmpty">Field cannot be empty!</system:String>
493+
<system:String x:Key="String_ValidationError_EnterValidMACAddress">Enter a valid MAC address like 00:F1:23:AB:F2:35!</system:String>
494+
<system:String x:Key="String_ValidationError_EnterValidPort">Enter a valid port (1 - 65535)!</system:String>
495+
<system:String x:Key="String_ValidationError_EnterValidIPv4Address">Enter a valid IPv4 address!</system:String>
496+
<system:String x:Key="String_ValidationError_FolderDoesNotExist">Folder does not exists!</system:String>
497+
<system:String x:Key="String_ValidationError_EnterValidSubnetmask">Enter a valid subnetmask (like 255.255.255.0)!</system:String>
498+
<system:String x:Key="String_ValidationError_EnterValidSubnetmaskOrCIDR">Enter a valid subnetmask or CIDR (like 255.255.255.0 or 24)!</system:String>
499+
<system:String x:Key="String_ValidationError_EnterValidIPScanRange">Enter a valid ip range!</system:String>
500+
<system:String x:Key="String_ValidationError_FileDoesNotExist">File does not exists!</system:String>
501+
<system:String x:Key="String_ValidationError_EnterValidPortOrPortRange">Enter a valid port and/or port range (1 - 65535)!</system:String>
502+
<system:String x:Key="String_ValidationError_OnlyNumbersCanBeEntered">Only numbers can be entered!</system:String>
503+
<system:String x:Key="String_ValidationError_EnterValidValueBetween10and100">Enter a valid value between 10 and 100!</system:String>
504+
<system:String x:Key="String_ValidationError_EnterValidIPAddress">Enter a valid IP address!</system:String>
505+
<system:String x:Key="String_ValidationError_EnterValidSubnet">Enter a valid subnet (like 192.168.178.133/26)</system:String>
506+
<system:String x:Key="String_ValidationError_EnterValidWebsiteUri">Enter a valid website (like https://example.com/index.html)</system:String>
507+
<system:String x:Key="String_ValidationError_EnterValidHosts">Enter valid hosts (multiple hosts can not end with ";")!</system:String>
508+
<system:String x:Key="String_ValidationError_EnterValidNumber">Enter a valid number!</system:String>
509+
<system:String x:Key="String_ValidationError_EnterOneOrMoreValidIPAddresses">Enter one or more valid IP addresses!</system:String>
510+
<system:String x:Key="String_ValidationError_EnterValidOID">Enter a valid OID!</system:String>
510511

511512
<!-- ApplicationView.Name -->
512513
<system:String x:Key="String_ApplicationName_IPScanner">IP Scanner</system:String>

Source/NETworkManager/Validators/EmptyOrIPv4AddressValidator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
1616
if (Regex.IsMatch(value as string, RegexHelper.IPv4AddressRegex))
1717
return ValidationResult.ValidResult;
1818

19-
return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidIPv4Address"] as string);
19+
return new ValidationResult(false, Application.Current.Resources["String_ValidationError_EnterValidIPv4Address"] as string);
2020
}
2121
}
2222
}

Source/NETworkManager/Validators/EmptyValidator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class EmptyValidator : ValidationRule
99
public override ValidationResult Validate(object value, CultureInfo cultureInfo)
1010
{
1111
if (string.IsNullOrEmpty(value as string))
12-
return new ValidationResult(false, Application.Current.Resources["String_ValidateError_FieldEmpty"] as string);
12+
return new ValidationResult(false, Application.Current.Resources["String_ValidationError_FieldEmpty"] as string);
1313

1414
return ValidationResult.ValidResult;
1515
}

Source/NETworkManager/Validators/FileExistsValidator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
1313
if (File.Exists(value as string))
1414
return ValidationResult.ValidResult;
1515

16-
return new ValidationResult(false, Application.Current.Resources["String_ValidateError_FileDoesNotExist"] as string);
16+
return new ValidationResult(false, Application.Current.Resources["String_ValidationError_FileDoesNotExist"] as string);
1717
}
1818
}
1919
}

Source/NETworkManager/Validators/HttpAndHttpsUriValidator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public override ValidationResult Validate(object value, CultureInfo cultureInfo)
1212
if (Uri.TryCreate(value as string, UriKind.Absolute, out Uri uriResult) && (uriResult.Scheme == Uri.UriSchemeHttp || uriResult.Scheme == Uri.UriSchemeHttps))
1313
return ValidationResult.ValidResult;
1414

15-
return new ValidationResult(false, Application.Current.Resources["String_ValidateError_EnterValidWebsiteUri"] as string);
15+
return new ValidationResult(false, Application.Current.Resources["String_ValidationError_EnterValidWebsiteUri"] as string);
1616
}
1717
}
1818
}

0 commit comments

Comments
 (0)