From: Robert W. <wrw...@us...> - 2006-12-18 23:00:07
|
Update of /cvsroot/linuxisns/isnsNT/isnsclient/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7738/isnsclient/include Modified Files: iSNSdefs.h Log Message: Portal Group Update Index: iSNSdefs.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsclient/include/iSNSdefs.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** iSNSdefs.h 2 Apr 2002 20:56:54 -0000 1.2 --- iSNSdefs.h 18 Dec 2006 23:00:03 -0000 1.3 *************** *** 58,61 **** --- 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) *************** *** 88,92 **** #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) *************** *** 145,151 **** ISNS_ENTITY_GET_NXT_PORTAL_REQ, - /* Nishan vendor specific messages */ - ISNS_SAVE_DB_REQ=0x100, - /* End */ ISNS_END_VALID_REQ_FUNC_ID, --- 147,150 ---- *************** *** 172,179 **** ISNS_ENTITY_GET_NXT_PORTAL_RES, - /* Nishan specific messages */ - ISNS_SAVE_DB_RES=0x8100, - /* End */ - ISNS_END_VALID_RES_FUNC_ID, --- 171,174 ---- *************** *** 200,205 **** ISNS_ESI_INTERVAL, ISNS_ESI_PORT, ! ISNS_PORTAL_GROUP, ! ISNS_PORTAL_IDX, ISNS_PORTAL_CERT=31, --- 195,201 ---- ISNS_ESI_INTERVAL, ISNS_ESI_PORT, ! ISNS_PORTAL_IDX=22, ! ISNS_SCN_PORT=23, ! ISNS_PORTAL_SECURITY_BITMAP=27, ISNS_PORTAL_CERT=31, *************** *** 211,214 **** --- 207,215 ---- 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, *************** *** 263,267 **** /* ISNS Entity types */ typedef enum { ! ENTITY_TYPE_ISCSI=1, ENTITY_TYPE_IFCP, } ISNS_ENITITY_TYPES; --- 264,269 ---- /* ISNS Entity types */ typedef enum { ! NO_PROTOCOL=1, ! ENTITY_TYPE_ISCSI, ENTITY_TYPE_IFCP, } ISNS_ENITITY_TYPES; *************** *** 302,306 **** #ifndef PAD4 ! #define PAD4(a) ( (a%4)?(4-a%4)+a:(a+4) ) #endif --- 304,308 ---- #ifndef PAD4 ! #define PAD4(a) ( (a % 4) ? (4 - (a % 4) ) + a: (a+4) ) #endif |