From ee0123fae5d579af2b31f52a9d61150d0d77642b Mon Sep 17 00:00:00 2001
From: stephb9959 <stephane.bourque@gmail.com>
Date: Wed, 14 Dec 2022 11:47:13 -0800
Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-11974

Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
---
 build                           |  2 +-
 src/framework/ALBserver.cpp     |  8 +++++++-
 src/framework/RESTAPI_Handler.h | 12 ++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/build b/build
index 8e2afd3..25bf17f 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-17
\ No newline at end of file
+18
\ No newline at end of file
diff --git a/src/framework/ALBserver.cpp b/src/framework/ALBserver.cpp
index 4f3e1b1..5e2bf47 100644
--- a/src/framework/ALBserver.cpp
+++ b/src/framework/ALBserver.cpp
@@ -51,7 +51,13 @@ namespace OpenWifi {
             poco_information(Logger(),"Starting...");
 			Running_=true;
 			Port_ = (int)MicroServiceConfigGetInt("alb.port",15015);
-			Socket_ = std::make_unique<Poco::Net::ServerSocket>(Port_);
+			Poco::Net::IPAddress Addr(Poco::Net::IPAddress::wildcard(
+				Poco::Net::Socket::supportsIPv6() ? Poco::Net::AddressFamily::IPv6
+												  : Poco::Net::AddressFamily::IPv4));
+			Poco::Net::SocketAddress SockAddr(Addr, Port_);
+			Poco::Net::ServerSocket ClientSocket(SockAddr, 64);
+
+			Socket_ = std::make_unique<Poco::Net::ServerSocket>(SockAddr, Port_);
 			auto Params = new Poco::Net::HTTPServerParams;
 			Params->setName("ws:alb");
 			Server_ = std::make_unique<Poco::Net::HTTPServer>(new ALBRequestHandlerFactory(Logger()), *Socket_, Params);
diff --git a/src/framework/RESTAPI_Handler.h b/src/framework/RESTAPI_Handler.h
index 1d74b80..017a31c 100644
--- a/src/framework/RESTAPI_Handler.h
+++ b/src/framework/RESTAPI_Handler.h
@@ -633,6 +633,18 @@ namespace OpenWifi {
 			ReturnObject(Answer);
 		}
 
+		template<typename T> void Object(const char *Name, const std::vector<T> & Objects) {
+			Poco::JSON::Object  Answer;
+			RESTAPI_utils::field_to_json(Answer,Name,Objects);
+			ReturnObject(Answer);
+		}
+
+		template <typename T> void Object(const T &O) {
+			Poco::JSON::Object  Answer;
+			O.to_json(Answer);
+			ReturnObject(Answer);
+		}
+
 		Poco::Logger & Logger() { return Logger_; }
 
 		virtual void DoGet() = 0 ;