https://telecominfraproject.atlassian.net/browse/WIFI-7831

Signed-off-by: stephb9959 <[email protected]>
Telecominfraproject · Oct 16, 2023 · a0d4606 · a0d4606
1 parent a5200e4
commit a0d4606
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/RADIUS_proxy_server.cpp b/src/RADIUS_proxy_server.cpp
@@ -79,13 +79,14 @@ namespace OpenWifi {
 		RADIUS_Destinations_.clear();
 	}
 
-	void RADIUS_proxy_server::RouteAndSendAccountingPacket(const std::string &Destination, const std::string &serialNumber, RADIUS::RadiusPacket &P, bool RecomputeAuthenticator, std::string & secret) {
+	void RADIUS_proxy_server::RouteAndSendAccountingPacket(const std::string &Destination,const std::string &serialNumber, RADIUS::RadiusPacket &P, bool RecomputeAuthenticator, std::string & secret) {
 		try{
 
 			//	are we sending this to a pool?
 			auto CallingStationID = P.ExtractCallingStationID();
 			auto CalledStationID = P.ExtractCalledStationID();
-			std::uint32_t DtsIp = Utils::IPtoInt(Destination);
+			auto DstParts = Utils::Split(Destination, ':');
+			std::uint32_t DtsIp = Utils::IPtoInt(DstParts[0]);
 
 			std::cout << "ACCT-DTS: " << DtsIp << std::endl;
 
@@ -122,18 +123,14 @@ namespace OpenWifi {
 		ofs.close();
 	}
 
-	void RADIUS_proxy_server::SendAccountingData(const std::string &serialNumber,
+	void RADIUS_proxy_server::SendAccountingData(const std::string &Destination, const std::string &serialNumber,
 												 const char *buffer, std::size_t size, std::string & secret) {
 
 		if (!Continue())
 			return;
 
 		try {
 			RADIUS::RadiusPacket P((unsigned char *)buffer, size);
-			auto Destination = P.ExtractProxyStateDestination();
-
-			std::cout << "ACCT-DTS-0: " << Destination << std::endl;
-
 			RouteAndSendAccountingPacket(Destination, serialNumber, P, false, secret);
 			RADIUSSessionTracker()->AddAccountingSession(Destination, serialNumber, P, secret);
 

diff --git a/src/RADIUS_proxy_server.h b/src/RADIUS_proxy_server.h
@@ -28,7 +28,7 @@ namespace OpenWifi {
 		void Stop() final;
 		inline bool Enabled() const { return Enabled_; }
 
-		void SendAccountingData(const std::string &serialNumber, const char *buffer,
+		void SendAccountingData(const std::string &Destination,const std::string &serialNumber, const char *buffer,
 								std::size_t size, std::string & secret);
 		void SendAuthenticationData(const std::string &serialNumber, const char *buffer,
 									std::size_t size, std::string & secret);