3f79dc3625 — curl

Subject

telnet: make it work through proxy tunnels

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/telnet.c +28 -27

lib/telnet.c+28 -27

@@ -225,16 +225,16 @@ static CURLcode init_telnet(struct Curl_easy *data)
	static void send_negotiation(struct Curl_easy *data, int cmd, int option)
	{
	unsigned char buf[3];
-	ssize_t bytes_written;
-	struct connectdata *conn = data->conn;
+	size_t nwritten;
+	CURLcode result;

	buf[0] = CURL_IAC;
	buf[1] = (unsigned char)cmd;
	buf[2] = (unsigned char)option;

-	bytes_written = swrite(conn->sock[FIRSTSOCKET], buf, 3);
-	if(bytes_written < 0)
-	failf(data, "Sending data failed (%d)", SOCKERRNO);
+	result = Curl_xfer_send(data, buf, 3, FALSE, &nwritten);
+	if(result)
+	failf(data, "Sending data failed: %s", curl_easy_strerror(result));

	printoption(data, "SENT", cmd, option);
	}
@@ -671,10 +671,10 @@ static CURLcode send_telnet_data(struct Curl_easy *data,
	static void sendsuboption(struct Curl_easy *data,
	struct TELNET *tn, int option)
	{
-	ssize_t bytes_written;
+	size_t nwritten;
	unsigned short x, y;
	const unsigned char uc1, uc2;
-	struct connectdata *conn = data->conn;
+	CURLcode result;

	switch(option) {
	case CURL_TELOPT_NAWS:
@@ -703,16 +703,16 @@ static void sendsuboption(struct Curl_easy *data,
	CURL_SB_LEN(tn) - 2);

	/* we send the header of the suboption... */
-	bytes_written = swrite(conn->sock[FIRSTSOCKET], tn->subbuffer, 3);
-	if(bytes_written < 0)
-	failf(data, "Sending data failed (%d)", SOCKERRNO);
+	result = Curl_xfer_send(data, tn->subbuffer, 3, FALSE, &nwritten);
+	if(result)
+	failf(data, "Sending data failed: %s", curl_easy_strerror(result));
	/* ... then the window size with the send_telnet_data() function
	to deal with 0xFF cases ... */
	send_telnet_data(data, tn, (const char *)tn->subbuffer + 3, 4);
	/* ... and the footer */
-	bytes_written = swrite(conn->sock[FIRSTSOCKET], tn->subbuffer + 7, 2);
-	if(bytes_written < 0)
-	failf(data, "Sending data failed (%d)", SOCKERRNO);
+	result = Curl_xfer_send(data, tn->subbuffer + 7, 2, FALSE, &nwritten);
+	if(result)
+	failf(data, "Sending data failed: %s", curl_easy_strerror(result));
	break;
	}
	}
@@ -972,9 +972,9 @@ static CURLcode suboption(struct Curl_easy data, struct TELNET tn)
	{
	struct curl_slist *v;
	unsigned char temp[2048];
-	ssize_t bytes_written;
+	size_t nwritten;
	size_t len;
-	struct connectdata *conn = data->conn;
+	CURLcode result = CURLE_OK;

	if(!CURL_SB_LEN(tn)) /* ignore empty suboption */
	return CURLE_OK;
@@ -993,11 +993,10 @@ static CURLcode suboption(struct Curl_easy data, struct TELNET tn)
	CURL_IAC, CURL_SB, CURL_TELOPT_TTYPE,
	CURL_TELQUAL_IS, tn->subopt_ttype, CURL_IAC,
	CURL_SE);
-	bytes_written = swrite(conn->sock[FIRSTSOCKET], temp, len);
-
-	if(bytes_written < 0) {
-	failf(data, "Sending data failed (%d)", SOCKERRNO);
-	return CURLE_SEND_ERROR;
+	result = Curl_xfer_send(data, temp, len, FALSE, &nwritten);
+	if(result) {
+	failf(data, "Sending data failed: %s", curl_easy_strerror(result));
+	return result;
	}
	printsub(data, '>', &temp[2], len-2);
	break;
@@ -1012,10 +1011,10 @@ static CURLcode suboption(struct Curl_easy data, struct TELNET tn)
	CURL_IAC, CURL_SB, CURL_TELOPT_XDISPLOC,
	CURL_TELQUAL_IS, tn->subopt_xdisploc, CURL_IAC,
	CURL_SE);
-	bytes_written = swrite(conn->sock[FIRSTSOCKET], temp, len);
-	if(bytes_written < 0) {
-	failf(data, "Sending data failed (%d)", SOCKERRNO);
-	return CURLE_SEND_ERROR;
+	result = Curl_xfer_send(data, temp, len, FALSE, &nwritten);
+	if(result) {
+	failf(data, "Sending data failed: %s", curl_easy_strerror(result));
+	return result;
	}
	printsub(data, '>', &temp[2], len - 2);
	break;
@@ -1044,9 +1043,11 @@ static CURLcode suboption(struct Curl_easy data, struct TELNET tn)
	curl_msnprintf((char *)&temp[len], sizeof(temp) - len,
	"%c%c", CURL_IAC, CURL_SE);
	len += 2;
-	bytes_written = swrite(conn->sock[FIRSTSOCKET], temp, len);
-	if(bytes_written < 0)
-	failf(data, "Sending data failed (%d)", SOCKERRNO);
+	result = Curl_xfer_send(data, temp, len, FALSE, &nwritten);
+	if(result) {
+	failf(data, "Sending data failed: %s", curl_easy_strerror(result));
+	return result;
+	}
	printsub(data, '>', &temp[2], len - 2);
	break;
	}