projects
/
trust_router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #62 from painless-security/jennifer/report_incoming_ipaddr
[trust_router.git]
/
mon
/
mon_common.c
diff --git
a/mon/mon_common.c
b/mon/mon_common.c
index
440a277
..
a237b5d
100644
(file)
--- a/
mon/mon_common.c
+++ b/
mon/mon_common.c
@@
-87,8
+87,8
@@
const char *mon_opt_type_to_string(MON_OPT_TYPE opt_type)
case OPT_TYPE_SHOW_VERSION:
return "version";
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_UPTIME:
return "uptime";
@@
-96,14
+96,26
@@
const char *mon_opt_type_to_string(MON_OPT_TYPE opt_type)
case OPT_TYPE_SHOW_TID_REQ_COUNT:
return "tid_req_count";
case OPT_TYPE_SHOW_TID_REQ_COUNT:
return "tid_req_count";
+ case OPT_TYPE_SHOW_TID_REQ_ERR_COUNT:
+ return "tid_req_error_count";
+
case OPT_TYPE_SHOW_TID_REQ_PENDING:
return "tid_req_pending";
case OPT_TYPE_SHOW_ROUTES:
return "routes";
case OPT_TYPE_SHOW_TID_REQ_PENDING:
return "tid_req_pending";
case OPT_TYPE_SHOW_ROUTES:
return "routes";
+ case OPT_TYPE_SHOW_PEERS:
+ return "peers";
+
case OPT_TYPE_SHOW_COMMUNITIES:
return "communities";
case OPT_TYPE_SHOW_COMMUNITIES:
return "communities";
+
+ case OPT_TYPE_SHOW_REALMS:
+ return "realms";
+
+ case OPT_TYPE_SHOW_RP_CLIENTS:
+ return "rp_clients";
}
return NULL;
}
}
return NULL;
}
@@
-118,12
+130,16
@@
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);
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_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_ROUTES);
return_if_matches(s, OPT_TYPE_SHOW_TID_REQ_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);
return_if_matches(s, OPT_TYPE_SHOW_COMMUNITIES);
+ return_if_matches(s, OPT_TYPE_SHOW_REALMS);
+ return_if_matches(s, OPT_TYPE_SHOW_RP_CLIENTS);
return OPT_TYPE_UNKNOWN;
}
#undef return_if_matches
return OPT_TYPE_UNKNOWN;
}
#undef return_if_matches