From 6afe01e9320c49e0436cc37a47e92ece738fad93 Mon Sep 17 00:00:00 2001 From: "Jakob A. Dam" Date: Wed, 8 Apr 2015 12:52:12 +0200 Subject: [PATCH] Using IsValid on the RadiusPacket --- CICRadarR/CICRadarR.vb | 12 ++++++++++-- CICRadarR/handlers/RDSHandler.vb | 12 ------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/CICRadarR/CICRadarR.vb b/CICRadarR/CICRadarR.vb index 17ed80f..d306c9c 100644 --- a/CICRadarR/CICRadarR.vb +++ b/CICRadarR/CICRadarR.vb @@ -118,11 +118,19 @@ Public Class CICRadarR ' will fire up the callback procedure. Invalid requests are dropped, per RFC. Private Sub ProcessPacket1812(ByVal packet As RADIUSPacket) 'Console.WriteLine("packet " & Now) - ProcessPacket(radius1812, packet) + If packet.IsValid Then + ProcessPacket(radius1812, packet) + Else + Console.WriteLine("Packet is not valid. Dropping.") + End If End Sub Private Sub ProcessPacket1645(ByVal packet As RADIUSPacket) - ProcessPacket(radius1645, packet) + If packet.IsValid Then + ProcessPacket(radius1645, packet) + Else + Console.WriteLine("Packet is not valid. Dropping.") + End If End Sub Private Sub AccessLog(ByVal message) diff --git a/CICRadarR/handlers/RDSHandler.vb b/CICRadarR/handlers/RDSHandler.vb index 20a7f38..0b5555d 100644 --- a/CICRadarR/handlers/RDSHandler.vb +++ b/CICRadarR/handlers/RDSHandler.vb @@ -30,10 +30,6 @@ Public Class RDSHandler End Sub Public Sub ProcessRequest() - If ValidPacket() = False Then - Exit Sub - End If - ExtractAttributes() If mIsAppLaunchRequest Then @@ -231,14 +227,6 @@ Public Class RDSHandler Return email End Function - Private Function ValidPacket() - If mPacket.UserName Is Nothing Then - Console.WriteLine("Not a valid radius packet.. No username present.. Drop!") - Return False - End If - Return True - End Function - Private Sub ExtractAttributes() packetUsername = mPacket.UserName.ToLower packetPassword = mPacket.UserPassword