[Linuxisns-commit] iscsiClient/include iSNSdefs.h,1.1.1.1,1.2

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linuxisns/iscsiClient/include
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv23569/include

Modified Files:
	iSNSdefs.h 
Log Message:
add src attr and portal group support

Index: iSNSdefs.h
===================================================================
RCS file: /cvsroot/linuxisns/iscsiClient/include/iSNSdefs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** iSNSdefs.h	2 Apr 2002 02:57:40 -0000	1.1.1.1
--- iSNSdefs.h	2 Jan 2007 20:12:06 -0000	1.2
***************
*** 1,43 ****
  #if 0
! /***********************************************************************
! / Copyright (c) 2001, Nishan Systems, Inc.
! / All rights reserved.
! / 
! / Redistribution and use in source and binary forms, with or without 
! / modification, are permitted provided that the following conditions are 
! / met:
! / 
! / - Redistributions of source code must retain the above copyright notice, 
! /   this list of conditions and the following disclaimer. 
! / 
! / - Redistributions in binary form must reproduce the above copyright 
! /   notice, this list of conditions and the following disclaimer in the 
! /   documentation and/or other materials provided with the distribution. 
! / 
! / - Neither the name of the Nishan Systems, Inc. nor the names of its 
! /   contributors may be used to endorse or promote products derived from 
! /   this software without specific prior written permission. 
! / 
! / THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
! / AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
! / IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A 
! / PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. 
! / OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
! / EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
! / PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
! / OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
! / WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
! / OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
! / ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
! /
! /***********************************************************************/
! 		
! /* Contribuing authors: 
! *Tom McSweeney <rf4...@us...>, 
! *Curt du Laney <du...@us...>
! *IBM Research Triangle Park
! *
! /***********************************************************************/
! 
  #endif
  
--- 1,35 ----
  #if 0
! ***********************************************************************
!   Copyright (c) 2001, Nishan Systems, Inc.
!   All rights reserved.
!   
!   Redistribution and use in source and binary forms, with or without 
!   modification, are permitted provided that the following conditions are 
!   met:
!   
!   - Redistributions of source code must retain the above copyright notice, 
!     this list of conditions and the following disclaimer. 
!   
!   - Redistributions in binary form must reproduce the above copyright 
!     notice, this list of conditions and the following disclaimer in the 
!     documentation and/or other materials provided with the distribution. 
!   
!   - Neither the name of the Nishan Systems, Inc. nor the names of its 
!     contributors may be used to endorse or promote products derived from 
!     this software without specific prior written permission. 
!   
!   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
!   AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
!   IMPLIED WARRANTIES OF MERCHANTABILITY, NON-INFRINGEMENT AND FITNESS FOR A 
!   PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NISHAN SYSTEMS, INC. 
!   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
!   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
!   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
!   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
!   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 
!   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 
!   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
!  
! ***********************************************************************/
  #endif
  
***************
*** 45,50 ****
  #define _ISNSDEFS_H_
  
  #define ISNS_ISCSI_TYPE_SIZE       (4)
! #define ISNS_COMPANY_OUI_SIZE      (256)
  #define ISNS_VENDOR_ID_SIZE        (256)
  #define ISNS_NODE_ACTIVE_SIZE      (4)
--- 37,44 ----
  #define _ISNSDEFS_H_
  
+ #define ISNS_VER_SIZE               (4)
+ #define ISNS_DD_FEATURE_BITMAP_SIZE (4)
  #define ISNS_ISCSI_TYPE_SIZE       (4)
! #define ISNS_COMPANY_OUI_SIZE      (4)
  #define ISNS_VENDOR_ID_SIZE        (256)
  #define ISNS_NODE_ACTIVE_SIZE      (4)
***************
*** 64,67 ****
--- 58,63 ----
  #define ISNS_PORTAL_IP_SIZE        (16)
  #define ISNS_PORTAL_PORT_SIZE      (4)
+ #define ISNS_PORTAL_GROUP_IP_SIZE  (16)
+ #define ISNS_PORTAL_GROUP_PORT_SIZE (4)
  #define ISNS_ESI_PORT_SIZE         (4)
  #define PORTAL_NAME_SIZE           (ISNS_PORTAL_PORT_SIZE+ISNS_PORTAL_IP_SIZE)
***************
*** 94,98 ****
  #define FC_DESCRIPTOR_SIZE         (256)
  #define ISNS_SCN_BITMAP_SIZE       (4)
! #define ISNS_PORTAL_GROUP_SIZE     (4)
  
  #define DD_SET_ID_SIZE             (4)
--- 90,94 ----
  #define FC_DESCRIPTOR_SIZE         (256)
  #define ISNS_SCN_BITMAP_SIZE       (4)
! #define ISNS_PORTAL_GROUP_TAG_SIZE (4)
  
  #define DD_SET_ID_SIZE             (4)
***************
*** 123,126 ****
--- 119,124 ----
  #define ISNS_ISCSI_TYPE_REMOTE      (0x8)
  
