X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fscpi%2Fscpi_tcp.c;h=c01cc5606f62a57a627fd5c895a230cb262d294c;hb=2f425a56edbe528ed4566ea6791009dad61ef56d;hp=b598d70d0488c354d056be2ad6c34050ef4dbee7;hpb=5a1afc0907abfee5848484f944789213d6be9752;p=libsigrok.git

diff --git a/src/scpi/scpi_tcp.c b/src/scpi/scpi_tcp.c
index b598d70d..c01cc560 100644
--- a/src/scpi/scpi_tcp.c
+++ b/src/scpi/scpi_tcp.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #ifdef _WIN32
 #define _WIN32_WINNT 0x0501
 #include <winsock2.h>
@@ -65,15 +66,15 @@ static int scpi_tcp_dev_inst_new(void *priv, struct drv_context *drvc,
 	}
 
 	tcp->address = g_strdup(params[1]);
-	tcp->port    = g_strdup(params[2]);
-	tcp->socket  = -1;
+	tcp->port = g_strdup(params[2]);
+	tcp->socket = -1;
 
 	return SR_OK;
 }
 
-static int scpi_tcp_open(void *priv)
+static int scpi_tcp_open(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_tcp *tcp = priv;
+	struct scpi_tcp *tcp = scpi->priv;
 	struct addrinfo hints;
 	struct addrinfo *results, *res;
 	int err;
@@ -86,7 +87,7 @@ static int scpi_tcp_open(void *priv)
 	err = getaddrinfo(tcp->address, tcp->port, &hints, &results);
 
 	if (err) {
-		sr_err("Address lookup failed: %s:%d: %s", tcp->address, tcp->port,
+		sr_err("Address lookup failed: %s:%s: %s", tcp->address, tcp->port,
 			gai_strerror(err));
 		return SR_ERR;
 	}
@@ -107,7 +108,7 @@ static int scpi_tcp_open(void *priv)
 
 	if (tcp->socket < 0) {
 		sr_err("Failed to connect to %s:%s: %s", tcp->address, tcp->port,
-				strerror(errno));
+				g_strerror(errno));
 		return SR_ERR;
 	}
 
@@ -134,15 +135,12 @@ static int scpi_tcp_send(void *priv, const char *command)
 {
 	struct scpi_tcp *tcp = priv;
 	int len, out;
-	char *terminated_command;
 
-	terminated_command = g_strdup_printf("%s\r\n", command);
-	len = strlen(terminated_command);
-	out = send(tcp->socket, terminated_command, len, 0);
-	g_free(terminated_command);
+	len = strlen(command);
+	out = send(tcp->socket, command, len, 0);
 
 	if (out < 0) {
-		sr_err("Send error: %s", strerror(errno));
+		sr_err("Send error: %s", g_strerror(errno));
 		return SR_ERR;
 	}
 
@@ -174,7 +172,7 @@ static int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
 	len = recv(tcp->socket, buf, maxlen, 0);
 
 	if (len < 0) {
-		sr_err("Receive error: %s", strerror(errno));
+		sr_err("Receive error: %s", g_strerror(errno));
 		return SR_ERR;
 	}
 
@@ -185,6 +183,21 @@ static int scpi_tcp_raw_read_data(void *priv, char *buf, int maxlen)
 	return len;
 }
 
+static int scpi_tcp_raw_write_data(void *priv, char *buf, int len)
+{
+	struct scpi_tcp *tcp = priv;
+	int sentlen;
+
+	sentlen = send(tcp->socket, buf, len, 0);
+
+	if (sentlen < 0) {
+		sr_err("Send error: %s.", g_strerror(errno));
+		return SR_ERR;
+	}
+
+	return sentlen;
+}
+
 static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 {
 	struct scpi_tcp *tcp = priv;
@@ -194,7 +207,7 @@ static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 		len = recv(tcp->socket, tcp->length_buf + tcp->length_bytes_read,
 				LENGTH_BYTES - tcp->length_bytes_read, 0);
 		if (len < 0) {
-			sr_err("Receive error: %s", strerror(errno));
+			sr_err("Receive error: %s", g_strerror(errno));
 			return SR_ERR;
 		}
 
@@ -212,7 +225,7 @@ static int scpi_tcp_rigol_read_data(void *priv, char *buf, int maxlen)
 	len = recv(tcp->socket, buf, maxlen, 0);
 
 	if (len < 0) {
-		sr_err("Receive error: %s", strerror(errno));
+		sr_err("Receive error: %s", g_strerror(errno));
 		return SR_ERR;
 	}
 
@@ -229,9 +242,9 @@ static int scpi_tcp_read_complete(void *priv)
 			tcp->response_bytes_read >= tcp->response_length);
 }
 
-static int scpi_tcp_close(void *priv)
+static int scpi_tcp_close(struct sr_scpi_dev_inst *scpi)
 {
-	struct scpi_tcp *tcp = priv;
+	struct scpi_tcp *tcp = scpi->priv;
 
 	if (close(tcp->socket) < 0)
 		return SR_ERR;
@@ -258,6 +271,7 @@ SR_PRIV const struct sr_scpi_dev_inst scpi_tcp_raw_dev = {
 	.send          = scpi_tcp_send,
 	.read_begin    = scpi_tcp_read_begin,
 	.read_data     = scpi_tcp_raw_read_data,
+	.write_data    = scpi_tcp_raw_write_data,
 	.read_complete = scpi_tcp_read_complete,
 	.close         = scpi_tcp_close,
 	.free          = scpi_tcp_free,