[Linuxisns-commit] isnsNT/isnsserver/include iSNSList.h, 1.3, 1.4 iSNSobjects.h, 1.1, 1.2 iSNSreg.h, 1.7, 1.8 iSNStypes.h, 1.17, 1.18

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

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

Modified Files:
	iSNSList.h iSNSobjects.h iSNSreg.h iSNStypes.h 
Log Message:
abstract database read/write calls

Index: iSNSobjects.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSobjects.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** iSNSobjects.h	24 Aug 2007 22:51:34 -0000	1.1
--- iSNSobjects.h	27 Aug 2007 21:25:16 -0000	1.2
***************
*** 41,45 ****
  
  int
! read_ISCSIObject (char *p_id, SOIP_Iscsi ** p_entity, SOIP_DB_Entry *p_entry);
  
  int
--- 41,51 ----
  
  int
! read_FCNodeObject (char *p_id, SOIP_Fc_Node ** p_node, SOIP_DB_Entry *p_entry);
! 
! int
! read_FCPortObject (char *p_id, SOIP_Ifcp ** p_port, SOIP_DB_Entry *p_entry);
! 
! int
! read_ISCSIObject (char *p_id, SOIP_Iscsi ** p_node, SOIP_DB_Entry *p_entry);
  
  int
***************
*** 47,50 ****
--- 53,62 ----
  
  int
+ read_PortalObject (SOIP_Portal_Key *p_portal_key, SOIP_Portal ** p_portal, SOIP_DB_Entry *p_entry);
+ 
+ int
+ read_PortalGroupObject (SOIP_Portal_Group_Key *p_portal_key, SOIP_Portal_Group ** p_portal, SOIP_DB_Entry *p_entry);
+ 
+ int
  read_DDObject (int id, SOIP_Dd ** p_dd, SOIP_DB_Entry * p_entry);
  
***************
*** 52,56 ****
--- 64,83 ----
  read_DDSObject (int id, SOIP_Dds ** p_dds, SOIP_DB_Entry * p_entry);
  
+ int
+ read_EntityidxObject (int id, void **p_idx, SOIP_DB_Entry *p_entry);
+ 
+ int
+ read_ISCSIidxObject (int id, void **p_idx, SOIP_DB_Entry *p_entry);
+ 
+ int
+ read_PortalidxObject (int id, void **p_idx, SOIP_DB_Entry *p_entry);
+ 
+ 
  
+ int
+ write_FCNodeObject (char *p_id, SOIP_DB_Entry p_entry);
+ 
+ int
+ write_FCPortObject (char *p_id, SOIP_DB_Entry p_entry);
  
  int
***************
*** 61,64 ****
--- 88,97 ----
  
  int
+ write_PortalObject (SOIP_Portal_Key *p_portal_key, SOIP_DB_Entry p_entry);
+ 
+ int
+ write_PortalGroupObject (SOIP_Portal_Group_Key *p_portal_key, SOIP_DB_Entry p_entry);
+ 
+ int
  write_DDObject (int id, SOIP_DB_Entry p_entry);
  
***************
*** 66,71 ****
--- 99,117 ----
  write_DDSObject (int id, SOIP_DB_Entry p_entry);
  
+ int
+ write_ISCSIidxObject( int id, SOIP_DB_Entry p_entry);
+ 
+ int
+ write_EntityidxObject( int id, SOIP_DB_Entry p_entry);
+ 
+ int
+ write_PortalidxObject( int id, SOIP_DB_Entry p_entry);
+ 
  
+ int
+ delete_FCNodeObject (char * p_id);
  
+ int
+ delete_FCPortObject (char * p_id);
  
  int
***************
*** 76,79 ****
--- 122,131 ----
  
  int
+ delete_PortalObject (SOIP_Portal_Key * p_portal_key);
+ 
+ int
+ delete_PortalGroupObject (SOIP_Portal_Group_Key * p_portal_key);
+ 
+ int
  delete_DDObject (int id);
  
***************
*** 81,84 ****
--- 133,145 ----
  delete_DDSObject (int id);
  
+ int
+ delete_EntityidxObject (int id);
+ 
+ int
+ delete_ISCSIidxObject (int id);
+ 
+ int
+ delete_PortalidxObject (int id);
+ 
  
  #endif

Index: iSNStypes.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** iSNStypes.h	23 Aug 2007 22:31:06 -0000	1.17
--- iSNStypes.h	27 Aug 2007 21:25:16 -0000	1.18
***************
*** 624,630 ****
  } SOIP_Iscsi;
  
! typedef struct _soip_iscsi_node_name_key {
      char   v[MAX_ISCSI_NODE_ID_SIZE];
! } SOIP_ISCSI_Node_Id_Key;
  
  /* ids for identifying which list */
--- 624,630 ----
  } SOIP_Iscsi;
  
! typedef struct _soip_iscsi_key {
      char   v[MAX_ISCSI_NODE_ID_SIZE];
! } SOIP_ISCSI_Key;
  
  /* ids for identifying which list */
***************
*** 708,714 ****
  
      union {
          SOIP_Entity_Key          entity_key;
          SOIP_Node_Key            node_key;
!         SOIP_Port_Key            port_name;
          SOIP_DD_Key              dd_key;
          SOIP_DD_Key              dds_key;
--- 708,715 ----
  
      union {
+         SOIP_ISCSI_Key           iscsi_key;
          SOIP_Entity_Key          entity_key;
          SOIP_Node_Key            node_key;
!         SOIP_Port_Key            port_key;
          SOIP_DD_Key              dd_key;
          SOIP_DD_Key              dds_key;

Index: iSNSreg.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSreg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** iSNSreg.h	4 Jan 2007 19:00:06 -0000	1.7
--- iSNSreg.h	27 Aug 2007 21:25:16 -0000	1.8
***************
*** 88,92 ****
  
  int
! SNSRemovePortalEntry (char *portal_key, ISNS_Attr * src_attr,
                        ISNS_Msg * p_rspmsg);
  
--- 88,92 ----
  
  int
! SNSRemovePortalEntry (SOIP_Portal_Key *portal_key, ISNS_Attr * src_attr,
                        ISNS_Msg * p_rspmsg);
  

Index: iSNSList.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSList.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** iSNSList.h	22 Nov 2006 17:45:39 -0000	1.3
--- iSNSList.h	27 Aug 2007 21:25:16 -0000	1.4
***************
*** 74,78 ****
  FindNode(ISNS_LIST *plist, char *pdata, int data_size);
  
! char *
  GetNodeData(ISNS_LIST_NODE *pnode);
  
--- 74,78 ----
  FindNode(ISNS_LIST *plist, char *pdata, int data_size);
  
! void *
  GetNodeData(ISNS_LIST_NODE *pnode);