net-test: packetdrill: rename WIRE_IP_ADDR to WIRE_LIVE_LOCAL_IP

In preparation for having the client send the live_remote_ip_string to
the wire server, rename WIRE_IP_ADDR to WIRE_LIVE_LOCAL_IP to avoid
confusion.

Signed-off-by: Neal Cardwell <[email protected]>
Change-Id: I6a981cf13138fc597c88f8f621929a8b2436f328

Author: nealcardwell

gtests/net/packetdrill/wire_client.c

@@ -139,16 +139,16 @@ static void wire_client_send_hw_address(struct wire_client *wire_client,
 				"error sending WIRE_HARDWARE_ADDR");
 }
 
-/* Send the IP address to which the server should send packets. */
-static void wire_client_send_ip_address(struct wire_client *wire_client,
-					const struct config *config)
+/* Send the IP live_local address to which the server should send packets. */
+static void wire_client_send_live_local_ip(struct wire_client *wire_client,
+					   const struct config *config)
 {
 	if (wire_conn_write(wire_client->wire_conn,
-			    WIRE_IP_ADDR,
+			    WIRE_LIVE_LOCAL_IP,
 			    config->live_local_ip_string,
 			    strlen(config->live_local_ip_string)))
 		wire_client_die(wire_client,
-				"error sending WIRE_IP_ADDR");
+				"error sending WIRE_LIVE_LOCAL_IP");
 }
 
 /* Receive server's message that the server is ready to execute the script. */
@@ -277,7 +277,7 @@ int wire_client_init(struct wire_client *wire_client,
 
 	wire_client_send_hw_address(wire_client, config);
 
-	wire_client_send_ip_address(wire_client, config);
+	wire_client_send_live_local_ip(wire_client, config);
 
 	wire_client_receive_server_ready(wire_client);
 

gtests/net/packetdrill/wire_protocol.c

@@ -36,7 +36,7 @@ const char *wire_op_to_string(enum wire_op_t op)
 	case WIRE_SCRIPT_PATH:		return "WIRE_SCRIPT_PATH";
 	case WIRE_SCRIPT:		return "WIRE_SCRIPT";
 	case WIRE_HARDWARE_ADDR:	return "WIRE_HARDWARE_ADDR";
-	case WIRE_IP_ADDR:		return "WIRE_IP_ADDR";
+	case WIRE_LIVE_LOCAL_IP:	return "WIRE_LIVE_LOCAL_IP";
 	case WIRE_SERVER_READY:		return "WIRE_SERVER_READY";
 	case WIRE_CLIENT_STARTING:	return "WIRE_CLIENT_STARTING";
 	case WIRE_PACKETS_START:	return "WIRE_PACKETS_START";

gtests/net/packetdrill/wire_protocol.h

@@ -34,7 +34,7 @@ enum wire_op_t {
 	WIRE_SCRIPT_PATH,	/* "here's the path of the script" */
 	WIRE_SCRIPT,		/* "here's the script we're going to start" */
 	WIRE_HARDWARE_ADDR,	/* "here's my ethernet MAC address" */
-	WIRE_IP_ADDR,		/* "here's the client live_local_ip_string */
+	WIRE_LIVE_LOCAL_IP,	/* "here's the client live_local_ip_string */
 	WIRE_SERVER_READY,	/* "server ready to start script execution" */
 	WIRE_CLIENT_STARTING,	/* "i'm starting script execution... now!" */
 	WIRE_PACKETS_START,	/* "please start handling packet events" */

gtests/net/packetdrill/wire_server.c

@@ -207,8 +207,8 @@ static int wire_server_receive_hw_address(struct wire_server *wire_server)
 	return STATUS_OK;
 }
 
-/* Receive the IP address to which the server should send packets. */
-static int wire_server_receive_ip_address(struct wire_server *wire_server)
+/* Receive the live_local IP address to which the server should send packets. */
+static int wire_server_receive_live_local_ip(struct wire_server *wire_server)
 {
 	enum wire_op_t op = WIRE_INVALID;
 	void *buf = NULL;
@@ -217,9 +217,9 @@ static int wire_server_receive_ip_address(struct wire_server *wire_server)
 
 	if (wire_conn_read(wire_server->wire_conn, &op, &buf, &buf_len))
 		return STATUS_ERR;
-	if (op != WIRE_IP_ADDR) {
+	if (op != WIRE_LIVE_LOCAL_IP) {
 		fprintf(stderr,
-			"bad wire client: expected WIRE_IP_ADDR\n");
+			"bad wire client: expected WIRE_LIVE_LOCAL_IP\n");
 		return STATUS_ERR;
 	}
 	if (buf_len + 1 > sizeof(config->live_local_ip_string)) {
@@ -230,7 +230,8 @@ static int wire_server_receive_ip_address(struct wire_server *wire_server)
 
 	memcpy(config->live_local_ip_string, buf, buf_len);
 	config->live_local_ip_string[buf_len] = '\0';  /* NULL-terminate str */
-	DEBUGP("got WIRE_IP_ADDR: [%s]\n", config->live_local_ip_string);
+	DEBUGP("got WIRE_LIVE_LOCAL_IP: [%s]\n",
+	       config->live_local_ip_string);
 
 	return STATUS_OK;
 }
@@ -484,7 +485,7 @@ static void *wire_server_thread(void *arg)
 	if (wire_server_receive_hw_address(wire_server))
 		goto error_done;
 
-	if (wire_server_receive_ip_address(wire_server))
+	if (wire_server_receive_live_local_ip(wire_server))
 		goto error_done;
 
 	if (parse_script_and_set_config(wire_server->argc,