X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=admin_client.c;h=215aa462b6a4cbb8e553aaa01da1f4e19dda392f;hp=dac2b7858429e33cb382d4632ed85d6528d72e8f;hb=00e1539a7f81ea0d72dbf3ebe5dc1b8e7c047b55;hpb=b359d75e7deafce687e4e25abbb30b65738d64f0

diff --git a/admin_client.c b/admin_client.c
index dac2b78..215aa46 100644
--- a/admin_client.c
+++ b/admin_client.c
@@ -712,46 +712,43 @@ char *admin_state(int sock, char *argv[])
 							else
 								SPRINT(buffer,"B%2d: ", j+1);
 							addstr(buffer);
-							if (!m[i].u.i.ptp)
-								goto ptmp;
-							if (m[i].u.i.l2link && m[i].u.i.block==0)
+							switch(m[i].u.i.busy[j])
 							{
-								ptmp:
-								switch(m[i].u.i.busy[j])
+								case B_STATE_IDLE:
+								if ((!m[i].u.i.l2link && m[i].u.i.ptp) || m[i].u.i.block)
+								{
+									color(red);
+									addstr("blocked ");
+								} else
 								{
-									case B_STATE_IDLE:
 									color(blue);
 									addstr("idle    ");
-									break;
-									case B_STATE_ACTIVATING:
-									color(yellow);
-									addstr("act'ing ");
-									break;
-									case B_STATE_ACTIVE:
-									color(green);
-									addstr("busy    ");
-									break;
-									case B_STATE_DEACTIVATING:
-									color(yellow);
-									addstr("dact'ing");
-									break;
-									case B_STATE_EXPORTING:
-									color(yellow);
-									addstr("exp'ing ");
-									break;
-									case B_STATE_REMOTE:
-									color(green);
-									addstr("remote  ");
-									break;
-									case B_STATE_IMPORTING:
-									color(yellow);
-									addstr("imp'ing ");
-									break;
 								}
-							} else
-							{
-								color(red);
-								addstr("blocked ");
+								break;
+								case B_STATE_ACTIVATING:
+								color(yellow);
+								addstr("act'ing ");
+								break;
+								case B_STATE_ACTIVE:
+								color(green);
+								addstr("busy    ");
+								break;
+								case B_STATE_DEACTIVATING:
+								color(yellow);
+								addstr("dact'ing");
+								break;
+								case B_STATE_EXPORTING:
+								color(yellow);
+								addstr("exp'ing ");
+								break;
+								case B_STATE_REMOTE:
+								color(green);
+								addstr("remote  ");
+								break;
+								case B_STATE_IMPORTING:
+								color(yellow);
+								addstr("imp'ing ");
+								break;
 							}
 							if (m[i].u.i.port[j])
 							{