[Linuxisns-commit] isnsNT/isnsserver/include iSNSdefs.h,1.10,1.11

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

Update of /cvsroot/linuxisns/isnsNT/isnsserver/include
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13158/isnsserver/include

Modified Files:
	iSNSdefs.h 
Log Message:
update isns protocol message tags to match rfc spec

Index: iSNSdefs.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSdefs.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** iSNSdefs.h	13 Aug 2007 22:56:44 -0000	1.10
--- iSNSdefs.h	24 Aug 2007 23:27:09 -0000	1.11
***************
*** 181,184 ****
--- 181,185 ----
     ISNS_START_VALID_TAG=1,
  
+    /* ENTITY tags */
     ISNS_ENTITY_ID=ISNS_START_VALID_TAG,       /* 1 */
     ISNS_ENTITY_TYPE,
***************
*** 186,190 ****
     ISNS_TIMESTAMP,
     ISNS_PROT_VER,
!    ISNS_ENTITY_PERIOD, /* REGISTRATION PERIOD */
     ISNS_ENTITY_IDX,
     ISNS_ENTITY_NEXT_IDX,
--- 187,191 ----
     ISNS_TIMESTAMP,
     ISNS_PROT_VER,
!    ISNS_ENTITY_PERIOD,                        /* REGISTRATION PERIOD */
     ISNS_ENTITY_IDX,
     ISNS_ENTITY_NEXT_IDX,
***************
*** 192,195 ****
--- 193,197 ----
     ISNS_ENTITY_CERT,
  
+    /* PORT tags */
     ISNS_PORTAL_IP=16,                         /* 16 */
     ISNS_PORTAL_PORT,
***************
*** 197,206 ****
     ISNS_ESI_INTERVAL,
     ISNS_ESI_PORT,
!    ISNS_PORTAL_GROUP,              /* tag was removed from RFC spec */
     ISNS_PORTAL_IDX=22,
!    ISNS_SCN_PORT=23,
     ISNS_PORTAL_SECURITY_BITMAP=27,
     ISNS_PORTAL_CERT=31,
  
     ISNS_ISCSI_NODE_ID=32,                     /* 32 */
     ISNS_ISCSI_TYPE,
--- 199,210 ----
     ISNS_ESI_INTERVAL,
     ISNS_ESI_PORT,
!    ISNS_PORTAL_GROUP,                        /* tag was removed from RFC spec */
     ISNS_PORTAL_IDX=22,
!    ISNS_SCN_PORT,
!    ISNS_PORTAL_NEXT_IDX,
     ISNS_PORTAL_SECURITY_BITMAP=27,
     ISNS_PORTAL_CERT=31,
  
+    /* ISCSI node tags */
     ISNS_ISCSI_NODE_ID=32,                     /* 32 */
     ISNS_ISCSI_TYPE,
***************
*** 208,218 ****
     ISNS_ISCSI_SCN_BITMAP,
     ISNS_ISCSI_IDX,
     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,
--- 212,228 ----
     ISNS_ISCSI_SCN_BITMAP,
     ISNS_ISCSI_IDX,
+    ISNS_WWNN_TOKEN,
+    ISNS_ISCSI_NEXT_IDX,
     ISNS_ISCSI_CERT=40,
  
+    /* PORTAL_GROUP tags */
     ISNS_PORTAL_GROUP_ISCSI_NAME=48,
     ISNS_PORTAL_GROUP_IP,
     ISNS_PORTAL_GROUP_PORT,
!    ISNS_PORTAL_GROUP_TAG,
!    ISNS_PORTAL_GROUP_IDX,
!    ISNS_PORTAL_GROUP_NEXT_IDX,
  
+    /* FC */
     ISNS_PORT_NAME=64,                         /* 64 */
     ISNS_PORT_ID,
***************
*** 229,234 ****
     ISNS_IFCP_NODE_CERT=80,
     iSNS_FC4_TYPE_QUERY_KEY=95,
! 
!    ISNS_NODE_NAME=96,
     ISNS_NODE_SYM_NAME,
     ISNS_FC_NODE_IP,
--- 239,243 ----
     ISNS_IFCP_NODE_CERT=80,
     iSNS_FC4_TYPE_QUERY_KEY=95,
!    ISNS_NODE_NAME,
     ISNS_NODE_SYM_NAME,
     ISNS_FC_NODE_IP,
***************
*** 236,249 ****
     ISNS_FC_NODE_CERT,
  
-    ISNS_DDS_ID=101,
-    ISNS_DDS_SYM_NAME,
-    ISNS_DDS_STATUS,
-    ISNS_DD_ID,
-    ISNS_DD_SYM_NAME,
-    ISNS_DD_ISCSI_MEMBER_IDX,
-    ISNS_DD_ISCSI_MEMBER,
-    ISNS_DD_IFCP_MEMBER,
-    ISNS_DD_FEATURE_BITMAP,
- 
     /* Server specific tags */
     ISNS_VENDOR_ID = 131,
--- 245,248 ----
***************
*** 261,265 ****
     ISNS_DD_ACTIVE,
     ISNS_NODE_ACTIVE,
!    ISNS_END_VALID_TAG
  
  } ISNS_TAG;
--- 260,281 ----
     ISNS_DD_ACTIVE,
     ISNS_NODE_ACTIVE,
!    ISNS_END_VALID_TAG,
! 
!    /* DDS tags */
!    ISNS_DDS_ID=2049,
!    ISNS_DDS_SYM_NAME,
!    ISNS_DDS_STATUS,
! 
!    /* DD tags */
!    ISNS_DD_ID=2065,
!    ISNS_DD_SYM_NAME,
!    ISNS_DD_ISCSI_MEMBER_IDX,
!    ISNS_DD_ISCSI_MEMBER,
!    ISNS_DD_IFCP_MEMBER,
!    ISNS_DD_PORTAL_MEMBER_IDX,
!    ISNS_DD_PORTAL_IP_ADDR,
!    ISNS_DD_PORTAL_TCPUDP,
!    ISNS_DD_FEATURE_BITMAP=2078,
!    ISNS_DD_NEXT_ID
  
  } ISNS_TAG;