From 86ff48900878fedfbce9c38cb64b130af96cbe5b Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Thu, 7 May 2020 09:07:21 +0300
Subject: [PATCH] Updated agents

---
 agents/agentreq.go | 4 ++--
 agents/librad.go   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/agents/agentreq.go b/agents/agentreq.go
index bed171730..e76972286 100644
--- a/agents/agentreq.go
+++ b/agents/agentreq.go
@@ -158,7 +158,7 @@ func (ar *AgentRequest) Field(fldPath utils.PathItems) (val utils.NMInterface, e
 	case utils.MetaTmp:
 		val, err = ar.tmp.Field(fldPath[1:])
 	case utils.MetaOpts:
-		val, err = ar.tmp.Field(fldPath[1:])
+		val, err = ar.Opts.Field(fldPath[1:])
 	}
 	return
 }
@@ -263,7 +263,7 @@ func (ar *AgentRequest) Set(fullPath *utils.FullPath, nm utils.NMInterface) (add
 	case utils.MetaTmp:
 		return ar.tmp.Set(fullPath.PathItems[1:], nm)
 	case utils.MetaOpts:
-		return ar.diamreq.Set(&utils.FullPath{
+		return ar.Opts.Set(&utils.FullPath{
 			PathItems: fullPath.PathItems[1:],
 			Path:      fullPath.Path[6:],
 		}, nm)
diff --git a/agents/librad.go b/agents/librad.go
index a3f1a8d4a..41b51bdda 100644
--- a/agents/librad.go
+++ b/agents/librad.go
@@ -127,7 +127,7 @@ func radauthReq(flags utils.FlagsWithParams, req *radigo.Packet, aReq *AgentRequ
 		if len(userPassAvps) == 0 {
 			return false, utils.NewErrMandatoryIeMissing(UserPasswordAVP)
 		}
-		if userPassAvps[0].StringValue != nmItems.([]*config.NMItem)[0].Data {
+		if userPassAvps[0].StringValue != (*nmItems.(*utils.NMSlice))[0].Interface() {
 			return false, nil
 		}
 	case flags.HasKey(utils.MetaCHAP):
@@ -135,7 +135,7 @@ func radauthReq(flags utils.FlagsWithParams, req *radigo.Packet, aReq *AgentRequ
 		if len(chapAVPs) == 0 {
 			return false, utils.NewErrMandatoryIeMissing(CHAPPasswordAVP)
 		}
-		return radigo.AuthenticateCHAP([]byte(utils.IfaceAsString(nmItems.([]*config.NMItem)[0].Data)),
+		return radigo.AuthenticateCHAP([]byte(utils.IfaceAsString((*nmItems.(*utils.NMSlice))[0].Interface())),
 			req.Authenticator[:], chapAVPs[0].RawValue), nil
 	case flags.HasKey(utils.MetaMSCHAPV2):
 		msChallenge := req.AttributesWithName(MSCHAPChallengeAVP, MicrosoftVendor)
@@ -150,7 +150,7 @@ func radauthReq(flags utils.FlagsWithParams, req *radigo.Packet, aReq *AgentRequ
 		vsaMSChallange := msChallenge[0].Value.(*radigo.VSA)
 
 		userName := req.AttributesWithName("User-Name", utils.EmptyString)[0].StringValue
-		passwordFromAttributes := utils.IfaceAsString(nmItems.([]*config.NMItem)[0].Data)
+		passwordFromAttributes := utils.IfaceAsString((*nmItems.(*utils.NMSlice))[0].Interface())
 
 		if len(vsaMSChallange.RawValue) != 16 || len(vsaMSResponde.RawValue) != 50 {
 			return false, nil