diff --git a/gtests/net/packetdrill/checksum_test.c b/gtests/net/packetdrill/checksum_test.c
index 14b9d7ea8b56aa5d6c31528e11bb2c0ff83e87d8..fb802dbcd4fac9547264dc51f2d9b5aa85f4fd65 100644
--- a/gtests/net/packetdrill/checksum_test.c
+++ b/gtests/net/packetdrill/checksum_test.c
@@ -32,6 +32,8 @@
#include "tcp.h"
#include "udplite.h"
+int debug_logging=0;
+
static void test_tcp_udp_v4_checksum(void)
{
u8 data[] __aligned(4) = {
diff --git a/gtests/net/packetdrill/config.c b/gtests/net/packetdrill/config.c
index 480bde55c257adc07d269b14423af08e4878f042..2c29cbc115d354cbd0ffd4bf37a479cc98406e59 100644
--- a/gtests/net/packetdrill/config.c
+++ b/gtests/net/packetdrill/config.c
@@ -59,6 +59,7 @@ enum option_codes {
OPT_NON_FATAL,
OPT_DRY_RUN,
OPT_VERBOSE = 'v', /* our only single-letter option */
+ OPT_DEBUG,
};
/* Specification of command line options for getopt_long(). */
@@ -87,6 +88,7 @@ struct option options[] = {
{ "non_fatal", .has_arg = true, NULL, OPT_NON_FATAL },
{ "dry_run", .has_arg = false, NULL, OPT_DRY_RUN },
{ "verbose", .has_arg = false, NULL, OPT_VERBOSE },
+ { "debug", .has_arg = false, NULL, OPT_DEBUG },
{ NULL },
};
@@ -117,6 +119,7 @@ void show_usage(void)
"\t[--wire_server_dev=<eth_dev_name>]\n"
"\t[--dry_run]\n"
"\t[--verbose|-v]\n"
+ "\t[--debug]\n"
"\tscript_path ...\n");
}
@@ -466,6 +469,9 @@ static void process_option(int opt, char *optarg, struct config *config,
case OPT_VERBOSE:
config->verbose = true;
break;
+ case OPT_DEBUG:
+ debug_logging = true;
+ break;
default:
show_usage();
exit(EXIT_FAILURE);
diff --git a/gtests/net/packetdrill/logging.h b/gtests/net/packetdrill/logging.h
index 2544c59cb549fede8160db8aef9a84c7c3467504..53a2c60189376537d01dfc23087702643191ecd1 100644
--- a/gtests/net/packetdrill/logging.h
+++ b/gtests/net/packetdrill/logging.h
@@ -28,11 +28,11 @@
#include "types.h"
/* Enable this to get debug logging. */
-#define DEBUG_LOGGING 0
+extern int debug_logging;
/* Use a gcc variadic macro to conditionally compile debug printing. */
#define DEBUGP(...) \
- if (DEBUG_LOGGING) { \
+ if (debug_logging) { \
fprintf(stdout, __VA_ARGS__); \
fflush(stdout); \
}
diff --git a/gtests/net/packetdrill/packet_parser.c b/gtests/net/packetdrill/packet_parser.c
index 6599777da5cd10475a61a8486ad165649697ef47..056b1e0ea24b81315f4bee9e08dd63c27787f8d1 100644
--- a/gtests/net/packetdrill/packet_parser.c
+++ b/gtests/net/packetdrill/packet_parser.c
@@ -232,7 +232,7 @@ static int parse_ipv4(struct packet *packet, u8 *header_start, u8 *packet_end,
p += ip_header_bytes;
assert(p <= packet_end);
- if (DEBUG_LOGGING) {
+ if (debug_logging) {
char src_string[ADDR_STR_LEN];
char dst_string[ADDR_STR_LEN];
struct ip_address src_ip, dst_ip;
@@ -304,7 +304,7 @@ static int parse_ipv6(struct packet *packet, u8 *header_start, u8 *packet_end,
p += ip_header_bytes;
assert(p <= packet_end);
- if (DEBUG_LOGGING) {
+ if (debug_logging) {
char src_string[ADDR_STR_LEN];
char dst_string[ADDR_STR_LEN];
struct ip_address src_ip, dst_ip;
diff --git a/gtests/net/packetdrill/packet_parser_test.c b/gtests/net/packetdrill/packet_parser_test.c
index 6eb6b0bd412183a65aa4ff828210f55011624c79..07ef95920076721b9f91cb34434b416db81c4f27 100644
--- a/gtests/net/packetdrill/packet_parser_test.c
+++ b/gtests/net/packetdrill/packet_parser_test.c
@@ -29,6 +29,8 @@
#include <stdlib.h>
#include <string.h>
+int debug_logging=0;
+
static void test_parse_sctp_ipv4_packet(void)
{
/* A SCTP/IPv4 packet. */
diff --git a/gtests/net/packetdrill/packet_socket_pcap.c b/gtests/net/packetdrill/packet_socket_pcap.c
index 27d51f7301e4f6d067ad3f6eb7f8012918baabe8..1e2bd210e5147272450d6486107e4e869f5ac4fe 100644
--- a/gtests/net/packetdrill/packet_socket_pcap.c
+++ b/gtests/net/packetdrill/packet_socket_pcap.c
@@ -303,7 +303,7 @@ int packet_socket_receive(struct packet_socket *psock,
DEBUGP("pcap_next_ex: caplen:%u len:%u offset:%d\n",
pkt_header->caplen, pkt_header->len, psock->pcap_offset);
- if (DEBUG_LOGGING) {
+ if (debug_logging) {
/* Dump a hex dump of packet sniffed by pcap. */
char *hex = NULL;
hex_dump(pkt_data, pkt_header->caplen, &hex);
diff --git a/gtests/net/packetdrill/packet_to_string_test.c b/gtests/net/packetdrill/packet_to_string_test.c
index 965395bae2e9ff27ecb703cf672be34a29648bc9..560aa24d6f7d6c33a3a3373b09252dd93c00048a 100644
--- a/gtests/net/packetdrill/packet_to_string_test.c
+++ b/gtests/net/packetdrill/packet_to_string_test.c
@@ -31,6 +31,8 @@
#include "packet_parser.h"
#include "logging.h"
+int debug_logging=0;
+
static void test_sctp_ipv4_packet_to_string(void)
{
/* An IPv4/SCTP packet. */
diff --git a/gtests/net/packetdrill/packetdrill.c b/gtests/net/packetdrill/packetdrill.c
index aef05c711f938d35a1675db5dcce68490f4ca5c5..574bf0b4a3edb1f071072fe178ad303ac867f5f2 100644
--- a/gtests/net/packetdrill/packetdrill.c
+++ b/gtests/net/packetdrill/packetdrill.c
@@ -41,6 +41,8 @@
#include "system.h"
#include "wire_server.h"
+int debug_logging=0;
+
static void run_init_scripts(struct config *config)
{
char *cp1, *cp2, *scripts, *error;
diff --git a/gtests/net/packetdrill/run_packet.c b/gtests/net/packetdrill/run_packet.c
index f03a4db237d3e3a5546df6404b4b3853d05f1704..30638f1a93f92a90efc96cbee2107641a44239c3 100644
--- a/gtests/net/packetdrill/run_packet.c
+++ b/gtests/net/packetdrill/run_packet.c
@@ -328,7 +328,7 @@ static struct socket *handle_listen_for_script_packet(
socket->live.remote_isn = ntohl(packet->tcp->seq);
}
- if (DEBUG_LOGGING) {
+ if (debug_logging) {
char local_string[ADDR_STR_LEN];
char remote_string[ADDR_STR_LEN];
DEBUGP("live: local: %s.%d\n",
diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c
index 1ec42605b3162431df215656133c05f7d5ccdfad..6972d661c9529077d381b69ab30ca185040f5235 100644
--- a/gtests/net/packetdrill/run_system_call.c
+++ b/gtests/net/packetdrill/run_system_call.c
@@ -1841,7 +1841,7 @@ static int run_syscall_accept(struct state *state,
}
for (socket = state->sockets; socket != NULL; socket = socket->next) {
- if (DEBUG_LOGGING) {
+ if (debug_logging) {
char remote_string[ADDR_STR_LEN];
DEBUGP("socket state=%d script addr: %s:%d\n",
socket->state,
@@ -1886,7 +1886,7 @@ static int run_syscall_accept(struct state *state,
socket->live.fd = live_accepted_fd;
socket->script.fd = script_accepted_fd;
- if (DEBUG_LOGGING) {
+ if (debug_logging) {
char local_string[ADDR_STR_LEN];
char remote_string[ADDR_STR_LEN];
DEBUGP("live: local: %s.%d\n",