X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=lcradmin.c;h=b8b9ac3b86d2687f09a74f05a44d54a55f696217;hp=d841e49222fcd1c0207fdb2912f789ae28e7ba47;hb=a425aedc1ee2c0bba4ba20904943afb21bd6e2e5;hpb=2b8b9508c63608402921232d8451ae1b07ea2bf7

diff --git a/lcradmin.c b/lcradmin.c
index d841e49..b8b9ac3 100644
--- a/lcradmin.c
+++ b/lcradmin.c
@@ -670,7 +670,7 @@ const char *admin_state(int sock, char *argv[])
 			if (m[i].u.i.block >= 2)
 			{
 				if (m[i].u.i.portnum < 0)
-					SPRINT(buffer, "%s (port ?: %s)%s", m[i].u.i.interface_name, m[i].u.i.portname, (m[i].u.i.extension)?" extension":"");
+					SPRINT(buffer, "%s (port ?: %s)%s", m[i].u.i.interface_name, m[i].u.i.portname, (m[i].u.i.extension)?" exten":"");
 				else
 					SPRINT(buffer, "%s (port %d: %s)%s", m[i].u.i.interface_name, m[i].u.i.portnum, m[i].u.i.portname, (m[i].u.i.extension)?" extension":"");
 				addstr(buffer);
@@ -678,21 +678,50 @@ const char *admin_state(int sock, char *argv[])
 				addstr("  not loaded");
 			} else
 			{
-				SPRINT(buffer, "%s (port %d: %s) %s %s%s use:%d", m[i].u.i.interface_name, m[i].u.i.portnum, m[i].u.i.portname, (m[i].u.i.ntmode)?"NT-mode":"TE-mode", (m[i].u.i.ptp)?"ptp ":"ptmp", (m[i].u.i.extension)?" extension":"", m[i].u.i.use);
+				SPRINT(buffer, "%s", m[i].u.i.interface_name);
+				addstr(buffer);
+				color(yellow);
+				SPRINT(buffer, "(port %d: %s)", m[i].u.i.portnum, m[i].u.i.portname);
+				addstr(buffer);
+				color(cyan);
+				SPRINT(buffer, " %s %s%s%s%s", (m[i].u.i.ntmode)?"NT":"TE", (m[i].u.i.ptp)?"ptp":"ptmp", (m[i].u.i.l1hold)?" l1hold":"", (m[i].u.i.l2hold)?" l2hold":"", (m[i].u.i.extension)?" extension":"");
+				addstr(buffer);
+				if (m[i].u.i.use)
+					color(green);
+				else
+					color(blue);
+				SPRINT(buffer, " use:%d", m[i].u.i.use);
 				addstr(buffer);
 				if (m[i].u.i.ptp || !m[i].u.i.ntmode)
 				{
 					color((m[i].u.i.l2link > 0)?green:red);
 					if (m[i].u.i.l2link < 0)
-						addstr("  L2 unknown");
+						addstr("  L2 unkn");
 					else
 						addstr((m[i].u.i.l2link)?"  L2 UP":"  L2 down");
+				} else
+				{
+					k = 0;
+					color(green);
+					j = 0;
+					while(j < 128)
+					{
+						if (m[i].u.i.l2mask[j>>3] & (1 << (j&7)))
+						{
+							SPRINT(buffer, "%s%d", k?",":"  TEI(", j);
+							addstr(buffer);
+							k = 1;
+						}
+						j++;
+					}
+					if (k)
+						addstr(")");
 				}
 				color((m[i].u.i.l1link > 0)?green:blue);
 				if (m[i].u.i.l1link < 0)
-					addstr("  L1 unknown");
+					addstr("  L1 unkn");
 				else
-					addstr((m[i].u.i.l1link)?"  L1 ACTIVE":"  L1 inactive");
+					addstr((m[i].u.i.l1link)?"  L1 UP":"  L1 down");
 				if (m[i].u.i.los)
 				{
 					color(red);
@@ -1393,7 +1422,7 @@ const char *admin_portinfo(int sock, int argc, char *argv[])
 			printf("\t port = unknown\n");
 		else
 			printf("\t port = %d \"%s\"\n",m[i].u.i.portnum, m[i].u.i.portname);
-		printf("\t extension = %s\n", (m[i].u.i.extension)?" yes":"no");
+		printf("\t extension = %s\n", (m[i].u.i.extension)?"yes":"no");
 		if (m[i].u.i.block >= 2)
 		{
 			printf("\t status = not loaded\n");
@@ -1403,7 +1432,7 @@ const char *admin_portinfo(int sock, int argc, char *argv[])
 				printf("\t status = blocked\n");
 			else
 				printf("\t status = unblocked\n");
-			printf("\t mode = %s %s\n", (m[i].u.i.ntmode)?"NT-mode":"TE-mode", (m[i].u.i.ptp)?"ptp ":"ptmp");
+			printf("\t mode = %s %s%s%s\n", (m[i].u.i.ntmode)?"NT-mode":"TE-mode", (m[i].u.i.ptp)?"ptp":"ptmp", (m[i].u.i.l1hold)?" l1hold":"", (m[i].u.i.l2hold)?" l2hold":"");
 			if (m[i].u.i.l1link < 0)
 				printf("\t l1 link = unknown\n");
 			else