Fix dying without a message on failed verbose_system calls, improve i…

…mplementation
nplab · Jun 2, 2022 · 2f6914c · 2f6914c
1 parent 675d786
commit 2f6914c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/gtests/net/packetdrill/netdev.c b/gtests/net/packetdrill/netdev.c
@@ -159,7 +159,7 @@ static void create_device(struct config *config, struct local_netdev *netdev)
 	if (config->mtu != TUN_DRIVER_DEFAULT_MTU) {
 		asprintf(&command, "ifconfig %s mtu %d", netdev->name, config->mtu);
 		if (verbose_system(command) != STATUS_OK)
-			die("");
+			die("Error executing %s\n", command);
 		free(command);
 	}
 }
@@ -192,7 +192,7 @@ static void create_device(struct config *config, struct local_netdev *netdev)
 #if defined(__FreeBSD__)
 	if ((tun_fd < 0) && (errno == ENOENT)) {
 		if (verbose_system("kldload -q if_tun") != STATUS_OK) {
-			die_perror("");
+			die_perror("kldload -q if_tun");
 		}
 		tun_fd = open(tun_path, O_RDWR);
 	}
@@ -268,7 +268,7 @@ static void create_device(struct config *config, struct local_netdev *netdev)
 		asprintf(&command, "ethtool -s %s speed %u autoneg off",
 			 netdev->name, config->speed);
 		if (verbose_system(command) != STATUS_OK)
-			die("");
+            die("Error executing %s\n", command);
 		free(command);
 
 		/* Need to bring interface down and up so the interface speed
@@ -277,7 +277,7 @@ static void create_device(struct config *config, struct local_netdev *netdev)
 		asprintf(&command, "ifconfig %s down; sleep 1; ifconfig %s up; "
 			      "sleep 1", netdev->name, netdev->name);
 		if(verbose_system(command) != STATUS_OK)
-			die("");
+			die("Error executing %s\n", command);
 		free(command);
 	}
 
@@ -286,7 +286,7 @@ static void create_device(struct config *config, struct local_netdev *netdev)
 		asprintf(&command, "ifconfig %s mtu %d",
 			 netdev->name, config->mtu);
 		if(verbose_system(command) != STATUS_OK)
-			die("");
+            die("Error executing route command '%s'\n", command);
 		free(command);
 	}
 #endif
@@ -369,7 +369,8 @@ static void route_traffic_to_device(struct config *config,
 		assert(!"bad wire protocol");
 	}
 #endif /* defined(linux) */
-	verbose_system(route_command);
+    if(verbose_system(command) != STATUS_OK)
+        die("Error executing %s\n", command);
 	free(route_command);
 }
 

diff --git a/gtests/net/packetdrill/system.c b/gtests/net/packetdrill/system.c
@@ -33,24 +33,25 @@
 
 #include "logging.h"
 
-static int checked_system(const char *command, char **error)
+static void checked_system(const char *command, char **error)
 {
-	int result = system(command);
-	if (result == -1) {
+	int status;
+    status = system(command);
+	if (status == -1) {
 		asprintf(error, "%s", strerror(errno));
-	} else if (WIFSIGNALED(result) &&
-	    (WTERMSIG(result) == SIGINT || WTERMSIG(result) == SIGQUIT)) {
+	} else if (WIFSIGNALED(status) &&
+			   (WTERMSIG(status) == SIGINT || WTERMSIG(status) == SIGQUIT)) {
 		asprintf(error, "got signal %d (%s)",
-			 WTERMSIG(result), strsignal(WTERMSIG(result)));
-	} else if (WEXITSTATUS(result) != 0) {
-		asprintf(error, "non-zero status %d", WEXITSTATUS(result));
+				 WTERMSIG(status), strsignal(WTERMSIG(status)));
+	} else if (WEXITSTATUS(status) != 0) {
+		asprintf(error, "non-zero status %d", WEXITSTATUS(status));
+	} else {
+		*error = NULL;
 	}
-	return result;
 }
 
 int safe_system(const char *command, char **error)
 {
-	assert(*error == NULL);
 	checked_system(command, error);
 	if (*error != NULL)
 		return STATUS_ERR;
@@ -59,15 +60,13 @@ int safe_system(const char *command, char **error)
 
 int verbose_system(const char *command)
 {
-	int result;
 	char *error = NULL;
 
 	DEBUGP("running: '%s'\n", command);
-	result = checked_system(command, &error);
-	if (result != 0) {
+	checked_system(command, &error);
+	if (*error != NULL) {
 		DEBUGP("error: %s executing command '%s'\n", error, command);
-	} else {
-		DEBUGP("result: %d\n", result);
+		return STATUS_ERR;
 	}
-	return result;
+	return STATUS_OK;
 }