work...

[lcr.git] / admin_client.c

diff --git a/admin_client.c b/admin_client.c
index dac2b78..215aa46 100644 (file)
--- 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])
                                                        {