From: Jennifer Richards <jennifer@painless-security.com>
Date: Mon, 7 May 2018 18:37:57 +0000 (-0400)
Subject: Remove unsupported 'reconfigure' monitoring command
X-Git-Tag: 3.4.0~1^2~30^2~1
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=f6165c5ed715591e476d69041c44e60833785091

Remove unsupported 'reconfigure' monitoring command
---

diff --git a/include/mon_internal.h b/include/mon_internal.h
index bbd7f1b..6e42750 100644
--- a/include/mon_internal.h
+++ b/include/mon_internal.h
@@ -78,7 +78,6 @@ enum mon_rc {
 
 enum mon_cmd {
   MON_CMD_UNKNOWN=0,
-  MON_CMD_RECONFIGURE,
   MON_CMD_SHOW
 };
 
diff --git a/mon/mon_common.c b/mon/mon_common.c
index 9a71af4..b0ff1d8 100644
--- a/mon/mon_common.c
+++ b/mon/mon_common.c
@@ -50,9 +50,6 @@ const char *mon_cmd_to_string(MON_CMD cmd)
     case MON_CMD_UNKNOWN:
       return NULL;
 
-    case MON_CMD_RECONFIGURE:
-      return "reconfigure";
-
     case MON_CMD_SHOW:
       return "show";
   }
@@ -68,7 +65,6 @@ const char *mon_cmd_to_string(MON_CMD cmd)
 
 MON_CMD mon_cmd_from_string(const char *s)
 {
-  return_if_matches(s, MON_CMD_RECONFIGURE);
   return_if_matches(s, MON_CMD_SHOW);
   return MON_CMD_UNKNOWN;
 }
diff --git a/mon/tests/req_reconfigure.test b/mon/tests/req_reconfigure.test
deleted file mode 100644
index 75f1690..0000000
--- a/mon/tests/req_reconfigure.test
+++ /dev/null
@@ -1 +0,0 @@
-{"command": "reconfigure"}
diff --git a/mon/tests/resp_reconfigure_error.test b/mon/tests/resp_reconfigure_error.test
deleted file mode 100644
index 3344bb1..0000000
--- a/mon/tests/resp_reconfigure_error.test
+++ /dev/null
@@ -1 +0,0 @@
-{"code": 1, "message": "error"}
diff --git a/mon/tests/resp_reconfigure_success.test b/mon/tests/resp_reconfigure_success.test
deleted file mode 100644
index 392c2e0..0000000
--- a/mon/tests/resp_reconfigure_success.test
+++ /dev/null
@@ -1 +0,0 @@
-{"code": 0, "message": "success"}
diff --git a/mon/tests/test_mon_req_decode.c b/mon/tests/test_mon_req_decode.c
index 19ad64d..7c76b18 100644
--- a/mon/tests/test_mon_req_decode.c
+++ b/mon/tests/test_mon_req_decode.c
@@ -11,16 +11,6 @@
 #include <mon_internal.h>
 
 /**
- * @return reconfigure command
- */
-static MON_REQ *reconfigure()
-{
-  MON_REQ *req = mon_req_new(NULL, MON_CMD_RECONFIGURE);
-  assert(req);
-  return req;
-}
-
-/**
  * @return show command with no options
  */
 static MON_REQ *show_plain()
@@ -124,9 +114,6 @@ static int run_test(const char *filename, MON_REQ *(generator)())
 int main(void)
 {
 
-  // Test reconfigure command
-  assert(run_test("req_reconfigure.test", reconfigure));
-
   // Test show command with no options
   assert(run_test("req_show_no_options.test", show_plain));
 
diff --git a/mon/tests/test_mon_req_encode.c b/mon/tests/test_mon_req_encode.c
index d3ae49c..eb48ce9 100644
--- a/mon/tests/test_mon_req_encode.c
+++ b/mon/tests/test_mon_req_encode.c
@@ -12,19 +12,6 @@
 
 #define JSON_DUMP_OPTS 0
 
-static char *reconfigure()
-{
-  MON_REQ *req = mon_req_new(NULL, MON_CMD_RECONFIGURE);
-  json_t *req_json = mon_req_encode(req);
-  char *result = json_dumps(req_json, JSON_DUMP_OPTS);
-  assert(req);
-  assert(req_json);
-  assert(result);
-  json_decref(req_json);
-  mon_req_free(req);
-  return result;
-}
-
 static char *show_plain()
 {
   MON_REQ *req = mon_req_new(NULL, MON_CMD_SHOW);
@@ -81,14 +68,6 @@ int main(void)
   MON_OPT_TYPE opts[10];
   char *expected = NULL;
 
-  // Test reconfigure command
-  s = reconfigure();
-  expected = read_file("req_reconfigure.test");
-  assert(expected);
-  assert(strcmp(expected, s) == 0);
-  free(s);
-  free(expected);
-
   // Test show without options
   s = show_plain();
   expected = read_file("req_show_no_options.test");
diff --git a/mon/tests/test_mon_resp_encode.c b/mon/tests/test_mon_resp_encode.c
index 6945b76..c9d6d2c 100644
--- a/mon/tests/test_mon_resp_encode.c
+++ b/mon/tests/test_mon_resp_encode.c
@@ -11,41 +11,6 @@
 
 #define JSON_DUMP_OPTS 0
 
-static char *reconfigure(MON_RESP_CODE code, const char *message)
-{
-  MON_REQ *req = NULL;
-  MON_RESP *resp = NULL;
-  json_t *resp_json = NULL;
-  char *result = NULL;
-
-  req = mon_req_new(NULL, MON_CMD_RECONFIGURE);
-  assert(req);
-
-  resp = mon_resp_new(NULL, code, message, NULL);
-  assert(resp);
-
-  resp_json = mon_resp_encode(resp);
-  assert(resp_json);
-
-  result = json_dumps(resp_json, JSON_DUMP_OPTS);
-  assert(result);
-
-  json_decref(resp_json);
-  mon_resp_free(resp);
-  mon_req_free(req);
-  return result;
-}
-
-static char *reconfigure_success()
-{
-  return reconfigure(MON_RESP_SUCCESS, "success");
-}
-
-static char *reconfigure_error()
-{
-  return reconfigure(MON_RESP_ERROR, "error");
-}
-
 static char *show_success()
 {
   MON_REQ *req = NULL;
@@ -123,8 +88,6 @@ int run_test(const char *filename, char *(generator)())
 
 int main(void)
 {
-  assert(run_test("resp_reconfigure_success.test", reconfigure_success));
-  assert(run_test("resp_reconfigure_error.test", reconfigure_error));
   assert(run_test("resp_show_success.test", show_success));
   return 0;
 }