From: zacheiss Date: Wed, 20 Mar 2002 04:01:00 +0000 (+0000) Subject: Split "Resnet" subnet status out into Dorm and ILG statuses; this was X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/commitdiff_plain/2532d5ce7675f98729bf9bf510dfdea8b8fc2aa1 Split "Resnet" subnet status out into Dorm and ILG statuses; this was requested for billing purposes. --- diff --git a/clients/moira/cluster.c b/clients/moira/cluster.c index 244aa939..b7fa7b02 100644 --- a/clients/moira/cluster.c +++ b/clients/moira/cluster.c @@ -89,9 +89,10 @@ static char *subnet_states[] = { "Private, 10 Mbps (2)", "Private, 100 Mbps (3)", "Private, Other (4)", - "Resnet (5)", + "Resnet, Dorm (5)", "Infrastructure (6)", - "Private, 1000 Mbps (7)" + "Private, 1000 Mbps (7)", + "Resnet, FSILG (8)" }; static char *MacState(int state) @@ -110,7 +111,7 @@ static char *SubnetState(int state) { static char buf[BUFSIZ]; - if (state < 0 || state > 7) + if (state < 0 || state > 8) { sprintf(buf, "Unknown (%d)", state); return buf; diff --git a/include/moira_site.h b/include/moira_site.h index f368313a..dc117728 100644 --- a/include/moira_site.h +++ b/include/moira_site.h @@ -350,9 +350,10 @@ #define SNET_STATUS_PRIVATE_10MBPS 2 #define SNET_STATUS_PRIVATE_100MBPS 3 #define SNET_STATUS_PRIVATE_OTHER 4 -#define SNET_STATUS_RESNET 5 +#define SNET_STATUS_RESNET_DORM 5 #define SNET_STATUS_INFRASTRUCTURE 6 #define SNET_STATUS_PRIVATE_1000MBPS 7 +#define SNET_STATUS_RESNET_FSILG 8 /* User Information queries, v3 */