[Linuxisns-commit] iscsiClient/include comm.h, 1.1.1.1, 1.2 iSNSdefs.h, 1.2, 1.3 isns.h, 1.3, 1.4

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

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

Modified Files:
	comm.h iSNSdefs.h isns.h 
Log Message:
Fix compile warnings for 64bit, update iSNSdef to lastest protocol

Index: isns.h
===================================================================
RCS file: /cvsroot/linuxisns/iscsiClient/include/isns.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** isns.h	11 Dec 2006 18:01:07 -0000	1.3
--- isns.h	14 Feb 2008 22:49:13 -0000	1.4
***************
*** 176,180 ****
  
  int
! ESIListener(DWORD lparam);
  
  #ifndef BUFFER_SIZE
--- 176,180 ----
  
  int
! ESIListener(LPVOID lparam);
  
  #ifndef BUFFER_SIZE

Index: comm.h
===================================================================
RCS file: /cvsroot/linuxisns/iscsiClient/include/comm.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** comm.h	2 Apr 2002 02:57:40 -0000	1.1.1.1
--- comm.h	14 Feb 2008 22:49:13 -0000	1.2
***************
*** 59,63 ****
  DWORD WINAPI
  #endif
! ESIListener(DWORD lparam);
  
  void SendESIRsp(void);
--- 59,63 ----
  DWORD WINAPI
  #endif
! ESIListener(LPVOID lparam);
  
  void SendESIRsp(void);
***************
*** 68,72 ****
  DWORD WINAPI
  #endif
! TCPReceiveMain(DWORD lparam);
  
  int
--- 68,72 ----
  DWORD WINAPI
  #endif
! TCPReceiveMain(LPVOID lparam);
  
  int

Index: iSNSdefs.h
===================================================================
RCS file: /cvsroot/linuxisns/iscsiClient/include/iSNSdefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iSNSdefs.h	2 Jan 2007 20:12:06 -0000	1.2
--- iSNSdefs.h	14 Feb 2008 22:49:13 -0000	1.3
***************
*** 180,183 ****
--- 180,185 ----
     ISNS_DELIMITER=0,
     ISNS_START_VALID_TAG=1,
+ 
+    /* ENTITY tags */
     ISNS_ENTITY_ID=ISNS_START_VALID_TAG,       /* 1 */
     ISNS_ENTITY_TYPE,
***************
*** 185,193 ****
     ISNS_TIMESTAMP,
     ISNS_PROT_VER,
!    ISNS_ENTITY_PERIOD, /* REGISTRATION PERIOD */
!    ISNS_ENTITY_SCN_BITMAP,
!    ISNS_ENTITY_IDX=14,
     ISNS_ENTITY_CERT,
  
     ISNS_PORTAL_IP=16,                         /* 16 */
     ISNS_PORTAL_PORT,
--- 187,197 ----
     ISNS_TIMESTAMP,
     ISNS_PROT_VER,
!    ISNS_ENTITY_PERIOD,                        /* REGISTRATION PERIOD */
!    ISNS_ENTITY_IDX,
!    ISNS_ENTITY_NEXT_IDX,
!    ISNS_ENTITY_ISAKMP=11,
     ISNS_ENTITY_CERT,
  
+    /* PORT tags */
     ISNS_PORTAL_IP=16,                         /* 16 */
     ISNS_PORTAL_PORT,
***************
*** 195,204 ****
     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,
  
     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,
***************
*** 206,216 ****
     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,
***************
*** 227,232 ****
     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,
***************
*** 234,247 ****
     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 ----
***************
*** 259,263 ****
     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;