[Linuxisns-commit] isnsNT/isnsclient/src isns.c, 1.8, 1.9 parse.c, 1.6, 1.7

[Robert W. <wrw...@us...>]

Update of /cvsroot/linuxisns/isnsNT/isnsclient/src
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6824/src

Modified Files:
	isns.c parse.c 
Log Message:
enhance DD and DDS information

Index: isns.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** isns.c	12 Jan 2007 21:12:33 -0000	1.8
--- isns.c	16 Jan 2007 20:22:54 -0000	1.9
***************
*** 213,222 ****
        case ISNS_DDS_STATUS:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("Status: %#x\n", p_attr->val.etype);
           break;
        case ISNS_DD_ID:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("DD ID : %d\n", p_attr->val.etype);
           break;
        default:
           break;
--- 213,228 ----
        case ISNS_DDS_STATUS:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("Status: %s\n", p_attr->val.etype?"Active":"Disabled");
           break;
        case ISNS_DD_ID:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("   DD ID : %d\n", p_attr->val.etype);
!          break;
!       case ISNS_DD_SYM_NAME:
!          printf ("   DD Sym Name : %s\n",(char *)&p_attr->val);
           break;
+       case ISNS_DD_ACTIVE:
+          p_attr->val.etype = ntohl (p_attr->val.etype);
+          printf ("Status: %s\n", p_attr->val.etype?"Active":"Disabled");
        default:
           break;
***************
*** 287,290 ****
--- 293,297 ----
     ISNSAppendAttr (&cmd, ISNS_DDS_STATUS, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0);
+    ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0);
  
     if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer)))
***************
*** 320,331 ****
        case ISNS_DDS_ID:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("DDS ID : %d\n", p_attr->val.etype);
           break;
        case ISNS_DD_ISCSI_MEMBER_IDX:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("DD iSCSI Member Index  : %d\n", p_attr->val.etype);
           break;
        case ISNS_DD_ISCSI_MEMBER:
!          printf ("DD iSCSI Member : %s\n",(char *)&p_attr->val);
           break;
        case ISNS_DD_IFCP_MEMBER:
--- 327,341 ----
        case ISNS_DDS_ID:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("   DDS ID : %d\n", p_attr->val.etype);
!          break;
!       case ISNS_DDS_SYM_NAME:
!          printf ("   DDS Sym Name : %s\n",(char *)&p_attr->val);
           break;
        case ISNS_DD_ISCSI_MEMBER_IDX:
           p_attr->val.etype = ntohl (p_attr->val.etype);
!          printf ("   DD iSCSI Member Index  : %d\n", p_attr->val.etype);
           break;
        case ISNS_DD_ISCSI_MEMBER:
!          printf ("   DD iSCSI Member : %s\n",(char *)&p_attr->val);
           break;
        case ISNS_DD_IFCP_MEMBER:
***************
*** 333,337 ****
              char buffer2[256];
              memset (buffer2, 0, sizeof (buffer2));
!             printf ("iFCP WWPN  : %s\n",
                      HexToAscii ((char *)&p_attr->val, p_attr->len, buffer2));
              break;
--- 343,347 ----
              char buffer2[256];
              memset (buffer2, 0, sizeof (buffer2));
!             printf ("   iFCP WWPN  : %s\n",
                      HexToAscii ((char *)&p_attr->val, p_attr->len, buffer2));
              break;
***************
*** 403,411 ****
     ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0);
-    ISNSAppendAttr (&cmd, ISNS_DDS_ID, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_FEATURE_BITMAP, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_IFCP_MEMBER, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER_IDX, 0, NULL, 0);
  
     if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer)))
--- 413,422 ----
     ISNSAppendAttr (&cmd, ISNS_DD_ID, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_SYM_NAME, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_FEATURE_BITMAP, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_IFCP_MEMBER, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_DD_ISCSI_MEMBER_IDX, 0, NULL, 0);
+    ISNSAppendAttr (&cmd, ISNS_DDS_ID, 0, NULL, 0);
+    ISNSAppendAttr (&cmd, ISNS_DDS_SYM_NAME, 0, NULL, 0);
  
     if (0 == ISNSSendCmd2 (&cmd, buffer, sizeof (buffer)))

Index: parse.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/parse.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** parse.c	19 Dec 2006 20:33:49 -0000	1.6
--- parse.c	16 Jan 2007 20:22:54 -0000	1.7
***************
*** 332,336 ****
        case ISNS_FC_NODE_CERT       :
        case ISNS_COMPANY_OUI        :
-       default:
           printf ("Tag: %s = ", isnsTagText(attrtag));
           for (valword=(int *)&p_attr->val.etype, i = 0; i<attrlen; i+=4) {
--- 332,335 ----
***************
*** 339,342 ****
--- 338,344 ----
           printf("\n");
           break;
+       default:
+          printf ("Tag: %s \n", isnsTagText(attrtag));
+          break;
        }
        ptr += (attrlen + 8);