X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=mon%2Fmon_common.c;h=c302a44b368b482e285462d64c8675b8df6053e1;hb=f69e5eb2c34220af42b456ce9322401d6041d3ce;hp=b03afdabc6390eaa9c2a4ed9c7f19936601d3250;hpb=dd90d231263fc3dde5f538a5a83d88dd701ed178;p=trust_router.git

diff --git a/mon/mon_common.c b/mon/mon_common.c
index b03afda..c302a44 100644
--- a/mon/mon_common.c
+++ b/mon/mon_common.c
@@ -34,7 +34,7 @@
 
 
 #include <talloc.h>
-#include <gmodule.h>
+#include <glib.h>
 #include <string.h>
 
 #include <mon_internal.h>
@@ -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;
 }
@@ -87,20 +83,23 @@ const char *mon_opt_type_to_string(MON_OPT_TYPE opt_type)
     case OPT_TYPE_SHOW_VERSION:
       return "version";
 
-    case OPT_TYPE_SHOW_SERIAL:
-      return "serial";
+    case OPT_TYPE_SHOW_CONFIG_FILES:
+      return "config_files";
 
     case OPT_TYPE_SHOW_UPTIME:
       return "uptime";
 
-    case OPT_TYPE_SHOW_TID_REQ_COUNT:
-      return "tid_req_count";
+    case OPT_TYPE_SHOW_TID_REQS_PROCESSED:
+      return "tid_reqs_processed";
+
+    case OPT_TYPE_SHOW_TID_REQS_FAILED:
+      return "tid_reqs_failed";
 
-    case OPT_TYPE_SHOW_TID_REQ_ERR_COUNT:
-      return "tid_req_error_count";
+    case OPT_TYPE_SHOW_TID_ERROR_COUNT:
+      return "tid_error_count";
 
-    case OPT_TYPE_SHOW_TID_REQ_PENDING:
-      return "tid_req_pending";
+    case OPT_TYPE_SHOW_TID_REQS_PENDING:
+      return "tid_reqs_pending";
 
     case OPT_TYPE_SHOW_ROUTES:
       return "routes";
@@ -130,11 +129,11 @@ const char *mon_opt_type_to_string(MON_OPT_TYPE opt_type)
 MON_OPT_TYPE mon_opt_type_from_string(const char *s)
 {
   return_if_matches(s, OPT_TYPE_SHOW_VERSION);
-  return_if_matches(s, OPT_TYPE_SHOW_SERIAL);
+  return_if_matches(s, OPT_TYPE_SHOW_CONFIG_FILES);
   return_if_matches(s, OPT_TYPE_SHOW_UPTIME);
-  return_if_matches(s, OPT_TYPE_SHOW_TID_REQ_COUNT);
-  return_if_matches(s, OPT_TYPE_SHOW_TID_REQ_ERR_COUNT);
-  return_if_matches(s, OPT_TYPE_SHOW_TID_REQ_PENDING);
+  return_if_matches(s, OPT_TYPE_SHOW_TID_REQS_PROCESSED);
+  return_if_matches(s, OPT_TYPE_SHOW_TID_ERROR_COUNT);
+  return_if_matches(s, OPT_TYPE_SHOW_TID_REQS_PENDING);
   return_if_matches(s, OPT_TYPE_SHOW_ROUTES);
   return_if_matches(s, OPT_TYPE_SHOW_PEERS);
   return_if_matches(s, OPT_TYPE_SHOW_COMMUNITIES);