The path to the application directory is passed to the initialization function

awwit · awwit · commit 871d06362df4 · 2017-04-12T22:18:13.000+03:00
diff --git a/src/Init.cpp b/src/Init.cpp
@@ -211,7 +211,7 @@ bool initServerObjects(HttpClient::Request *procRequest, HttpClient::Response *p
 	return success;
 }
 
-void cleanProtocolData(HttpClient::Response *response)
+void freeProtocolData(HttpClient::Response *response)
 {
 	if (response)
 	{
diff --git a/src/Init.h b/src/Init.h
@@ -11,6 +11,6 @@ void destroySocketAdapter(Socket::Adapter *adapter);
 std::string getClearPath(const std::string &path);
 
 bool initServerObjects(HttpClient::Request *procRequest, HttpClient::Response *procResponse, const Transfer::app_request *request, Socket::Adapter *socket_adapter);
-void cleanProtocolData(HttpClient::Response *response);
+void freeProtocolData(HttpClient::Response *response);
 
 bool isSwitchingProtocols(const HttpClient::Request &request, HttpClient::Response &response);
diff --git a/src/Main.cpp b/src/Main.cpp
@@ -6,12 +6,12 @@
 
 #include "utils/Utils.h"
 
-DLLEXPORT bool application_init()
+EXPORT bool application_init(const char *root)
 {
 	return true;
 }
 
-DLLEXPORT int application_call(Transfer::app_request *request, Transfer::app_response *response)
+EXPORT int application_call(Transfer::app_request *request, Transfer::app_response *response)
 {
 	// Allocate memory on the stack
 	uint8_t addr[sizeof(Socket::AdapterTls)];
@@ -61,20 +61,20 @@ DLLEXPORT int application_call(Transfer::app_request *request, Transfer::app_res
 		Utils::packContainer(reinterpret_cast<uint8_t *>(response->response_data), proc_response.headers);
 	}
 
-	cleanProtocolData(&proc_response);
+	freeProtocolData(&proc_response);
 
 	return result;
 }
 
-DLLEXPORT void application_clear(void *response_data, size_t response_size)
+EXPORT void application_clear(void *response_data, size_t response_size)
 {
 	if (response_data && response_size)
 	{
 		delete[] reinterpret_cast<uint8_t *>(response_data);
 	}
 }
 
-DLLEXPORT void application_final()
+EXPORT void application_final(const char *root)
 {
 	
 }
diff --git a/src/Main.h b/src/Main.h
@@ -1,7 +1,7 @@
 ﻿#pragma once
 
 #ifdef WIN32
-	#define DLLEXPORT extern "C" __declspec(dllexport)
+	#define EXPORT extern "C" __declspec(dllexport)
 #else
-	#define DLLEXPORT extern "C"
+	#define EXPORT extern "C"
 #endif

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ bool initServerObjects(HttpClient::Request procRequest, HttpClient::Response p`
`211`	`211`	`return success;`
`212`	`212`	`}`
`213`	`213`
`214`		`-void cleanProtocolData(HttpClient::Response *response)`
	`214`	`+void freeProtocolData(HttpClient::Response *response)`
`215`	`215`	`{`
`216`	`216`	`if (response)`
`217`	`217`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`
`7`	`7`	`#include "utils/Utils.h"`
`8`	`8`
`9`		`-DLLEXPORT bool application_init()`
	`9`	`+EXPORT bool application_init(const char *root)`
`10`	`10`	`{`
`11`	`11`	`return true;`
`12`	`12`	`}`
`13`	`13`
`14`		`-DLLEXPORT int application_call(Transfer::app_request request, Transfer::app_response response)`
	`14`	`+EXPORT int application_call(Transfer::app_request request, Transfer::app_response response)`
`15`	`15`	`{`
`16`	`16`	`// Allocate memory on the stack`
`17`	`17`	`uint8_t addr[sizeof(Socket::AdapterTls)];`
`@@ -61,20 +61,20 @@ DLLEXPORT int application_call(Transfer::app_request *request, Transfer::app_res`
`61`	`61`	`Utils::packContainer(reinterpret_cast<uint8_t *>(response->response_data), proc_response.headers);`
`62`	`62`	`}`
`63`	`63`
`64`		`- cleanProtocolData(&proc_response);`
	`64`	`+ freeProtocolData(&proc_response);`
`65`	`65`
`66`	`66`	`return result;`
`67`	`67`	`}`
`68`	`68`
`69`		`-DLLEXPORT void application_clear(void *response_data, size_t response_size)`
	`69`	`+EXPORT void application_clear(void *response_data, size_t response_size)`
`70`	`70`	`{`
`71`	`71`	`if (response_data && response_size)`
`72`	`72`	`{`
`73`	`73`	`delete[] reinterpret_cast<uint8_t *>(response_data);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`-DLLEXPORT void application_final()`
	`77`	`+EXPORT void application_final(const char *root)`
`78`	`78`	`{`
`79`	`79`
`80`	`80`	`}`