From 0f0f73636f1a4c9292f01b1a2669e73984ec4d20 Mon Sep 17 00:00:00 2001
From: Michael Rash <mbr@cipherdyne.org>
Date: Fri, 31 May 2013 23:19:48 -0400
Subject: [PATCH] [server] minor update to rename PCAP_ANY_DIRECTION ->
 ENABLE_PCAP_ANY_DIRECTION

---
 server/cmd_opts.h       | 6 +++---
 server/config_init.c    | 2 +-
 server/fwknopd.conf     | 2 +-
 server/fwknopd_common.h | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/cmd_opts.h b/server/cmd_opts.h
index 37920d00..368804a7 100644
--- a/server/cmd_opts.h
+++ b/server/cmd_opts.h
@@ -47,7 +47,7 @@ static char *config_map[NUMBER_OF_CONFIG_ENTRIES] = {
     "PCAP_FILTER",
     "PCAP_DISPATCH_COUNT",
     "PCAP_LOOP_SLEEP",
-    "PCAP_ANY_DIRECTION",
+    "ENABLE_PCAP_ANY_DIRECTION",
     "MAX_SNIFF_BYTES",
     "ENABLE_SPA_PACKET_AGING",
     "MAX_SPA_PACKET_AGE",
@@ -118,7 +118,7 @@ enum {
     FW_FLUSH,
     GPG_HOME_DIR,
     PCAP_FILE,
-    PCAP_ANY_DIRECTION,
+    ENABLE_PCAP_ANY_DIRECTION,
     ROTATE_DIGEST_CACHE,
     NOOP /* Just to be a marker for the end */
 };
@@ -149,7 +149,7 @@ static struct option cmd_opts[] =
     {"override-config",     1, NULL, 'O' },
     {"pcap-file",           1, NULL, PCAP_FILE },
     {"pcap-filter",         1, NULL, 'P'},
-    {"pcap-any-direction",  0, NULL, PCAP_ANY_DIRECTION },
+    {"pcap-any-direction",  0, NULL, ENABLE_PCAP_ANY_DIRECTION },
     {"pid-file",            1, NULL, 'p'},
     {"restart",             0, NULL, 'R'},
     {"status",              0, NULL, 'S'},
diff --git a/server/config_init.c b/server/config_init.c
index e3a14f06..c2e9a05d 100644
--- a/server/config_init.c
+++ b/server/config_init.c
@@ -836,7 +836,7 @@ config_init(fko_srv_options_t *opts, int argc, char **argv)
             case PCAP_FILE:
                 set_config_entry(opts, CONF_PCAP_FILE, optarg);
                 break;
-            case PCAP_ANY_DIRECTION:
+            case ENABLE_PCAP_ANY_DIRECTION:
                 opts->pcap_any_direction = 1;
                 break;
             case ROTATE_DIGEST_CACHE:
diff --git a/server/fwknopd.conf b/server/fwknopd.conf
index ec247b1c..679d8fb8 100644
--- a/server/fwknopd.conf
+++ b/server/fwknopd.conf
@@ -138,7 +138,7 @@
 # packets that are received on the sniffing interface (note that this is
 # independent of promiscuous mode).
 #
-# PCAP_ANY_DIRECTION        N;
+# ENABLE_PCAP_ANY_DIRECTION     N;
 
 ##############################################################################
 # NOTE: The following EXTERNAL_CMD functionality is not yet implemented.
diff --git a/server/fwknopd_common.h b/server/fwknopd_common.h
index 7ae67f25..43ce96bf 100644
--- a/server/fwknopd_common.h
+++ b/server/fwknopd_common.h
@@ -87,7 +87,7 @@
 #define DEF_PCAP_FILTER                 "udp port 62201"
 #define DEF_PCAP_DISPATCH_COUNT         "0"
 #define DEF_PCAP_LOOP_SLEEP             "100000" /* a tenth of a second (in microseconds) */
-#define DEF_PCAP_ANY_DIRECTION          "N"
+#define DEF_ENABLE_PCAP_ANY_DIRECTION   "N"
 #define DEF_ENABLE_SPA_PACKET_AGING     "Y"
 #define DEF_MAX_SPA_PACKET_AGE          "120"
 #define DEF_ENABLE_DIGEST_PERSISTENCE   "Y"
@@ -190,7 +190,7 @@ enum {
     CONF_PCAP_FILTER,
     CONF_PCAP_DISPATCH_COUNT,
     CONF_PCAP_LOOP_SLEEP,
-    CONF_PCAP_ANY_DIRECTION,
+    CONF_ENABLE_PCAP_ANY_DIRECTION,
     CONF_MAX_SNIFF_BYTES,
     CONF_ENABLE_SPA_PACKET_AGING,
     CONF_MAX_SPA_PACKET_AGE,