[Linuxisns-commit] isnsNT/isnsclient/src isns.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-serv2024/src

Modified Files:
	isns.c 
Log Message:
update control node

Index: isns.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/src/isns.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** isns.c	2 Jan 2007 20:15:24 -0000	1.6
--- isns.c	4 Jan 2007 18:58:36 -0000	1.7
***************
*** 134,138 ****
     src_type = 0;
     if (0 !=  GetInput (cmdLine,"SRC type",
!                  "*0:Control Node 1:iSCSI Node 3:iFCP Node", sizeof (cmdLine)))
     {
        src_type = atoi (cmdLine);
--- 134,138 ----
     src_type = 0;
     if (0 !=  GetInput (cmdLine,"SRC type",
!                  "*Default Control Node *1:Control Node 2:iSCSI Node 3:iFCP Node", sizeof (cmdLine)))
     {
        src_type = atoi (cmdLine);
***************
*** 142,155 ****
     {
     case 0:
!       if (0 ==  GetInput (cmdLine, "SRC: iSCSI Node Id", "(none)",sizeof (cmdLine)))
        {
!         ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0);
        }
!       else
!         ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (cmdLine)),cmdLine, 0);
  
        break;
  
!    case 1:
        if (0 == GetInput (cmdLine, "SRC: iSCSI Node Id", "(none)", sizeof (cmdLine)))
        {
--- 142,160 ----
     {
     case 0:
!       ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (CONTROL_NODE)),CONTROL_NODE, 0);
!       break;     
! 
!    case 1:
!       if (0 ==  GetInput (cmdLine, "SRC: Control Node Id", "(none)",sizeof (cmdLine)))
        {
!          printf ("***ERROR: You must enter an Node Id.\n");
!          return (-1);
        }
! 
!       ISNSAppendAttr (p_cmd, ISNS_ISCSI_NODE_ID, PAD4 (strlen (cmdLine)),cmdLine, 0);
  
        break;
  
!    case 2:
        if (0 == GetInput (cmdLine, "SRC: iSCSI Node Id", "(none)", sizeof (cmdLine)))
        {
***************
*** 161,165 ****
  
        break;
!    case 2:
        if (0 ==  GetHexInput (cmdLine, "SRC: iFCP Node WWPN", NULL, sizeof (cmdLine)))
        {
--- 166,171 ----
  
        break;
! 
!    case 3:
        if (0 ==  GetHexInput (cmdLine, "SRC: iFCP Node WWPN", NULL, sizeof (cmdLine)))
        {