From 0e41b3a182a069db577af4d5c67651019ff70f13 Mon Sep 17 00:00:00 2001 From: "Jakob A. Dam" Date: Tue, 31 Mar 2015 15:09:32 +0200 Subject: [PATCH] GetString -> ToString --- CICRadarR/RADIUSAttributes.vb | 2 +- CICRadarR/RADIUSPacket.vb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CICRadarR/RADIUSAttributes.vb b/CICRadarR/RADIUSAttributes.vb index 6239c30..09e9e4b 100644 --- a/CICRadarR/RADIUSAttributes.vb +++ b/CICRadarR/RADIUSAttributes.vb @@ -198,7 +198,7 @@ Public Class RADIUSAttribute End Get End Property - Public Function GetString() As String + Public Overrides Function ToString() As String Return ConvertToString(mValue) End Function diff --git a/CICRadarR/RADIUSPacket.vb b/CICRadarR/RADIUSPacket.vb index 4118c2c..663f120 100644 --- a/CICRadarR/RADIUSPacket.vb +++ b/CICRadarR/RADIUSPacket.vb @@ -87,7 +87,7 @@ Public Class RADIUSPacket Get If mCode <> RadiusPacketCode.AccessRequest Then Return Nothing If mAttributes.GetFirstAttribute(RadiusAttributeType.UserName) Is Nothing Then Return Nothing - Return mAttributes.GetFirstAttribute(RadiusAttributeType.UserName).GetString + Return mAttributes.GetFirstAttribute(RadiusAttributeType.UserName).ToString End Get End Property @@ -166,7 +166,7 @@ Public Class RADIUSPacket If username Is Nothing Then Return False Dim userpass As RADIUSAttribute = mAttributes.GetFirstAttribute(RadiusAttributeType.UserPassword) If userpass Is Nothing Then Return False - Dim password As String = authList.GetSharedSecret(username.GetString) + Dim password As String = authList.GetSharedSecret(username.ToString) If password = "" Then Return False Dim passlen As Integer = password.Length \ 16 @@ -193,7 +193,7 @@ Public Class RADIUSPacket hasher = Nothing - Return (ConvertToString(expect) = userpass.GetString) + Return (ConvertToString(expect) = userpass.ToString) End Function '''