fix compile errors for adapting maat

1 files changed, 31 insertions, 26 deletions

diff --git a/platform/src/proxy.cpp b/platform/src/proxy.cpp
index bcbc47b..07b6bd4 100644
--- a/platform/src/proxy.cpp
+++ b/platform/src/proxy.cpp
@@ -45,9 +45,9 @@
 #include <platform.h>
 #include <proxy.h>
 #include <tcp_stream.h>
-#include <acceptor_kni_v1.h>
-#include <acceptor_kni_v2.h>
-#include <acceptor_kni_v3.h>
+//#include <acceptor_kni_v1.h>
+//#include <acceptor_kni_v2.h>
+//#include <acceptor_kni_v3.h>
 #include <acceptor_kni_v4.h>
 #include <watchdog_kni.h>
 #include <watchdog_tfe.h>
@@ -549,41 +549,46 @@ int tfe_stat_init(struct tfe_proxy * proxy, const char * profile)
 	return 0;
 }
 
-void tfe_proxy_acceptor_init(struct tfe_proxy * proxy, const char * profile)
+void tfe_proxy_acceptor_init(struct tfe_proxy *proxy, const char *profile)
 {
-    MESA_load_profile_uint_def(profile, "system", "enable_kni_v1", &proxy->en_kni_v1_acceptor, 0);
-    MESA_load_profile_uint_def(profile, "system", "enable_kni_v2", &proxy->en_kni_v2_acceptor, 0);
+#if 0
+	MESA_load_profile_uint_def(profile, "system", "enable_kni_v1", &proxy->en_kni_v1_acceptor, 0);
+	MESA_load_profile_uint_def(profile, "system", "enable_kni_v2", &proxy->en_kni_v2_acceptor, 0);
 	MESA_load_profile_uint_def(profile, "system", "enable_kni_v3", &proxy->en_kni_v3_acceptor, 0);
 	MESA_load_profile_uint_def(profile, "system", "enable_kni_v4", &proxy->en_kni_v4_acceptor, 0);
 
 	int ret = proxy->en_kni_v1_acceptor + proxy->en_kni_v2_acceptor + proxy->en_kni_v3_acceptor + proxy->en_kni_v4_acceptor;
 	CHECK_OR_EXIT((ret == 1), "Invalid KNI acceptor. Exit.");
 
-    if (proxy->en_kni_v1_acceptor)
-    {
-        g_default_proxy->kni_v1_acceptor = acceptor_kni_v1_create(proxy, profile, proxy->logger);
-        CHECK_OR_EXIT(g_default_proxy->kni_v1_acceptor, "Failed at init KNIv1 acceptor. Exit. ");
-    }
+	if (proxy->en_kni_v1_acceptor)
+	{
+		g_default_proxy->kni_v1_acceptor = acceptor_kni_v1_create(proxy, profile, proxy->logger);
+		CHECK_OR_EXIT(g_default_proxy->kni_v1_acceptor, "Failed at init KNIv1 acceptor. Exit. ");
+	}
 
-    if (proxy->en_kni_v2_acceptor)
-    {
-        g_default_proxy->kni_v2_acceptor = acceptor_kni_v2_create(g_default_proxy, profile, g_default_logger);
-        CHECK_OR_EXIT(g_default_proxy->kni_v2_acceptor, "Failed at init KNIv2 acceptor. Exit. ");
-    }
+	if (proxy->en_kni_v2_acceptor)
+	{
+		g_default_proxy->kni_v2_acceptor = acceptor_kni_v2_create(g_default_proxy, profile, g_default_logger);
+		CHECK_OR_EXIT(g_default_proxy->kni_v2_acceptor, "Failed at init KNIv2 acceptor. Exit. ");
+	}
 
 	if (proxy->en_kni_v3_acceptor)
-    {
-        g_default_proxy->kni_v3_acceptor = acceptor_kni_v3_create(g_default_proxy, profile, g_default_logger);
-        CHECK_OR_EXIT(g_default_proxy->kni_v3_acceptor, "Failed at init KNIv3 acceptor. Exit. ");
-    }
+	{
+		g_default_proxy->kni_v3_acceptor = acceptor_kni_v3_create(g_default_proxy, profile, g_default_logger);
+		CHECK_OR_EXIT(g_default_proxy->kni_v3_acceptor, "Failed at init KNIv3 acceptor. Exit. ");
+	}
 
 	if (proxy->en_kni_v4_acceptor)
-    {
-        g_default_proxy->kni_v4_acceptor = acceptor_kni_v4_create(g_default_proxy, profile);
-        CHECK_OR_EXIT(g_default_proxy->kni_v4_acceptor, "Failed at init KNIv4 acceptor. Exit. ");
-    }
+	{
+		g_default_proxy->kni_v4_acceptor = acceptor_kni_v4_create(g_default_proxy, profile);
+		CHECK_OR_EXIT(g_default_proxy->kni_v4_acceptor, "Failed at init KNIv4 acceptor. Exit. ");
+	}
+#endif
 
-    return;
+	g_default_proxy->kni_v4_acceptor = acceptor_kni_v4_create(g_default_proxy, profile);
+	CHECK_OR_EXIT(g_default_proxy->kni_v4_acceptor, "Failed at init KNIv4 acceptor. Exit. ");
+
+	return;
 }
 
 static void usage(char *cmd)
@@ -732,7 +737,7 @@ int main(int argc, char * argv[])
 	g_default_proxy->tcp_ply_enforcer = tcp_policy_enforcer_create(g_default_logger);
 	CHECK_OR_EXIT(g_default_proxy->tcp_ply_enforcer != NULL, "Failed at creating tcp policy enforcer. Exit.");
 
-	g_default_proxy->ssl_ply_enforcer = ssl_policy_enforcer_create(g_default_logger);
+	g_default_proxy->ssl_ply_enforcer = ssl_policy_enforcer_create();
 	CHECK_OR_EXIT(g_default_proxy->ssl_ply_enforcer != NULL, "Failed at creating ssl policy enforcer. Exit.");
 
 	g_default_proxy->chain_ply_enforcer = chaining_policy_enforcer_create(g_default_logger);