*
* Somewhat based on blanche
*
- * Copyright (C) 2000 by the Massachusetts Institute of Technology.
+ * Copyright (C) 2000, 2001 by the Massachusetts Institute of Technology.
* For copying and distribution information, please see the file
* <mit-copyright.h>.
*/
#include <stdlib.h>
#include <string.h>
+#ifdef _WIN32
+typedef unsigned long in_addr_t;
+#else
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
RCSID("$Header$");
struct owner_type {
/* flags from command line */
int info_flag, update_flag, create_flag, delete_flag, list_map_flag;
int update_alias_flag, update_map_flag, verbose, noauth;
+int list_container_flag, update_container_flag, unformatted_flag;
struct string_list *alias_add_queue, *alias_remove_queue;
struct string_list *map_add_queue, *map_remove_queue;
+struct string_list *container_add_queue, *container_remove_queue;
char *hostname, *whoami;
char *newname, *address, *network, *h_status, *vendor, *model;
-char *os, *location, *contact, *adm_cmt, *op_cmt;
+char *os, *location, *contact, *billing_contact, *account_number;
+char *adm_cmt, *op_cmt;
+in_addr_t ipaddress;
struct owner_type *owner;
void usage(char **argv);
int store_host_info(int argc, char **argv, void *hint);
void show_host_info(char **argv);
+void show_host_info_unformatted(char **argv);
int show_machine_in_cluster(int argc, char **argv, void *hint);
+int show_machine_in_container(int argc, char **argv, void *hint);
struct owner_type *parse_member(char *s);
struct string_list *add_to_string_list(struct string_list *old_list, char *s);
int wrap_mr_query(char *handle, int argc, char **argv,
/* clear all flags & lists */
info_flag = update_flag = create_flag = list_map_flag = update_map_flag = 0;
update_alias_flag = verbose = noauth = 0;
+ list_container_flag = update_container_flag = 0;
newname = address = network = h_status = vendor = model = NULL;
- os = location = contact = adm_cmt = op_cmt = NULL;
+ os = location = contact = billing_contact = account_number = adm_cmt = NULL;
+ op_cmt = NULL;
owner = NULL;
alias_add_queue = alias_remove_queue = NULL;
map_add_queue = map_remove_queue = NULL;
+ container_add_queue = container_remove_queue = NULL;
whoami = argv[0];
success = 1;
} else
usage(argv);
}
+ else if (argis("bc", "billingcontact")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ update_flag++;
+ billing_contact = *arg;
+ } else
+ usage(argv);
+ }
+ else if (argis("an", "accountnumber")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ update_flag++;
+ account_number = *arg;
+ } else
+ usage(argv);
+ }
else if (argis("ac", "admcmt")) {
if (arg - argv < argc - 1) {
arg++;
} else
usage(argv);
}
- else if (argis("a", "aliasadd")) {
+ else if (argis("a", "addalias")) {
if (arg - argv < argc - 1) {
arg++;
alias_add_queue=add_to_string_list(alias_add_queue, *arg);
usage(argv);
update_alias_flag++;
}
- else if (argis("d", "aliasdelete")) {
+ else if (argis("d", "deletealias")) {
if (arg - argv < argc - 1) {
arg++;
alias_remove_queue=add_to_string_list(alias_remove_queue, *arg);
}
else if (argis("lm", "listmap"))
list_map_flag++;
+ else if (argis("acn", "addcontainer")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ container_add_queue =
+ add_to_string_list(container_add_queue, *arg);
+ } else
+ usage(argv);
+ update_container_flag++;
+ }
+ else if (argis("dcn", "deletecontainer")) {
+ if (arg - argv < argc - 1) {
+ arg++;
+ container_remove_queue =
+ add_to_string_list(container_remove_queue, *arg);
+ } else
+ usage(argv);
+ update_container_flag++;
+ }
+ else if (argis("lcn", "listcontainer"))
+ list_container_flag++;
+ else if (argis("u", "unformatted"))
+ unformatted_flag++;
else if (argis("n", "noauth"))
noauth++;
else if (argis("v", "verbose"))
/* default to info_flag if nothing else was specified */
if(!(info_flag || update_flag || create_flag || \
delete_flag || list_map_flag || update_map_flag || \
- update_alias_flag)) {
+ update_alias_flag || update_container_flag || \
+ list_container_flag)) {
info_flag++;
}
/* fire up Moira */
- status = mrcl_connect(server, "stella", 2, !noauth);
+ status = mrcl_connect(server, "stella", 8, !noauth);
if (status == MRCL_AUTH_ERROR)
{
com_err(whoami, 0, "Try the -noauth flag if you don't "
if (status)
exit(2);
+ /* Perform the lookup by IP address if that's what we've been handed */
+ if ((ipaddress=inet_addr(hostname)) != -1) {
+ char *args[5];
+ char *argv[30];
+
+ args[1] = strdup(hostname);
+ args[0] = args[2] = args[3] = "*";
+ status = wrap_mr_query("get_host", 4, args, store_host_info, argv);
+
+ if (status) {
+ com_err(whoami, status, "while looking up IP address.");
+ } else {
+ hostname = argv[0];
+ }
+ }
+
/* create if needed */
if (create_flag)
{
char *argv[30];
int cnt;
- for (cnt = 0; cnt < 15; cnt++) {
+ for (cnt = 0; cnt < 17; cnt++) {
argv[cnt] = "";
}
argv[4] = location;
if (contact)
argv[5] = contact;
+ if (billing_contact)
+ argv[6] = billing_contact;
+ if (account_number)
+ argv[7] = account_number;
/* The use field always gets set to "0" */
- argv[6] = "0";
+ argv[8] = "0";
if (h_status)
- argv[7] = h_status;
+ argv[9] = h_status;
else
- argv[7] = "1";
+ argv[9] = "1";
if (network)
- argv[8] = network;
+ argv[10] = network;
if (address)
- argv[9] = address;
+ argv[11] = address;
else
- argv[9] = "unique";
+ argv[11] = "unique";
if (adm_cmt)
- argv[12] = adm_cmt;
+ argv[14] = adm_cmt;
if (op_cmt)
- argv[13] = op_cmt;
+ argv[15] = op_cmt;
if (owner)
{
- argv[11] = owner->name;
+ argv[13] = owner->name;
switch (owner->type)
{
case M_ANY:
case M_USER:
- argv[10] = "USER";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[12] = "USER";
+ status = wrap_mr_query("add_host", 16, argv, NULL, NULL);
if (owner->type != M_ANY || status != MR_USER)
break;
case M_LIST:
- argv[10] = "LIST";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[12] = "LIST";
+ status = wrap_mr_query("add_host", 16, argv, NULL, NULL);
break;
case M_KERBEROS:
- argv[10] = "KERBEROS";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[12] = "KERBEROS";
+ status = mrcl_validate_kerberos_member(argv[13], &argv[13]);
+ if (mrcl_get_message())
+ mrcl_com_err(whoami);
+ if (status == MRCL_REJECT)
+ exit(1);
+ status = wrap_mr_query("add_host", 16, argv, NULL, NULL);
break;
case M_NONE:
- argv[10] = "NONE";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ argv[12] = "NONE";
+ status = wrap_mr_query("add_host", 16, argv, NULL, NULL);
break;
}
}
else
{
- argv[10] = "NONE";
- argv[11] = "NONE";
+ argv[12] = "NONE";
+ argv[13] = "NONE";
- status = wrap_mr_query("add_host", 14, argv, NULL, NULL);
+ status = wrap_mr_query("add_host", 16, argv, NULL, NULL);
}
if (status)
else if (update_flag)
{
char *old_argv[30];
- char *argv[16];
+ char *argv[17];
char *args[5];
args[0] = canonicalize_hostname(strdup(hostname));
argv[6] = old_argv[5];
argv[7] = old_argv[6];
argv[8] = old_argv[7];
- argv[9] = old_argv[9];
- argv[10] = old_argv[10];
+ argv[9] = old_argv[8];
+ argv[10] = old_argv[9];
argv[11] = old_argv[11];
argv[12] = old_argv[12];
argv[13] = old_argv[13];
argv[14] = old_argv[14];
+ argv[15] = old_argv[15];
+ argv[16] = old_argv[16];
argv[0] = canonicalize_hostname(strdup(hostname));
if (newname)
argv[5] = location;
if (contact)
argv[6] = contact;
+ if (billing_contact)
+ argv[7] = billing_contact;
+ if (account_number)
+ argv[8] = account_number;
if (h_status)
- argv[8] = h_status;
+ argv[10] = h_status;
if (network)
- argv[9] = network;
+ argv[11] = network;
if (address)
- argv[10] = address;
+ argv[12] = address;
if (adm_cmt)
- argv[13] = adm_cmt;
+ argv[15] = adm_cmt;
if (op_cmt)
- argv[14] = op_cmt;
+ argv[16] = op_cmt;
if (owner)
{
- argv[12] = owner->name;
+ argv[14] = owner->name;
switch (owner->type)
{
case M_ANY:
case M_USER:
- argv[11] = "USER";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[13] = "USER";
+ status = wrap_mr_query("update_host", 17, argv, NULL, NULL);
if (owner->type != M_ANY || status != MR_USER)
break;
case M_LIST:
- argv[11] = "LIST";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[13] = "LIST";
+ status = wrap_mr_query("update_host", 17, argv, NULL, NULL);
break;
case M_KERBEROS:
- argv[11] = "KERBEROS";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[13] = "KERBEROS";
+ status = mrcl_validate_kerberos_member(argv[14], &argv[14]);
+ if (mrcl_get_message())
+ mrcl_com_err(whoami);
+ if (status == MRCL_REJECT)
+ exit(1);
+ status = wrap_mr_query("update_host", 17, argv, NULL, NULL);
break;
case M_NONE:
- argv[11] = "NONE";
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ argv[13] = "NONE";
+ status = wrap_mr_query("update_host", 17, argv, NULL, NULL);
break;
}
}
else
- status = wrap_mr_query("update_host", 15, argv, NULL, NULL);
+ status = wrap_mr_query("update_host", 17, argv, NULL, NULL);
if (status)
com_err(whoami, status, "while updating host.");
}
}
+ /* add container mappings */
+ if (container_add_queue) {
+ struct string_list *q = container_add_queue;
+
+ while (q) {
+ char *containername = q->string;
+ char *args[2];
+
+ args[0] = canonicalize_hostname(strdup(hostname));
+ args[1] = containername;
+ status = wrap_mr_query("add_machine_to_container", 2, args,
+ NULL, NULL);
+
+ if (status) {
+ com_err(whoami, status, "while adding container mapping");
+ exit(1);
+ }
+
+ q = q->next;
+ }
+ }
+
+ /* delete container mappings */
+ if (container_remove_queue) {
+ struct string_list *q = container_remove_queue;
+
+ while (q) {
+ char *containername = q->string;
+ char *args[2];
+
+ args[0] = canonicalize_hostname(strdup(hostname));
+ args[1] = containername;
+ status = wrap_mr_query("delete_machine_from_container", 2, args,
+ NULL, NULL);
+
+ if (status) {
+ com_err(whoami, status, "while deleting container mapping");
+ exit(1);
+ }
+
+ q = q->next;
+ }
+ }
+
/* display list info if requested to */
if (info_flag) {
struct mqelem *elem = NULL;
args[0] = canonicalize_hostname(strdup(hostname));
args[1] = args[2] = args[3] = "*";
status = wrap_mr_query("get_host", 4, args, store_host_info, argv);
+
+ /* We might be looking for an alias of a deleted host. */
+ if (status && status == MR_NO_MATCH) {
+ status = wrap_mr_query("get_hostalias", 2, args, store_host_info, argv);
+ if (!status) {
+ args[0] = strdup(argv[1]);
+ status = wrap_mr_query("get_host", 4, args, store_host_info, argv);
+ }
+ }
+
if (status) {
com_err(whoami, status, "while getting host information");
exit(1);
}
- show_host_info(argv);
+
+ if (unformatted_flag)
+ show_host_info_unformatted(argv);
+ else
+ show_host_info(argv);
+ args[0] = argv[M_SUBNET];
+ status = wrap_mr_query("get_subnet", 1, args, store_host_info, argv);
+ if (status)
+ com_err(whoami, status, "while getting subnet information");
+ if (atoi(argv[SN_STATUS]) == SNET_STATUS_PRIVATE_10MBPS ||
+ atoi(argv[SN_STATUS]) == SNET_STATUS_PRIVATE_100MBPS ||
+ atoi(argv[SN_STATUS]) == SNET_STATUS_PRIVATE_1000MBPS)
+ {
+ fprintf(stderr, "\nWarning: This host is on a private subnet.\n");
+ fprintf(stderr, "Billing information shown is superseded by billing information for the subnet.\n");
+ }
}
/* list cluster mappings if needed */
}
}
+ /* list container mappings if needed */
+ if (list_container_flag) {
+ char *argv[1];
+
+ argv[0] = canonicalize_hostname(strdup(hostname));
+ status = wrap_mr_query("get_machine_to_container_map", 1, argv,
+ show_machine_in_container, NULL);
+
+ if (status)
+ if (status != MR_NO_MATCH) {
+ com_err(whoami, status, "while getting container mappings");
+ exit(1);
+ }
+ }
+
if (delete_flag) {
char *argv[1];
fprintf(stderr, USAGE_OPTIONS_FORMAT, "-oc | -opcmt op_cmt",
"-c | -contact contact");
fprintf(stderr, USAGE_OPTIONS_FORMAT, "-ac | -admcmt adm_cmt",
- "-A | -address address");
- fprintf(stderr, USAGE_OPTIONS_FORMAT, "-am | -addmap cluster",
- "-N | -network network");
- fprintf(stderr, USAGE_OPTIONS_FORMAT, "-dm | -deletemap cluster",
+ "-bc | -billingcontact billing_contact");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-an | -accountnumber account_number", "-A | -address address");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-N | -network network",
+ "-am | -addmap cluster");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-dm | deletemap cluster",
+ "-acn | -addcontainer container");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-dcn | -deletecontainer container",
"-lm | -listmap");
- fprintf(stderr, USAGE_OPTIONS_FORMAT, "-db | -database host[:port]",
- "-n | -noauth");
+ fprintf(stderr, USAGE_OPTIONS_FORMAT, "-lcn | -listcontainer",
+ "-u | -unformatted");
fprintf(stderr, USAGE_OPTIONS_FORMAT, "-v | -verbose",
- "");
+ "-n | -noauth");
+ fprintf(stderr, " %-39s\n" , "-db | -database host[:port]");
exit(1);
}
return MR_CONT;
}
+int show_alias_info_unformatted(int argc, char **argv, void *hint)
+{
+ if(!show_has_aliases++)
+ printf("Alias: %s", argv[0]);
+ else
+ printf(", %s", argv[0]);
+
+ return MR_CONT;
+}
+
static char *states[] = {
"Reserved (0)",
"Active (1)",
printf("Status: %-16s Changed: %s\n",
MacState(atoi(argv[M_STAT])), argv[M_STAT_CHNG]);
printf("\n");
-
- printf("Vendor: %-16s Model: %-20s OS: %s\n",
- argv[M_VENDOR], argv[M_MODEL], argv[M_OS]);
- printf("Location: %-16s Contact: %-20s Opt: %s\n",
- argv[M_LOC], argv[M_CONTACT], argv[M_USE]);
+ printf("Vendor: %-16s Location: %s\n", argv[M_VENDOR],
+ argv[M_LOC]);
+ printf("Model: %-16s Contact: %s\n", argv[M_MODEL],
+ argv[M_CONTACT]);
+ printf("OS: %-16s Billing Contact: %s\n", argv[M_OS],
+ argv[M_BILL_CONTACT]);
+ printf("Opt: %-16s Account Number: %s\n", argv[M_USE],
+ argv[M_ACCT_NUMBER]);
printf("\nAdm cmt: %s\n", argv[M_ACOMMENT]);
printf("Op cmt: %s\n", argv[M_OCOMMENT]);
printf("\n");
printf("Last mod by %s at %s with %s.\n", argv[M_MODBY], argv[M_MODTIME], argv[M_MODWITH]);
}
+void show_host_info_unformatted(char **argv)
+{
+ char *args[3];
+ struct mqelem *elem = NULL;
+ int stat;
+
+ printf("Machine: %s\n", argv[M_NAME]);
+ args[0] = "*";
+ args[1] = argv[M_NAME];
+ show_has_aliases = 0;
+ stat = wrap_mr_query("get_hostalias", 2, args, show_alias_info_unformatted,
+ &elem);
+ if (stat && stat != MR_NO_MATCH)
+ com_err(whoami, stat, "while getting aliases");
+ else
+ printf("\n");
+ printf("Address: %s\n", argv[M_ADDR]);
+ printf("Network: %s\n", argv[M_SUBNET]);
+ printf("Owner Type: %s\n", argv[M_OWNER_TYPE]);
+ printf("Owner: %s\n", argv[M_OWNER_NAME]);
+ printf("Status: %s\n", MacState(atoi(argv[M_STAT])));
+ printf("Changed: %s\n", argv[M_STAT_CHNG]);
+ printf("Use data: %s\n", argv[M_INUSE]);
+ printf("Vendor: %s\n", argv[M_VENDOR]);
+ printf("Model: %s\n", argv[M_MODEL]);
+ printf("OS: %s\n", argv[M_OS]);
+ printf("Location: %s\n", argv[M_LOC]);
+ printf("Contact: %s\n", argv[M_CONTACT]);
+ printf("Billing Contact: %s\n", argv[M_BILL_CONTACT]);
+ printf("Account Number: %s\n", argv[M_ACCT_NUMBER]);
+ printf("Opt: %s\n", argv[M_USE]);
+ printf("Adm cmt: %s\n", argv[M_ACOMMENT]);
+ printf("Op cmt: %s\n", argv[M_OCOMMENT]);
+ printf("Created by: %s\n", argv[M_CREATOR]);
+ printf("Created on: %s\n", argv[M_CREATED]);
+ printf("Last mod by: %s\n", argv[M_MODBY]);
+ printf("Last mod on: %s\n", argv[M_MODTIME]);
+ printf("Last mod with: %s\n", argv[M_MODWITH]);
+}
+
int show_machine_in_cluster(int argc, char **argv, void *hint)
{
printf("Machine: %-30s Cluster: %-30s\n", argv[0], argv[1]);
return MR_CONT;
}
+int show_machine_in_container(int argc, char **argv, void *hint)
+{
+ printf("Machine: %-30s Container: %-25s\n", argv[0], argv[1]);
+
+ return MR_CONT;
+}
+
/* Parse a line of input, fetching a member. NULL is returned if a member
* is not found. ';' is a comment character.
*/
andersk / moira.git / blobdiff