Netlib:

- NETLIBHTTPHEADER & NETLIBHTTPREQUEST obsoleted;
- NETLIBHTTPREQUEST divided into MHttpRequest & MHttpResponse;
- MHttpHeaders now manager headers both for MHttpRequest & MHttpResponse;

3 files changed, 11 insertions, 28 deletions

diff --git a/protocols/Steam/src/http_request.h b/protocols/Steam/src/http_request.h
index 4c7b83509d..843ed94cda 100644
--- a/protocols/Steam/src/http_request.h
+++ b/protocols/Steam/src/http_request.h
@@ -5,10 +5,10 @@
 
 class HttpResponse
 {
-	NETLIBHTTPREQUEST *m_response;
+	MHttpResponse *m_response;
 
 public:
-	HttpResponse(NETLIBHTTPREQUEST *response) :
+	HttpResponse(MHttpResponse *response) :
 		m_response(response)
 	{
 	}
@@ -20,12 +20,12 @@ public:
 
 	bool operator!() const
 	{
-		return !m_response || !m_response->pData;
+		return !m_response || m_response->body.IsEmpty();
 	}
 
 	operator bool() const
 	{
-		return m_response && m_response->pData;
+		return m_response && !m_response->body.IsEmpty();
 	}
 
 	bool IsSuccess() const
@@ -37,16 +37,14 @@ public:
 
 	char* data() const
 	{
-		return (m_response) ? m_response->pData : nullptr;
+		return (m_response) ? m_response->body.GetBuffer() : nullptr;
 	}
 
 	unsigned length() const
 	{
-		return (m_response) ? m_response->dataLength : 0;
+		return (m_response) ? m_response->body.GetLength() : 0;
 	}
 
-	LIST<NETLIBHTTPHEADER> Headers() const;
-
 	int GetStatusCode() const
 	{
 		if (m_response)
diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index 234ae44e88..ed7978e890 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -45,7 +45,7 @@ struct HttpRequest : public MTHttpRequest<CSteamProto>
 {

 	HttpRequest(int iRequestType, const char *pszUrl);

 

-	NETLIBHTTPREQUEST* Get();

+	MHttpRequest* Get();

 };

 

 struct ProtoRequest

diff --git a/protocols/Steam/src/steam_request.cpp b/protocols/Steam/src/steam_request.cpp
index b91283198a..918e01ca16 100644
--- a/protocols/Steam/src/steam_request.cpp
+++ b/protocols/Steam/src/steam_request.cpp
@@ -2,7 +2,7 @@
 

 bool CSteamProto::SendRequest(HttpRequest *request)

 {

-	NETLIBHTTPREQUEST *pResp = Netlib_HttpTransaction(m_hNetlibUser, request->Get());

+	auto *pResp = Netlib_HttpTransaction(m_hNetlibUser, request->Get());

 	HttpResponse response(pResp);

 	delete request;

 	return response.IsSuccess();

@@ -10,7 +10,7 @@ bool CSteamProto::SendRequest(HttpRequest *request)
 

 bool CSteamProto::SendRequest(HttpRequest *request, HttpCallback callback, void *param)

 {

-	NETLIBHTTPREQUEST *pResp = Netlib_HttpTransaction(m_hNetlibUser, request->Get());

+	auto *pResp = Netlib_HttpTransaction(m_hNetlibUser, request->Get());

 	HttpResponse response(pResp);

 	if (callback)

 		(this->*callback)(response, param);

@@ -20,7 +20,7 @@ bool CSteamProto::SendRequest(HttpRequest *request, HttpCallback callback, void
 

 bool CSteamProto::SendRequest(HttpRequest *request, JsonCallback callback, void *param)

 {

-	NETLIBHTTPREQUEST *pResp = Netlib_HttpTransaction(m_hNetlibUser, request->Get());

+	auto *pResp = Netlib_HttpTransaction(m_hNetlibUser, request->Get());

 	HttpResponse response(pResp);

 	if (callback) {

 		JSONNode root = JSONNode::parse(response.data());

@@ -42,26 +42,11 @@ HttpRequest::HttpRequest(int iRequestType, const char *szUrl)
 		m_szUrl = szUrl;

 }

 

-NETLIBHTTPREQUEST* HttpRequest::Get()

+MHttpRequest* HttpRequest::Get()

 {

 	if (m_szUrl[0]== '/') {

 		m_szUrl.Insert(0, STEAM_API_URL);

 		AddHeader("User-Agent", STEAM_USER_AGENT);

 	}

-	szUrl = m_szUrl.GetBuffer();

 	return this;

 }

-

-/////////////////////////////////////////////////////////////////////////////////////////

-// HttpResponse

-

-LIST<NETLIBHTTPHEADER> HttpResponse::Headers() const

-{

-	LIST<NETLIBHTTPHEADER> ret(10);

-

-	if (m_response)

-		for (int i = 0; i < m_response->headersCount; i++)

-			ret.insert(&m_response->headers[i]);

-	

-	return ret;

-}