From 508f92ce75e49d27bed18a7f705aa16b7f914295 Mon Sep 17 00:00:00 2001
From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Mon, 20 Jun 2016 22:08:06 +0200
Subject: [PATCH] Use correct check for wire_server_dev.
Sponsored by: Netflix
---
gtests/net/packetdrill/config.c | 5 -----
gtests/net/packetdrill/logging.h | 2 +-
gtests/net/packetdrill/packetdrill.c | 9 ++++++++-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/gtests/net/packetdrill/config.c b/gtests/net/packetdrill/config.c
index 6b335f0c..480bde55 100644
--- a/gtests/net/packetdrill/config.c
+++ b/gtests/net/packetdrill/config.c
@@ -330,11 +330,6 @@ void finalize_config(struct config *config)
die("wire_server_ip not specified\n");
}
}
- if (config->is_wire_server) {
- if (config->wire_server_device == NULL) {
- die("%s: wire_server_dev not specified\n");
- }
- }
}
/* Expect that arg is comma-delimited, allowing for spaces. */
diff --git a/gtests/net/packetdrill/logging.h b/gtests/net/packetdrill/logging.h
index 2544c59c..6436c1d0 100644
--- a/gtests/net/packetdrill/logging.h
+++ b/gtests/net/packetdrill/logging.h
@@ -28,7 +28,7 @@
#include "types.h"
/* Enable this to get debug logging. */
-#define DEBUG_LOGGING 0
+#define DEBUG_LOGGING 1
/* Use a gcc variadic macro to conditionally compile debug printing. */
#define DEBUGP(...) \
diff --git a/gtests/net/packetdrill/packetdrill.c b/gtests/net/packetdrill/packetdrill.c
index 93620ff2..aef05c71 100644
--- a/gtests/net/packetdrill/packetdrill.c
+++ b/gtests/net/packetdrill/packetdrill.c
@@ -87,7 +87,14 @@ int main(int argc, char *argv[])
show_usage();
exit(EXIT_FAILURE);
}
-
+ if (config.is_wire_server) {
+ if (config.wire_server_device == NULL) {
+ fprintf(stderr,
+ "error: wire_server_dev must be specified\n");
+ show_usage();
+ exit(EXIT_FAILURE);
+ }
+ }
run_wire_server(&config);
return 0;
}
--
GitLab