+ #define ISNS_DD_FEATURE_BOOT_LIST_BIT (0x1)
+ 
  /* ISNS FUNCTION IDs */
  typedef enum {
***************
*** 145,156 ****
     ISNS_REL_SW_ID_REQ,
     ISNS_GET_SW_ID_REQ,
-    ISNS_SAVE_DB_REQ=0x100,
- 
-    /* Nishan specific messages */
-    ISNS_SCN_CALLBACK_REQ,
     ISNS_DDS_GET_NXT_MEMBER_REQ,
     ISNS_DD_GET_NXT_ISCSI_MEMBER_REQ,
     ISNS_ENTITY_GET_NXT_PORTAL_REQ,
!    /* End */
     ISNS_END_VALID_REQ_FUNC_ID,
  
--- 143,150 ----
     ISNS_REL_SW_ID_REQ,
     ISNS_GET_SW_ID_REQ,
     ISNS_DDS_GET_NXT_MEMBER_REQ,
     ISNS_DD_GET_NXT_ISCSI_MEMBER_REQ,
     ISNS_ENTITY_GET_NXT_PORTAL_REQ,
! 
     ISNS_END_VALID_REQ_FUNC_ID,
  
***************
*** 173,184 ****
     ISNS_REL_SW_ID_RES,
     ISNS_GET_SW_ID_RES,
-    ISNS_SAVE_DB_RES=0x8100,
- 
-    /* Nishan specific messages */
-    ISNS_SCN_CALLBACK_RES,
     ISNS_DDS_GET_NXT_MEMBER_RES,
     ISNS_DD_GET_NXT_ISCSI_MEMBER_RES,
     ISNS_ENTITY_GET_NXT_PORTAL_RES,
-    /* End */
  
     ISNS_END_VALID_RES_FUNC_ID,
--- 167,173 ----
***************
*** 196,200 ****
     ISNS_TIMESTAMP,
     ISNS_PROT_VER,
!    ISNS_ENTITY_PERIOD,
     ISNS_ENTITY_SCN_BITMAP,
     ISNS_ENTITY_IDX=14,
--- 185,189 ----
     ISNS_TIMESTAMP,
     ISNS_PROT_VER,
!    ISNS_ENTITY_PERIOD, /* REGISTRATION PERIOD */
     ISNS_ENTITY_SCN_BITMAP,
     ISNS_ENTITY_IDX=14,
***************
*** 206,211 ****
     ISNS_ESI_INTERVAL,
     ISNS_ESI_PORT,
!    ISNS_PORTAL_GROUP,
!    ISNS_PORTAL_IDX,
     ISNS_PORTAL_CERT=31,
  
--- 195,202 ----
     ISNS_ESI_INTERVAL,
     ISNS_ESI_PORT,
!    /* ISNS_PORTAL_GROUP, -- tag removed from RFC spec */
!    ISNS_PORTAL_IDX=22,
!    ISNS_SCN_PORT=23,
!    ISNS_PORTAL_SECURITY_BITMAP=27,
     ISNS_PORTAL_CERT=31,
  
***************
*** 217,220 ****
--- 208,216 ----
     ISNS_ISCSI_CERT=40,
  
+    ISNS_PORTAL_GROUP_ISCSI_NAME=48,
+    ISNS_PORTAL_GROUP_IP,
+    ISNS_PORTAL_GROUP_PORT,
+    ISNS_PORTAL_GROUP_TAG=51,
+ 
     ISNS_PORT_NAME=64,                         /* 64 */
     ISNS_PORT_ID,
***************
*** 230,234 ****
     ISNS_IFCP_SCN_BITMAP,
     ISNS_IFCP_NODE_CERT=80,
!    iSNS_FC3_TYPE_QUERY_KEY=95,
  
     ISNS_NODE_NAME=96,
--- 226,230 ----
     ISNS_IFCP_SCN_BITMAP,
     ISNS_IFCP_NODE_CERT=80,
!    iSNS_FC4_TYPE_QUERY_KEY=95,
  
     ISNS_NODE_NAME=96,
***************
*** 246,256 ****
     ISNS_DD_ISCSI_MEMBER,
     ISNS_DD_IFCP_MEMBER,
  
     ISNS_COMPANY_OUI = 256,
  
!    /* Nishan specific tags */
!    ISNS_SCN_CALLBACK = 257, /* Vendor Specific */
!    ISNS_DD_ACTIVE,          /* Vendor Specific */ 
!    ISNS_NODE_ACTIVE,        /* Vendor Specific */
     ISNS_END_VALID_TAG
  
--- 242,262 ----
     ISNS_DD_ISCSI_MEMBER,
     ISNS_DD_IFCP_MEMBER,
+    ISNS_DD_FEATURE_BITMAP,
+ 
+    /* Server specific tags */
+    ISNS_VENDOR_ID = 131,
+    ISNS_VENDOR_REV,
+    ISNS_PRIMARY_VER,
+    ISNS_PRIMARY_IP,
+    ISNS_PRIMARY_TCP_PORT,
+    ISNS_PRIMARY_UDP_PORT,
+    ISNS_PRIMARY_MGMT_IP,
  
     ISNS_COMPANY_OUI = 256,
  
!    /* Nishan vendor specific tags */
!    ISNS_SCN_CALLBACK = 257,
!    ISNS_DD_ACTIVE,
!    ISNS_NODE_ACTIVE,
     ISNS_END_VALID_TAG
  
***************
*** 259,263 ****
  /* ISNS Entity types */
  typedef enum {
!    ENTITY_TYPE_ISCSI=1,
     ENTITY_TYPE_IFCP,
  } ISNS_ENITITY_TYPES;
--- 265,270 ----
  /* ISNS Entity types */
  typedef enum {
!    NO_PROTOCOL=1,
!    ENTITY_TYPE_ISCSI,
     ENTITY_TYPE_IFCP,
  } ISNS_ENITITY_TYPES;
***************
*** 298,302 ****
  
  #ifndef PAD4
! #define PAD4(a)   ( (a%4)?(4-a%4)+a:(a+4) )
  #endif
  
--- 305,309 ----
  
  #ifndef PAD4
! #define PAD4(a)   ( (a % 4) ? (4 - (a % 4) ) + a: (a+4) )
  #endif