[Linuxisns-commit] isnsNT/isnsserver/include iSNSdb.h, 1.6, 1.7 iSNSdefs.h, 1.6, 1.7 iSNSreg.h, 1.3, 1.4 iSNStypes.h, 1.8, 1.9

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

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

Modified Files:
	iSNSdb.h iSNSdefs.h iSNSreg.h iSNStypes.h 
Log Message:
Adding support for Portal Groups

Index: iSNStypes.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iSNStypes.h	14 Dec 2006 23:04:27 -0000	1.8
--- iSNStypes.h	15 Dec 2006 18:17:18 -0000	1.9
***************
*** 276,280 ****
        DD_ID_KEY,
        ISCSI_ID_KEY,
!       ESI_KEY,
        ENTITY_IDX_KEY,
        ISCSI_IDX_KEY,
--- 276,280 ----
        DD_ID_KEY,
        ISCSI_ID_KEY,
!       PORTAL_GROUP_ID_KEY,
        ENTITY_IDX_KEY,
        ISCSI_IDX_KEY,
***************
*** 523,533 ****
  } SOIP_Prot_Ver;
  
- typedef struct soip_esi_type {
- 
-     /* SOIP_Entity_Type esi_port_type; */
-     uint32_t         ip_port;
- 
- } SOIP_ESI_Type;
- 
  typedef struct soip_entity {
  
--- 523,526 ----
***************
*** 536,543 ****
      uint32_t         esi;
      SOIP_Entity_Type eid_type;
-     SOIP_ESI_Type    esi_type;
      SOIP_Port_List   port_list;
  
- 
      /* iSNS Stuff */
      uint32_t             entity_index;
--- 529,534 ----
***************
*** 599,606 ****
  } SOIP_Portal;
  
! typedef struct soip_esi {
      IP_Address       ip_addr;
      uint32_t         ip_port;
! } SOIP_ESI, SOIP_Portal_Key;
  
  /*
--- 590,614 ----
  } SOIP_Portal;
  
! typedef struct soip_portal_key {
      IP_Address       ip_addr;
      uint32_t         ip_port;
! } SOIP_Portal_Key;
! 
! typedef struct soip_portal_group {
!     SOIP_ISCSI_Node_Id      id;
!     IP_Address       ip_addr;
!     uint32_t         ip_port;
!     uint32_t         portal_tag;
! 
!    /* More iSNS Stuff */
!    uint32_t          portal_group_index;
! 
! } SOIP_Portal_Group;
! 
! typedef struct soip_portal_group_key {
!     SOIP_ISCSI_Node_Id  id;
!     IP_Address       ip_addr;
!     uint32_t         ip_port;
! } SOIP_Portal_Group_Key;
  
  /*
***************
*** 729,732 ****
--- 737,741 ----
          SOIP_DB_Portal    portal_idx;
          SOIP_DB_List      list;
+         SOIP_Portal_Group portal_group; 
      } data;
  
***************
*** 756,765 ****
          SOIP_Prot_Ver      prot_ver;
          SOIP_Port_Type     port_type;
-         uint32_t           integer32;
          SOIP_IDX_Key       idx;
          SOIP_LIST_Key      list;
      } val;
  
! } ISNS_Key;
  
  /*
--- 765,773 ----
          SOIP_Prot_Ver      prot_ver;
          SOIP_Port_Type     port_type;
          SOIP_IDX_Key       idx;
          SOIP_LIST_Key      list;
      } val;
  
! } ISNS_Key, ISNS_DBKey;
  
  /*
***************
*** 838,849 ****
  extern ISNS_Entity isns_role;
  
- #ifndef PAD4
- #define PAD4(a)   ((a%4)?(4-a%4)+a:(a+4))
- #endif
- 
- #ifndef MAX
- #define MAX(a,b)   ((a) >= (b) ? (a) : (b))
- #endif
- 
- 
  #endif
--- 846,848 ----

Index: iSNSreg.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSreg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iSNSreg.h	14 Dec 2006 23:04:27 -0000	1.3
--- iSNSreg.h	15 Dec 2006 18:17:18 -0000	1.4
***************
*** 96,100 ****
  int
  ISNSdbAddAttrPortal (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md,
!                     ISNS_Msg * p_rspmsg);\
  
  int
--- 96,103 ----
  int
  ISNSdbAddAttrPortal (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md,
!                     ISNS_Msg * p_rspmsg);
! 
! int
! ISNSdbAddAttrPortalGroup (char **attr_indx, char **key_indx, ISNS_Msg_Descp * p_md, ISNS_Msg * p_rspmsg);
  
  int

Index: iSNSdefs.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSdefs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** iSNSdefs.h	13 Dec 2006 23:53:01 -0000	1.6
--- iSNSdefs.h	15 Dec 2006 18:17:18 -0000	1.7
***************
*** 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)
***************
*** 89,92 ****
--- 91,95 ----
  #define ISNS_SCN_BITMAP_SIZE       (4)
  #define ISNS_PORTAL_GROUP_SIZE     (4)
+ #define ISNS_PORTAL_GROUP_TAG_SIZE (4)
  
  #define DD_SET_ID_SIZE             (4)
***************
*** 303,307 ****
  
  #ifndef PAD4
! #define PAD4(a)   ( (a%4)?(4-a%4)+a:(a+4) )
  #endif
  
--- 306,310 ----
  
  #ifndef PAD4
! #define PAD4(a)   ( (a % 4) ? (4 - (a % 4) ) + a: (a+4) )
  #endif
  

Index: iSNSdb.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSdb.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** iSNSdb.h	15 Dec 2006 01:13:29 -0000	1.6
--- iSNSdb.h	15 Dec 2006 18:17:18 -0000	1.7
***************
*** 73,76 ****
--- 73,77 ----
     int num_ifcp;
     int num_portals;
+    int num_portal_groups;
  } dbStats;