cpp/openttd-patchpack/source Changeset - r25687:bb09d6722f4e

Changeset - r25687:bb09d6722f4e

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium42 - 3 years ago 2021-06-13 19:47:32
rubidium@openttd.org

Codechange: [Network] Simplify constructing the HTTP request with fmt

2 files changed with 8 insertions and 11 deletions:

src/network/core/tcp_http.cpp

src/network/core/tcp_http.h

0 comments (0 inline, 0 general)

src/network/core/tcp_http.cpp

➞

Show inline comments

@@ @@ -32,7 +32,7 @@ static std::vector<NetworkHTTPSocketHand @@
  * @param depth    the depth (redirect recursion) of the queries
  */
 NetworkHTTPSocketHandler::NetworkHTTPSocketHandler(SOCKET s,
-		HTTPCallback *callback, const char *host, const char *url,
+		HTTPCallback *callback, const std::string &host, const char *url,
 		const char *data, int depth) :
 	NetworkSocketHandler(),
 	recv_pos(0),
@@ @@ -42,19 +42,16 @@ NetworkHTTPSocketHandler::NetworkHTTPSoc @@
 	redirect_depth(depth),
 	sock(s)
+{
 	size_t bufferSize = strlen(url) + strlen(host) + strlen(GetNetworkRevisionString()) + (data == nullptr ? 0 : strlen(data)) + 128;
 	char *buffer = AllocaM(char, bufferSize);
 	Debug(net, 5, "[tcp/http] Requesting {}{}", host, url);
 	std::string request;
 	if (data != nullptr) {
-		seprintf(buffer, buffer + bufferSize - 1, "POST %s HTTP/1.0\r\nHost: %s\r\nUser-Agent: OpenTTD/%s\r\nContent-Type: text/plain\r\nContent-Length: %d\r\n\r\n%s\r\n", url, host, GetNetworkRevisionString(), (int)strlen(data), data);
+		request = fmt::format("POST {} HTTP/1.0\r\nHost: {}\r\nUser-Agent: OpenTTD/{}\r\nContent-Type: text/plain\r\nContent-Length: {}\r\n\r\n{}\r\n", url, host, GetNetworkRevisionString(), strlen(data), data);
 	} else {
-		seprintf(buffer, buffer + bufferSize - 1, "GET %s HTTP/1.0\r\nHost: %s\r\nUser-Agent: OpenTTD/%s\r\n\r\n", url, host, GetNetworkRevisionString());
+		request = fmt::format("GET {} HTTP/1.0\r\nHost: {}\r\nUser-Agent: OpenTTD/{}\r\n\r\n", url, host, GetNetworkRevisionString());
+	}
 	ssize_t size = strlen(buffer);
 	ssize_t res = send(this->sock, (const char*)buffer, size, 0);
 	if (res != size) {
 	ssize_t res = send(this->sock, request.data(), (int)request.size(), 0);
 	if (res != (ssize_t)request.size()) {
 		/* Sending all data failed. Socket can't handle this little bit
 		 * of information? Just fall back to the old system! */
 		this->callback->OnFailure();

src/network/core/tcp_http.h

➞

Show inline comments

@@ @@ -61,7 +61,7 @@ public: @@
 	void CloseSocket();
 	NetworkHTTPSocketHandler(SOCKET sock, HTTPCallback *callback,
-			const char *host, const char *url, const char *data, int depth);
+			const std::string &host, const char *url, const char *data, int depth);
 	~NetworkHTTPSocketHandler();
@@ @@ -112,7 +112,7 @@ public: @@
 	void OnConnect(SOCKET s) override
+	{
-		new NetworkHTTPSocketHandler(s, this->callback, this->hostname.c_str(), this->url, this->data, this->depth);
 		new NetworkHTTPSocketHandler(s, this->callback, this->hostname, this->url, this->data, this->depth);
 		/* We've relinquished control of data now. */
 		this->data = nullptr;
+	}

0 comments (0 inline, 0 general)