More smaller networking bugfixes

Nut_Socket.vb
- ConnectionStatus property checks for null client object before checking .Connected property
- TcpClient object is left null at construction, and only instantiated during a Connection subroutine.
- Disconnect subroutine doesn't explicitly check for connection status on the TcpClient object before running anymore. This allows it to dispose/close all objects regardless.

UPS_Device.vb
- Fixed polling interval not being applied to timer. Associated property is now read only, and the interval is set directly on the timer during construction.
- Fixed missing call to socket's Disconnect subroutine, and added a general exception catch-all.
- Removed Login code from Reconnect subroutine, leaving that to external code.
- Removed ReConnected event since it seems to duplicate the Connected event's calls.

WinNUT.vb
- Moved Login call to connection finalization subroutine.
- Added LogException call during protocol error handling.

Author: gbakeman

WinNUT_V2/WinNUT-Client/WinNUT.vb

@@ -383,16 +383,12 @@ Public Class WinNUT
         UPS_Device = New UPS_Device(Nut_Config, LogFile, My.Settings.NUT_PollIntervalMsec, My.Settings.CAL_FreqInNom)
         AddHandler UPS_Device.EncounteredNUTException, AddressOf HandleNUTException
         UPS_Device.Connect_UPS(retryOnConnFailure)
-
-        If Not String.IsNullOrEmpty(Nut_Config.Login) Then
-            UPS_Device.Login()
-        End If
     End Sub
 
     ''' <summary>
     ''' Prepare the form to begin receiving data from a connected UPS.
     ''' </summary>
-    Private Sub UPSReady(nutUps As UPS_Device) Handles UPS_Device.Connected, UPS_Device.ReConnected
+    Private Sub UPSReady(nutUps As UPS_Device) Handles UPS_Device.Connected
         Dim upsConf = nutUps.Nut_Config
         LogFile.LogTracing(upsConf.UPSName & " has indicated it's ready to start sending data.", LogLvl.LOG_DEBUG, Me)
 
@@ -410,6 +406,10 @@ Public Class WinNUT
         LogFile.LogTracing("Connection to Nut Host Established", LogLvl.LOG_NOTICE, Me,
                            String.Format(StrLog.Item(AppResxStr.STR_LOG_CONNECTED),
                                          upsConf.Host, upsConf.Port))
+
+        If Not String.IsNullOrEmpty(upsConf.Login) Then
+            UPS_Device.Login()
+        End If
     End Sub
 
     Private Sub ConnectionError(sender As UPS_Device, ex As Exception) Handles UPS_Device.ConnectionError
@@ -596,7 +596,8 @@ Public Class WinNUT
             Event_Unknown_UPS()
         End If
 
-        LogFile.LogTracing("NUT protocol error encoutnered:" + vbNewLine + ex.ToString(), LogLvl.LOG_NOTICE, sender)
+        LogFile.LogTracing("NUT protocol error encoutnered:", LogLvl.LOG_NOTICE, sender)
+        LogFile.LogException(ex, Me)
     End Sub
 
     Public Sub Event_Unknown_UPS() ' Handles UPS_Device.Unknown_UPS
@@ -623,7 +624,7 @@ Public Class WinNUT
     End Sub
 
     Public Shared Sub Event_ChangeStatus() Handles Me.On_Battery, Me.On_Line,
-        UPS_Device.Lost_Connect, UPS_Device.Connected, UPS_Device.Disconnected, UPS_Device.New_Retry, UPS_Device.ReConnected
+        UPS_Device.Lost_Connect, UPS_Device.Connected, UPS_Device.Disconnected, UPS_Device.New_Retry
         ', UPS_Device.Unknown_UPS
         ', UPS_Device.InvalidLogin
 

WinNUT_V2/WinNUT-Client_Common/Nut_Socket.vb

@@ -1,25 +1,12 @@
-' WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.
-' Copyright (C) 2019-2021 Gawindx (Decaux Nicolas)
-'
-' This program is free software: you can redistribute it and/or modify it under the terms of the
-' GNU General Public License as published by the Free Software Foundation, either version 3 of the
-' License, or any later version.
-'
-' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY
-
-
-
-' Class dealing only with the management of the communication socket with the Nut server
-Imports System.IO
-Imports System.Net
+Imports System.IO
 Imports System.Net.Sockets
 
 Public Class Nut_Socket
 
 #Region "Properties"
     Public ReadOnly Property ConnectionStatus As Boolean
         Get
-            Return client.Connected
+            Return If(client IsNot Nothing, client.Connected, False)
         End Get
     End Property
 
@@ -55,7 +42,7 @@ Public Class Nut_Socket
     Private NutConfig As Nut_Parameter
 
     'Socket Variables
-    Private client As New TcpClient
+    Private client As TcpClient
     Private NutStream As NetworkStream
     Private ReaderStream As StreamReader
     Private WriterStream As StreamWriter
@@ -86,7 +73,7 @@ Public Class Nut_Socket
         Try
             LogFile.LogTracing(String.Format("Attempting TCP socket connection to {0}:{1}...", Host, Port), LogLvl.LOG_NOTICE, Me)
 
-            client.Connect(Host, Port)
+            client = New TcpClient(Host, Port)
             NutStream = client.GetStream()
             ReaderStream = New StreamReader(NutStream)
             WriterStream = New StreamWriter(NutStream)
@@ -140,28 +127,24 @@ Public Class Nut_Socket
     ''' </summary>
     ''' <param name="forceful">Skip sending the LOGOUT command to the NUT server. Unknown effects.</param>
     Public Sub Disconnect(Optional forceful = False)
-        If IsConnected Then
-            If IsLoggedIn AndAlso Not forceful Then
-                Query_Data("LOGOUT")
-            End If
+        If IsLoggedIn AndAlso Not forceful Then
+            Query_Data("LOGOUT")
+        End If
 
-            If WriterStream IsNot Nothing Then
-                WriterStream.Close()
-            End If
+        If WriterStream IsNot Nothing Then
+            WriterStream.Dispose()
+        End If
 
-            If ReaderStream IsNot Nothing Then
-                ReaderStream.Close()
-            End If
+        If ReaderStream IsNot Nothing Then
+            ReaderStream.Dispose()
+        End If
 
-            If NutStream IsNot Nothing Then
-                NutStream.Close()
-            End If
+        If NutStream IsNot Nothing Then
+            NutStream.Dispose()
+        End If
 
-            If client IsNot Nothing Then
-                client.Close()
-            End If
-        Else
-            Throw New InvalidOperationException("NUT Socket is already disconnected.")
+        If client IsNot Nothing Then
+            client.Close()
         End If
     End Sub
 

WinNUT_V2/WinNUT-Client_Common/UPS_Device.vb

@@ -1,13 +1,4 @@
-' WinNUT-Client is a NUT windows client for monitoring your ups hooked up to your favorite linux server.
-' Copyright (C) 2019-2021 Gawindx (Decaux Nicolas)
-'
-' This program is free software: you can redistribute it and/or modify it under the terms of the
-' GNU General Public License as published by the Free Software Foundation, either version 3 of the
-' License, or any later version.
-'
-' This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY
-
-Imports System.Globalization
+Imports System.Globalization
 Imports System.Windows.Forms
 
 Public Class UPS_Device
@@ -47,13 +38,10 @@ Public Class UPS_Device
     ''' How often UPS data is updated, in milliseconds.
     ''' </summary>
     ''' <returns></returns>
