Feature: SNMP Timeout added again (#2126)

BornToBeRoot · Apr 2, 2023 · 5d2caf2 · 5d2caf2
1 parent a4b1db4
commit 5d2caf2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/Source/NETworkManager.Models/Network/SNMPClient.cs b/Source/NETworkManager.Models/Network/SNMPClient.cs
@@ -40,11 +40,11 @@ protected virtual void OnComplete()
         Complete?.Invoke(this, EventArgs.Empty);
     }
 
-    public event EventHandler UserHasCanceled;
+    public event EventHandler Canceled;
 
-    protected virtual void OnUserHasCanceled()
+    protected virtual void OnCanceled()
     {
-        UserHasCanceled?.Invoke(this, EventArgs.Empty);
+        Canceled?.Invoke(this, EventArgs.Empty);
     }
     #endregion
 
@@ -74,7 +74,7 @@ public void GetAsync(IPAddress ipAddress, string oid, SNMPOptions options)
             }
             catch (OperationCanceledException)
             {
-                OnUserHasCanceled();
+                OnCanceled();
             }
             catch (ErrorException)
             {
@@ -119,7 +119,7 @@ public void GetAsyncV3(IPAddress ipAddress, string oid, SNMPOptionsV3 options)
             }
             catch (OperationCanceledException)
             {
-                OnUserHasCanceled();
+                OnCanceled();
             }
             catch (ErrorException)
             {
@@ -153,7 +153,7 @@ public void WalkAsync(IPAddress ipAddress, string oid, SNMPOptions options)
             }
             catch (OperationCanceledException)
             {
-                OnUserHasCanceled();
+                OnCanceled();
             }
             catch (ErrorException)
             {
@@ -190,7 +190,7 @@ public void WalkAsyncV3(IPAddress ipAddress, string oid, SNMPOptionsV3 options)
             }
             catch (OperationCanceledException)
             {
-                OnUserHasCanceled();
+                OnCanceled();
             }
             catch (ErrorException)
             {
@@ -220,7 +220,7 @@ public void SetAsync(IPAddress ipAddress, string oid, string data, SNMPOptions o
             }
             catch (OperationCanceledException)
             {
-                OnUserHasCanceled();
+                OnCanceled();
             }
             catch (ErrorException)
             {
@@ -258,7 +258,7 @@ public void SetAsyncV3(IPAddress ipAddress, string oid, string data, SNMPOptions
             }
             catch (OperationCanceledException)
             {
-                OnUserHasCanceled();
+                OnCanceled();
             }
             catch (ErrorException)
             {

diff --git a/Source/NETworkManager/MainWindow.xaml.cs b/Source/NETworkManager/MainWindow.xaml.cs
@@ -1574,8 +1574,6 @@ private void WriteDefaultPowerShellProfileToRegistry()
         if (!SettingsManager.Current.Appearance_PowerShellModifyGlobalProfile)
             return;
 
-        Debug.WriteLine("Test");
-
         HashSet<string> paths = new();
 
         // PowerShell

diff --git a/Source/NETworkManager/ViewModels/SNMPViewModel.cs b/Source/NETworkManager/ViewModels/SNMPViewModel.cs
@@ -554,7 +554,7 @@ private async void StartWork()
         snmpClient.Received += Snmp_Received;
         snmpClient.DataUpdated += SnmpClient_DataUpdated;
         snmpClient.Error += Snmp_Error;
-        snmpClient.UserHasCanceled += Snmp_UserHasCanceled;
+        snmpClient.Canceled += Snmp_Canceled;
         snmpClient.Complete += Snmp_Complete;
 
         if (Version != SNMPVersion.V3)
@@ -608,6 +608,9 @@ private async void StartWork()
             }
         }
 
+        // Set timeout
+        _cancellationTokenSource.CancelAfter(SettingsManager.Current.SNMP_Timeout);
+
         // Add to history...
         AddHostToHistory(Host);
         AddOIDToHistory(OID);
@@ -668,21 +671,15 @@ private void SnmpClient_DataUpdated(object sender, EventArgs e)
         IsStatusMessageDisplayed = true;
     }
 
-    private void Snmp_TimeoutReached(object sender, EventArgs e)
-    {
-        StatusMessage = Localization.Resources.Strings.TimeoutOnSNMPQuery;
-        IsStatusMessageDisplayed = true;
-    }
-
     private void Snmp_Error(object sender, EventArgs e)
     {
         StatusMessage = Mode == SNMPMode.Set ? Localization.Resources.Strings.ErrorInResponseCheckIfYouHaveWritePermissions : Localization.Resources.Strings.ErrorInResponse;
         IsStatusMessageDisplayed = true;
     }
 
-    private void Snmp_UserHasCanceled(object sender, EventArgs e)
+    private void Snmp_Canceled(object sender, EventArgs e)
     {
-        StatusMessage = Localization.Resources.Strings.CanceledByUserMessage;
+        StatusMessage = CancelScan ? Localization.Resources.Strings.CanceledByUserMessage : Localization.Resources.Strings.TimeoutOnSNMPQuery;
         IsStatusMessageDisplayed = true;
     }
 

diff --git a/Source/NETworkManager/Views/SNMPSettingsView.xaml b/Source/NETworkManager/Views/SNMPSettingsView.xaml
@@ -11,11 +11,9 @@
     <StackPanel>
         <TextBlock Text="{x:Static localization:Strings.SNMP}" Style="{StaticResource HeaderTextBlock}" />
         <TextBlock Text="{x:Static localization:Strings.WalkMode}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
-        <ComboBox ItemsSource="{Binding WalkModes}" SelectedItem="{Binding WalkMode}" Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" />
-        <!--        
+        <ComboBox ItemsSource="{Binding WalkModes}" SelectedItem="{Binding WalkMode}" Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" />              
         <TextBlock Text="{x:Static localization:Strings.TimeoutMS}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
-        <mah:NumericUpDown Value="{Binding Timeout}" Maximum="900000" Minimum="100" Interval="100" Margin="0,0,0,10" />
-        -->
+        <mah:NumericUpDown Value="{Binding Timeout}" Maximum="900000" Minimum="100" Interval="100" Margin="0,0,0,10" />        
         <TextBlock Text="{x:Static localization:Strings.Port}" Style="{StaticResource CenterTextBlock}" Margin="0,0,0,10" />
         <TextBox Width="150" HorizontalAlignment="Left" mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort161}" Style="{StaticResource DefaultTextBox}">
             <TextBox.Text>