[Linuxisns-commit] isnsNT/isnsclient/src ifcp.c, 1.3, 1.4 iscsi.c, 1.4, 1.5 isns.c, 1.4, 1.5 parse.c, 1.4, 1.5 portal.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-serv7738/isnsclient/src

Modified Files:
	ifcp.c iscsi.c isns.c parse.c portal.c 
Log Message:
Portal Group Update

Index: ifcp.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/ifcp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ifcp.c	28 Nov 2006 22:00:47 -0000	1.3
--- ifcp.c	18 Dec 2006 23:00:03 -0000	1.4
***************
*** 269,273 ****
  
        /* Get Portal Group */
!       if (0 != GetInput (cmdLine, "Portal Group", NULL, sizeof (cmdLine)))
        {
           portal_group = atoi (cmdLine);
--- 269,273 ----
  
        /* Get Portal Group */
!       if (0 != GetInput (cmdLine, "Portal Group Tag", NULL, sizeof (cmdLine)))
        {
           portal_group = atoi (cmdLine);
***************
*** 278,282 ****
           }
           memset (cmdLine, 0, sizeof (cmdLine));
!          ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP, 4, NULL, portal_group);
        }
  
--- 278,282 ----
           }
           memset (cmdLine, 0, sizeof (cmdLine));
!          ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP_TAG, 4, NULL, portal_group);
        }
  

Index: isns.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** isns.c	8 Dec 2006 20:05:49 -0000	1.4
--- isns.c	18 Dec 2006 23:00:04 -0000	1.5
***************
*** 1615,1625 ****
  }
  
- void
- SaveDb(void)
- {
-    ISNSCreateHdr (ISNS_SAVE_DB_REQ, &cmd, sizeof (cmd), 0);
-    ISNSAppendAttr (&cmd, ISNS_COMPANY_OUI, ISNS_COMPANY_OUI_SIZE, NULL, NISHAN_OUI);
-    ISNSSendCmd(&cmd);
- }
  
  
--- 1615,1618 ----

Index: portal.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/portal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** portal.c	14 Dec 2006 23:04:47 -0000	1.6
--- portal.c	18 Dec 2006 23:00:04 -0000	1.7
***************
*** 144,151 ****
           printf ("ESI Interval : %d.\n", p_attr->val.etype);
           break;
-       case ISNS_PORTAL_GROUP:
-          p_attr->val.etype = ntohl (p_attr->val.etype);
-          printf ("Portal Group: %#x.\n", p_attr->val.etype);
-          break;
        case ISNS_PORTAL_IDX:
           p_attr->val.etype = ntohl (p_attr->val.etype);
--- 144,147 ----
***************
*** 256,260 ****
     ISNSAppendAttr (&cmd, ISNS_PORTAL_IDX, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_PORTAL_PORT, 0, NULL, 0);
-    ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_PORTAL_SYM_NAME, 0, NULL, 0);
     ISNSAppendAttr (&cmd, ISNS_ESI_PORT, 0, NULL, 0);
--- 252,255 ----
***************
*** 362,370 ****
  
     /* Get Portal Group */
!    if (0 != GetInput (cmdLine, "Portal Group", NULL, sizeof (cmdLine)))
     {
        portal_group = atoi (cmdLine);
        memset (cmdLine, 0, sizeof (cmdLine));
!       ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP, 4, NULL, portal_group);
     }
  
--- 357,365 ----
  
     /* Get Portal Group */
!    if (0 != GetInput (cmdLine, "Portal Group Tag", NULL, sizeof (cmdLine)))
     {
        portal_group = atoi (cmdLine);
        memset (cmdLine, 0, sizeof (cmdLine));
!       ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP_TAG, 4, NULL, portal_group);
     }
  

Index: iscsi.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/iscsi.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** iscsi.c	28 Nov 2006 22:00:47 -0000	1.4
--- iscsi.c	18 Dec 2006 23:00:03 -0000	1.5
***************
*** 617,630 ****
  
        /* Get Portal Group */
!       if (0 != GetInput (cmdLine, "Portal Group", NULL, sizeof (cmdLine)))
        {
           portal_group = atoi (cmdLine);
           if (portal_group > 255 || portal_group == 0)
           {
!             printf ("***ERROR: Invalid portal group.\n");
              return;
           }
           memset (cmdLine, 0, sizeof (cmdLine));
!          ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP, 4, NULL, portal_group);
        }
  
--- 617,630 ----
  
        /* Get Portal Group */
!       if (0 != GetInput (cmdLine, "Portal Group Tag", NULL, sizeof (cmdLine)))
        {
           portal_group = atoi (cmdLine);
           if (portal_group > 255 || portal_group == 0)
           {
!             printf ("***ERROR: Invalid portal group tag.\n");
              return;
           }
           memset (cmdLine, 0, sizeof (cmdLine));
!          ISNSAppendAttr (&cmd, ISNS_PORTAL_GROUP_TAG, 4, NULL, portal_group);
        }
  

Index: parse.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/parse.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** parse.c	8 Dec 2006 20:05:49 -0000	1.4
--- parse.c	18 Dec 2006 23:00:04 -0000	1.5
***************
*** 67,71 ****
  		case ISNS_REL_SW_ID_REQ        : return("Release Switch ID Request");
  		case ISNS_GET_SW_ID_REQ        : return("Get Switch ID Request");
- 		case ISNS_SAVE_DB_REQ          : return("Save Database Request");
  		case ISNS_REG_DEV_ATTR_RES     : return("Register Device Attribute Response");
  		case ISNS_DEV_ATTR_QRY_RES     : return("Device Attribute Query Response");
--- 67,70 ----
***************
*** 84,88 ****
  		case ISNS_REL_SW_ID_RES        : return("Release Switch ID Response");
  		case ISNS_GET_SW_ID_RES        : return("Get Switch ID Response");
- 		case ISNS_SAVE_DB_RES          : return("Save Database Response");
  		default                        : return("");
  	}
--- 83,86 ----
***************
*** 107,111 ****
  		case ISNS_ESI_INTERVAL       : return("ESI Interval");
  		case ISNS_ESI_PORT           : return("ESI/SCN UDP Port");
- 		case ISNS_PORTAL_GROUP       : return("Portal Group");
  		case ISNS_PORTAL_CERT        : return("Portal Certificate");
  		case ISNS_ISCSI_NODE_ID      : return("iSCSI Name");
--- 105,108 ----
***************
*** 242,246 ****
        case ISNS_DDS_SYM_NAME       :
        case ISNS_DD_SYM_NAME        :
-       case ISNS_PORTAL_GROUP       :
        case ISNS_ISCSI_NODE_ID      :
        case ISNS_ISCSI_ALIAS        :
--- 239,242 ----