X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Fjtag_vpi.c;h=7c42220d62ef4c9e357db54a7bd0faad23d28d4e;hb=3039f01aaf63cd2c4d2c1f15dbba99ede6f49392;hp=d962ecfc7bf770aa1c1d2fc65722ec14f450b854;hpb=1211b8ea481b9185b04563a741ac0c41da274bc9;p=openocd.git

diff --git a/src/jtag/drivers/jtag_vpi.c b/src/jtag/drivers/jtag_vpi.c
index d962ecfc7b..7c42220d62 100644
--- a/src/jtag/drivers/jtag_vpi.c
+++ b/src/jtag/drivers/jtag_vpi.c
@@ -23,7 +23,9 @@
 #endif
 
 #include <jtag/interface.h>
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
+#endif
 
 #define NO_TAP_SHIFT	0
 #define TAP_SHIFT	1
@@ -40,6 +42,7 @@
 #define CMD_STOP_SIMU		4
 
 int server_port = SERVER_PORT;
+char *server_address;
 
 int sockfd;
 struct sockaddr_in serv_addr;
@@ -54,7 +57,7 @@ struct vpi_cmd {
 
 static int jtag_vpi_send_cmd(struct vpi_cmd *vpi)
 {
-	int retval = write(sockfd, vpi, sizeof(struct vpi_cmd));
+	int retval = write_socket(sockfd, vpi, sizeof(struct vpi_cmd));
 	if (retval <= 0)
 		return ERROR_FAIL;
 
@@ -63,7 +66,7 @@ static int jtag_vpi_send_cmd(struct vpi_cmd *vpi)
 
 static int jtag_vpi_receive_cmd(struct vpi_cmd *vpi)
 {
-	int retval = read(sockfd, vpi, sizeof(struct vpi_cmd));
+	int retval = read_socket(sockfd, vpi, sizeof(struct vpi_cmd));
 	if (retval < (int)sizeof(struct vpi_cmd))
 		return ERROR_FAIL;
 
@@ -377,24 +380,30 @@ static int jtag_vpi_init(void)
 	serv_addr.sin_family = AF_INET;
 	serv_addr.sin_port = htons(server_port);
 
-	if (inet_pton(AF_INET, SERVER_ADDRESS, &serv_addr.sin_addr) <= 0) {
-		LOG_ERROR("inet_pton error occured");
+	if (!server_address)
+		server_address = strdup(SERVER_ADDRESS);
+
+	serv_addr.sin_addr.s_addr = inet_addr(server_address);
+
+	if (serv_addr.sin_addr.s_addr == INADDR_NONE) {
+		LOG_ERROR("inet_addr error occured");
 		return ERROR_FAIL;
 	}
 
 	if (connect(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) {
 		close(sockfd);
-		LOG_ERROR("Can't connect to %s : %u", SERVER_ADDRESS, server_port);
+		LOG_ERROR("Can't connect to %s : %u", server_address, server_port);
 		return ERROR_COMMAND_CLOSE_CONNECTION;
 	}
 
-	LOG_INFO("Connection to %s : %u succeed", SERVER_ADDRESS, server_port);
+	LOG_INFO("Connection to %s : %u succeed", server_address, server_port);
 
 	return ERROR_OK;
 }
 
 static int jtag_vpi_quit(void)
 {
+	free(server_address);
 	return close(sockfd);
 }
 
@@ -410,6 +419,20 @@ COMMAND_HANDLER(jtag_vpi_set_port)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(jtag_vpi_set_address)
+{
+	free(server_address);
+
+	if (CMD_ARGC == 0) {
+		LOG_WARNING("You need to set an address");
+		server_address = strdup(SERVER_ADDRESS);
+	} else
+		server_address = strdup(CMD_ARGV[0]);
+
+	LOG_INFO("Set server address to %s", server_address);
+
+	return ERROR_OK;
+}
 
 static const struct command_registration jtag_vpi_command_handlers[] = {
 	{
@@ -419,6 +442,13 @@ static const struct command_registration jtag_vpi_command_handlers[] = {
 		.help = "set the port of the VPI server",
 		.usage = "description_string",
 	},
+	{
+		.name = "jtag_vpi_set_address",
+		.handler = &jtag_vpi_set_address,
+		.mode = COMMAND_CONFIG,
+		.help = "set the address of the VPI server",
+		.usage = "description_string",
+	},
 	COMMAND_REGISTRATION_DONE
 };