-    Public Property PollingInterval As Integer
+    Public ReadOnly Property PollingInterval As Integer
         Get
             Return Update_Data.Interval
         End Get
-        Set(value As Integer)
-            Update_Data.Interval = value
-        End Set
     End Property
 
     Public Property IsUpdatingData As Boolean
@@ -89,7 +77,6 @@ Public Class UPS_Device
 #Region "Events"
     Public Event DataUpdated()
     Public Event Connected(sender As UPS_Device)
-    Public Event ReConnected(sender As UPS_Device)
     ' Notify that the connection was closed gracefully.
     Public Event Disconnected()
     ' Notify of an unexpectedly lost connection (??)
@@ -127,7 +114,6 @@ Public Class UPS_Device
     Public Sub New(ByRef Nut_Config As Nut_Parameter, ByRef LogFile As Logger, pollInterval As Integer, defaultFrequency As Integer)
         Me.LogFile = LogFile
         Me.Nut_Config = Nut_Config
-        PollingInterval = pollInterval
         Freq_Fallback = defaultFrequency
         Nut_Socket = New Nut_Socket(Me.Nut_Config, LogFile)
 
@@ -138,7 +124,7 @@ Public Class UPS_Device
         End With
 
         With Update_Data
-            .Interval = DEFAULT_UPDATE_INTERVAL_MS
+            .Interval = pollInterval
             .Enabled = False
             AddHandler .Tick, AddressOf Retrieve_UPS_Datas
         End With
@@ -194,9 +180,12 @@ Public Class UPS_Device
 
         Retry = 0
         Try
-
+            Nut_Socket.Disconnect(forceful)
         Catch nutEx As NutException
             RaiseEvent EncounteredNUTException(Me, nutEx)
+        Catch ex As Exception
+            LogFile.LogTracing("Unexpected exception while Disconnecting.", LogLvl.LOG_ERROR, Me)
+            LogFile.LogException(ex, Me)
         Finally
             RaiseEvent Disconnected()
         End Try
@@ -224,12 +213,6 @@ Public Class UPS_Device
                 LogFile.LogTracing("Nut Host Reconnected", LogLvl.LOG_DEBUG, Me)
                 Reconnect_Nut.Stop()
                 Retry = 0
-
-                If Not String.IsNullOrEmpty(Nut_Config.Login) Then
-                    Login()
-                End If
-
-                RaiseEvent ReConnected(Me)
             End If
         Else
             LogFile.LogTracing("Max Retry reached. Stop Process Autoreconnect and wait for manual Reconnection", LogLvl.LOG_ERROR, Me, StrLog.Item(AppResxStr.STR_LOG_STOP_RETRY))