[Linuxisns-commit] isnsNT/isnsserver/src iSNSdb.c, 1.21, 1.22 iSNSdereg.c, 1.15, 1.16 iSNSesi.c, 1.8, 1.9 iSNSquery.c, 1.11, 1.12 iSNSreg.c, 1.15, 1.16 iSNSscn.c, 1.6, 1.7

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

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

Modified Files:
	iSNSdb.c iSNSdereg.c iSNSesi.c iSNSquery.c iSNSreg.c iSNSscn.c 
Log Message:
Correct struct(s) in iSNStypes.h

Index: iSNSquery.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** iSNSquery.c	15 Dec 2006 18:17:19 -0000	1.11
--- iSNSquery.c	18 Dec 2006 19:02:47 -0000	1.12
***************
*** 241,245 ****
     SOIP_Ifcp *p_port;
     SOIP_Portal_Key db_portal;
!    ISNS_Key read_key;
     int rval;
  
--- 241,245 ----
     SOIP_Ifcp *p_port;
     SOIP_Portal_Key db_portal;
!    ISNS_DBKey read_key;
     int rval;
  
***************
*** 334,338 ****
           key = (ISNS_Key *)(key_indx[entityKeyFlag]);
           DEBUG_1 (isns_query_debug &1,(Find Entity Index:%i),key->val.index);
!          ISNS_Key read_key;
           read_key.tag = ENTITY_IDX_KEY;
           read_key.val.idx.index = key->val.index;
--- 334,338 ----
           key = (ISNS_Key *)(key_indx[entityKeyFlag]);
           DEBUG_1 (isns_query_debug &1,(Find Entity Index:%i),key->val.index);
!          ISNS_DBKey read_key;
           read_key.tag = ENTITY_IDX_KEY;
           read_key.val.idx.index = key->val.index;
***************
*** 407,411 ****
        key = (ISNS_Key *) key_indx[iFCPNodeKeyFlag];
        
!       ISNS_Key read_key;
        read_key.tag = PORT_NAME_KEY;
        strcpy(read_key.val.port_name.v,(char *)&key->val.port_name);
--- 407,411 ----
        key = (ISNS_Key *) key_indx[iFCPNodeKeyFlag];
        
!       ISNS_DBKey read_key;
        read_key.tag = PORT_NAME_KEY;
        strcpy(read_key.val.port_name.v,(char *)&key->val.port_name);
***************
*** 441,445 ****
        {
           key = (ISNS_Key *)(key_indx[iSCSINodeIdxKeyFlag]);
!          ISNS_Key read_key;
           read_key.tag = ISCSI_IDX_KEY;
           read_key.val.idx.index = key->val.index;
--- 441,445 ----
        {
           key = (ISNS_Key *)(key_indx[iSCSINodeIdxKeyFlag]);
!          ISNS_DBKey read_key;
           read_key.tag = ISCSI_IDX_KEY;
           read_key.val.idx.index = key->val.index;
***************
*** 469,475 ****
        }
  
!       ISNS_Key read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_name.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
--- 469,475 ----
        }
  
!       ISNS_DBKey read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_key.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
***************
*** 495,499 ****
     else
     {
!       ISNS_Key key = { 0 };
        /* Return all entity */
  
--- 495,499 ----
     else
     {
!       ISNS_DBKey key = { 0 };
        /* Return all entity */
  
***************
*** 536,545 ****
     SOIP_Dds *p_dds;
     SOIP_DD_Key dds_key;
!    ISNS_Key key;
     int rval;
  
     dds_key.id = id;
     key.tag = DDS_ID_KEY;
!    key.val.dds_id = id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
--- 536,545 ----
     SOIP_Dds *p_dds;
     SOIP_DD_Key dds_key;
!    ISNS_DBKey key;
     int rval;
  
     dds_key.id = id;
     key.tag = DDS_ID_KEY;
!    key.val.dds_key.id = id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
***************
*** 635,639 ****
     else
     {
!       ISNS_Key key = { 0 };
        /* retrieve all DDS */
        key.tag = DDS_ID_KEY;
--- 635,639 ----
     else
     {
!       ISNS_DBKey key = { 0 };
        /* retrieve all DDS */
        key.tag = DDS_ID_KEY;
***************
*** 681,690 ****
     SOIP_Dd *p_dd;
     SOIP_DD_Key dd_key;
!    ISNS_Key key;
     int rval;
  
     dd_key.id = id;
     key.tag = DD_ID_KEY;
!    key.val.dd_id = id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
--- 681,690 ----
     SOIP_Dd *p_dd;
     SOIP_DD_Key dd_key;
!    ISNS_DBKey key;
     int rval;
  
     dd_key.id = id;
     key.tag = DD_ID_KEY;
!    key.val.dd_key.id = id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
***************
*** 773,780 ****
        key = (ISNS_Key *)(key_indx[ddsKeyIndex]);
        /* Fetch the DDS */
!       dds_key.id = key->val.dd_key.id;
!       ISNS_Key read_key;
        read_key.tag = DDS_ID_KEY;
!       read_key.val.dds_id = dds_key.id;
        rval = ISNSdbRead(&read_key,&entry3);
        if (rval != SUCCESS)
--- 773,780 ----
        key = (ISNS_Key *)(key_indx[ddsKeyIndex]);
        /* Fetch the DDS */
!       dds_key.id = key->val.dd_id;
!       ISNS_DBKey read_key;
        read_key.tag = DDS_ID_KEY;
!       read_key.val.dds_key.id = dds_key.id;
        rval = ISNSdbRead(&read_key,&entry3);
        if (rval != SUCCESS)
***************
*** 800,806 ****
  
        /* Fetch the node */
!       ISNS_Key read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_name.v,(char *)&key->val);
        rval = ISNSdbRead(&read_key,&entry3);
        if (rval != SUCCESS)
--- 800,806 ----
  
        /* Fetch the node */
!       ISNS_DBKey read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_key.v,(char *)&key->val);
        rval = ISNSdbRead(&read_key,&entry3);
        if (rval != SUCCESS)
***************
*** 822,826 ****
     else
     {
!       ISNS_Key key = { 0 };
  
        /* retrieve all DD */
--- 822,826 ----
     else
     {
!       ISNS_DBKey key = { 0 };
  
        /* retrieve all DD */
***************
*** 895,901 ****
        db_node_name.v[8] = (char)SOIP_DB_Node_Id;
  
!       ISNS_Key read_key;
        read_key.tag = NODE_NAME_KEY;
!       strcpy(read_key.val.node_name.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
--- 895,901 ----
        db_node_name.v[8] = (char)SOIP_DB_Node_Id;
  
!       ISNS_DBKey read_key;
        read_key.tag = NODE_NAME_KEY;
!       strcpy(read_key.val.node_key.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
***************
*** 913,917 ****
        memcpy (db_port_name.v, &key->val, key->len);
  
!       ISNS_Key read_key;
        read_key.tag = PORT_NAME_KEY;
        strcpy(read_key.val.port_name.v,db_port_name.v);
--- 913,917 ----
        memcpy (db_port_name.v, &key->val, key->len);
  
!       ISNS_DBKey read_key;
        read_key.tag = PORT_NAME_KEY;
        strcpy(read_key.val.port_name.v,db_port_name.v);
***************
*** 934,940 ****
           db_node_name.v[8] = (char)SOIP_DB_Node_Id;
  
!          ISNS_Key read_key;
           read_key.tag = NODE_NAME_KEY;
!          strcpy(read_key.val.node_name.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
--- 934,940 ----
           db_node_name.v[8] = (char)SOIP_DB_Node_Id;
  
!          ISNS_DBKey read_key;
           read_key.tag = NODE_NAME_KEY;
!          strcpy(read_key.val.node_key.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
***************
*** 948,952 ****
     else
     {
!       ISNS_Key key = { 0 };
  
        /* Search the node table */
--- 948,952 ----
     else
     {
!       ISNS_DBKey key = { 0 };
  
        /* Search the node table */
***************
*** 959,963 ****
           memset (&db_node_name, 0, sizeof (db_node_name));
           memcpy ((char *) db_node_name.v,
!                  (char *) key.val.node_name.v, ISNS_NODE_NAME_SIZE);
  
           db_node_name.v[8] = (char)SOIP_DB_Node_Id;
--- 959,963 ----
           memset (&db_node_name, 0, sizeof (db_node_name));
           memcpy ((char *) db_node_name.v,
!                  (char *) key.val.node_key.v, ISNS_NODE_NAME_SIZE);
  
           db_node_name.v[8] = (char)SOIP_DB_Node_Id;
***************
*** 1001,1005 ****
     ISNS_LIST_NODE       *pnode;
     char                 *p_portal_name;
!    ISNS_Key             key2 = { 0 };
     int                  rval;
  
--- 1001,1005 ----
     ISNS_LIST_NODE       *pnode;
     char                 *p_portal_name;
!    ISNS_DBKey           key2 = { 0 };
     int                  rval;
  
***************
*** 1060,1064 ****
                attr->len);
  
!       ISNS_Key read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
--- 1060,1064 ----
                attr->len);
  
!       ISNS_DBKey read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
***************
*** 1082,1086 ****
  
        attr = (ISNS_Attr *) key_indx[portalIdxKeyFlag];
!       ISNS_Key idx_key;
        idx_key.tag = PORTAL_IDX_KEY;
        idx_key.val.idx.index = attr->val.index;
--- 1082,1086 ----
  
        attr = (ISNS_Attr *) key_indx[portalIdxKeyFlag];
!       ISNS_DBKey idx_key;
        idx_key.tag = PORTAL_IDX_KEY;
        idx_key.val.idx.index = attr->val.index;
***************
*** 1099,1103 ****
        memcpy ((char *) &db_portal, ptr, sizeof(db_portal));
  
!       ISNS_Key read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
--- 1099,1103 ----
        memcpy ((char *) &db_portal, ptr, sizeof(db_portal));
  
!       ISNS_DBKey read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
***************
*** 1127,1131 ****
        while ((pnode=GetNextNode(&p_entity->iportal_list, pnode)))
        {
!             ISNS_Key read_key;
              read_key.tag = PORTAL_ID_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_Portal_Key));
--- 1127,1131 ----
        while ((pnode=GetNextNode(&p_entity->iportal_list, pnode)))
        {
!             ISNS_DBKey read_key;
              read_key.tag = PORTAL_ID_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_Portal_Key));
***************
*** 1148,1152 ****
        key = (ISNS_Key *)(key_indx[portNameKeyFlag]);
  
!       ISNS_Key read_key;
        read_key.tag = PORT_NAME_KEY;
        memcpy(&read_key.val,&key->val.port_name,PORT_NAME_SIZE);
--- 1148,1152 ----
        key = (ISNS_Key *)(key_indx[portNameKeyFlag]);
  
!       ISNS_DBKey read_key;
        read_key.tag = PORT_NAME_KEY;
        memcpy(&read_key.val,&key->val.port_name,PORT_NAME_SIZE);
***************
*** 1168,1172 ****
        while ((pnode=GetNextNode(&p_entity->iportal_list, pnode)))
        {
!             ISNS_Key read_key;
              read_key.tag = PORT_NAME_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_DB_Portal));
--- 1168,1172 ----
        while ((pnode=GetNextNode(&p_entity->iportal_list, pnode)))
        {
!             ISNS_DBKey read_key;
              read_key.tag = PORT_NAME_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_DB_Portal));
***************
*** 1196,1202 ****
        memcpy ((char *) db_node_name.v, (char *) &key->val, key->len);
  
!       ISNS_Key read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_name.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
--- 1196,1202 ----
        memcpy ((char *) db_node_name.v, (char *) &key->val, key->len);
  
!       ISNS_DBKey read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_key.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
***************
*** 1223,1227 ****
        while ((pnode=GetNextNode(&p_entity->iportal_list, pnode)))
        {
!             ISNS_Key read_key;
              read_key.tag = PORTAL_ID_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_DB_Portal));
--- 1223,1227 ----
        while ((pnode=GetNextNode(&p_entity->iportal_list, pnode)))
        {
!             ISNS_DBKey read_key;
              read_key.tag = PORTAL_ID_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_DB_Portal));
***************
*** 1246,1250 ****
        while (SNSdbGetNextOfKey (&key2) == SUCCESS)
        {
!          ISNS_Key read_key;
           read_key.tag = PORTAL_ID_KEY;
           memcpy(&read_key.val,&key2.val,sizeof(SOIP_Portal_Key));
--- 1246,1250 ----
        while (SNSdbGetNextOfKey (&key2) == SUCCESS)
        {
!          ISNS_DBKey read_key;
           read_key.tag = PORTAL_ID_KEY;
           memcpy(&read_key.val,&key2.val,sizeof(SOIP_Portal_Key));
***************
*** 1342,1346 ****
  
           int rval;
!          ISNS_Key read_key;
           read_key.tag = PORT_NAME_KEY;
           memcpy(&read_key.val,&key->val.port_name,PORT_NAME_SIZE);
--- 1342,1346 ----
  
           int rval;
!          ISNS_DBKey read_key;
           read_key.tag = PORT_NAME_KEY;
           memcpy(&read_key.val,&key->val.port_name,PORT_NAME_SIZE);
***************
*** 1374,1378 ****
  
        int rval;
!       ISNS_Key read_key;
        read_key.tag = NODE_NAME_KEY;
        memcpy(&read_key.val,&db_node_name.v,ISNS_NODE_NAME_SIZE);
--- 1374,1378 ----
  
        int rval;
!       ISNS_DBKey read_key;
        read_key.tag = NODE_NAME_KEY;
        memcpy(&read_key.val,&db_node_name.v,ISNS_NODE_NAME_SIZE);
***************
*** 1388,1392 ****
              char *pname=GetNodeData(pnode);
  
!             ISNS_Key read_key;
              read_key.tag = PORT_NAME_KEY;
              memcpy(&read_key.val,pname,PORT_NAME_SIZE);
--- 1388,1392 ----
              char *pname=GetNodeData(pnode);
  
!             ISNS_DBKey read_key;
              read_key.tag = PORT_NAME_KEY;
              memcpy(&read_key.val,pname,PORT_NAME_SIZE);
***************
*** 1412,1418 ****
        strncpy ( db_entity_id.id, (char *)&key->val, sizeof(db_entity_id.id) );
  
!       ISNS_Key read_key;
        read_key.tag = ENTITY_ID_KEY;
!       strcpy(read_key.val.node_name.v,db_entity_id.id);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
--- 1412,1418 ----
        strncpy ( db_entity_id.id, (char *)&key->val, sizeof(db_entity_id.id) );
  
!       ISNS_DBKey read_key;
        read_key.tag = ENTITY_ID_KEY;
!       strcpy(read_key.val.node_key.v,db_entity_id.id);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
***************
*** 1426,1430 ****
        {
           /* Fetch the Port Object */
!          ISNS_Key read_key;
           read_key.tag = PORT_NAME_KEY;
           memcpy(&read_key.val,GetNodeData(pnode),PORT_NAME_SIZE);
--- 1426,1430 ----
        {
           /* Fetch the Port Object */
!          ISNS_DBKey read_key;
           read_key.tag = PORT_NAME_KEY;
           memcpy(&read_key.val,GetNodeData(pnode),PORT_NAME_SIZE);
***************
*** 1460,1464 ****
        db_portal.ip_port=attr->val.ip_port;
  
!       ISNS_Key read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
--- 1460,1464 ----
        db_portal.ip_port=attr->val.ip_port;
  
!       ISNS_DBKey read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
***************
*** 1471,1477 ****
        {
           /* Fetch entity from hash */
!          ISNS_Key read_key;
           read_key.tag = ENTITY_ID_KEY;
!          strcpy(read_key.val.entity_id.id,p_portal->entity_id.id);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
--- 1471,1477 ----
        {
           /* Fetch entity from hash */
!          ISNS_DBKey read_key;
           read_key.tag = ENTITY_ID_KEY;
!          strcpy(read_key.val.entity_key.id,p_portal->entity_id.id);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
***************
*** 1484,1488 ****
           while ((pnode=GetNextNode(&p_entity->ifcp_node_list, pnode)))
           {
!             ISNS_Key read_key;
              read_key.tag = PORT_NAME_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),PORT_NAME_SIZE);
--- 1484,1488 ----
           while ((pnode=GetNextNode(&p_entity->ifcp_node_list, pnode)))
           {
!             ISNS_DBKey read_key;
              read_key.tag = PORT_NAME_KEY;
              memcpy(&read_key.val,GetNodeData(pnode),PORT_NAME_SIZE);
***************
*** 1509,1513 ****
     else
     {
!       ISNS_Key key = { 0 };
  
        key.tag = PORT_NAME_KEY;
--- 1509,1513 ----
     else
     {
!       ISNS_DBKey key = { 0 };
  
        key.tag = PORT_NAME_KEY;
***************
*** 1615,1621 ****
           memcpy ((char *) db_node_name.v, (char *) &key->val, key->len);
  
!          ISNS_Key read_key;
           read_key.tag = ISCSI_ID_KEY;
!          strcpy(read_key.val.node_name.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
--- 1615,1621 ----
           memcpy ((char *) db_node_name.v, (char *) &key->val, key->len);
  
!          ISNS_DBKey read_key;
           read_key.tag = ISCSI_ID_KEY;
!          strcpy(read_key.val.node_key.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
***************
*** 1643,1647 ****
           void *ptr;
           key = (ISNS_Key *)(key_indx[nodeIdxKeyIndex]);
!          ISNS_Key idx_key;
           idx_key.tag = ISCSI_IDX_KEY;
           idx_key.val.idx.index = key->val.index;
--- 1643,1647 ----
           void *ptr;
           key = (ISNS_Key *)(key_indx[nodeIdxKeyIndex]);
!          ISNS_DBKey idx_key;
           idx_key.tag = ISCSI_IDX_KEY;
           idx_key.val.idx.index = key->val.index;
***************
*** 1662,1668 ****
           strncpy ((char *) db_node_name.v, ptr, sizeof(db_node_name.v) );
  
!          ISNS_Key read_key;
           read_key.tag = ISCSI_ID_KEY;
!          strcpy(read_key.val.node_name.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
--- 1662,1668 ----
           strncpy ((char *) db_node_name.v, ptr, sizeof(db_node_name.v) );
  
!          ISNS_DBKey read_key;
           read_key.tag = ISCSI_ID_KEY;
!          strcpy(read_key.val.node_key.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry);
           if (rval != SUCCESS)
***************
*** 1704,1710 ****
        {
           /* Fetch the iSCSI Node */
!          ISNS_Key read_key;
           read_key.tag = ISCSI_ID_KEY;
!          strcpy(read_key.val.node_name.v,GetNodeData(pnode));
           rval = ISNSdbRead(&read_key,&entry2);
           if (rval != SUCCESS)
--- 1704,1710 ----
        {
           /* Fetch the iSCSI Node */
!          ISNS_DBKey read_key;
           read_key.tag = ISCSI_ID_KEY;
!          strcpy(read_key.val.node_key.v,GetNodeData(pnode));
           rval = ISNSdbRead(&read_key,&entry2);
           if (rval != SUCCESS)
***************
*** 1745,1749 ****
        memcpy (db_portal.ip_addr.v, key->val.ip_addr.v, key->len);
  
!       ISNS_Key read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
--- 1745,1749 ----
        memcpy (db_portal.ip_addr.v, key->val.ip_addr.v, key->len);
  
!       ISNS_DBKey read_key;
        read_key.tag = PORTAL_ID_KEY;
        memcpy(&read_key.val,&db_portal,sizeof(SOIP_Portal_Key));
***************
*** 1756,1762 ****
        {
          /* Fetch ENTITY */
!         ISNS_Key read_key;
          read_key.tag = ENTITY_ID_KEY;
!         strcpy(read_key.val.entity_id.id,p_portal->entity_id.id);
          rval = ISNSdbRead(&read_key,&entry);
          if (rval != SUCCESS)
--- 1756,1762 ----
        {
          /* Fetch ENTITY */
!         ISNS_DBKey read_key;
          read_key.tag = ENTITY_ID_KEY;
!         strcpy(read_key.val.entity_key.id,p_portal->entity_id.id);
          rval = ISNSdbRead(&read_key,&entry);
          if (rval != SUCCESS)
***************
*** 1770,1776 ****
          {
                 /* Fetch the iSCSI Node */
!                ISNS_Key read_key;
                 read_key.tag = ISCSI_ID_KEY;
!                strcpy(read_key.val.node_name.v,GetNodeData(pnode));
                 rval = ISNSdbRead(&read_key,&entry2);
                 if (rval != SUCCESS)
--- 1770,1776 ----
          {
                 /* Fetch the iSCSI Node */
!                ISNS_DBKey read_key;
                 read_key.tag = ISCSI_ID_KEY;
!                strcpy(read_key.val.node_key.v,GetNodeData(pnode));
                 rval = ISNSdbRead(&read_key,&entry2);
                 if (rval != SUCCESS)
***************
*** 1792,1796 ****
     else
     {
!       ISNS_Key qkey = { 0 };
  
        DEBUG_0 (isns_query_debug &1,search node table);
--- 1792,1796 ----
     else
     {
!       ISNS_DBKey qkey = { 0 };
  
        DEBUG_0 (isns_query_debug &1,search node table);
***************
*** 1857,1861 ****
     int             ddKeyIndex;
     int             ddsKeyIndex;
!    ISNS_Key        qkey = { 0 };
     ISNS_Key        *key;
     ISNS_Attr       *src_attr;
--- 1857,1861 ----
     int             ddKeyIndex;
     int             ddsKeyIndex;
!    ISNS_DBKey      qkey = { 0 };
     ISNS_Key        *key;
     ISNS_Attr       *src_attr;
***************
*** 2032,2036 ****
           if (key->len && key->val.index)
           {
!             ISNS_Key read_key;
              read_key.tag = ISCSI_IDX_KEY;
              read_key.val.idx.index = key->val.index;
--- 2032,2036 ----
           if (key->len && key->val.index)
           {
!             ISNS_DBKey read_key;
              read_key.tag = ISCSI_IDX_KEY;
              read_key.val.idx.index = key->val.index;
***************
*** 2111,2115 ****
           if (key->len && key->val.index)
           {
!             ISNS_Key read_key;
              read_key.tag = ENTITY_IDX_KEY;
              read_key.val.idx.index = key->val.index;
--- 2111,2115 ----
           if (key->len && key->val.index)
           {
!             ISNS_DBKey read_key;
              read_key.tag = ENTITY_IDX_KEY;
              read_key.val.idx.index = key->val.index;
***************
*** 2219,2223 ****
           if (key->len && key->val.index)
           {
!             ISNS_Key read_key;
              read_key.tag = PORTAL_IDX_KEY;
              read_key.val.idx.index = key->val.index;
--- 2219,2223 ----
           if (key->len && key->val.index)
           {
!             ISNS_DBKey read_key;
              read_key.tag = PORTAL_IDX_KEY;
              read_key.val.idx.index = key->val.index;
***************
*** 2313,2317 ****
     char            *attr_indx[SNS_MAX_ATTRS];
     char            *key_indx[SNS_MAX_ATTRS];
!    ISNS_Key        key;
     int             rval;
  
--- 2313,2317 ----
     char            *attr_indx[SNS_MAX_ATTRS];
     char            *key_indx[SNS_MAX_ATTRS];
!    ISNS_DBKey      key;
     int             rval;
  
***************
*** 2330,2334 ****
     dds_key.id = p_attr->val.dds_id;
     key.tag = DDS_ID_KEY;
!    key.val.dds_id = dds_key.id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
--- 2330,2334 ----
     dds_key.id = p_attr->val.dds_id;
     key.tag = DDS_ID_KEY;
!    key.val.dds_key.id = dds_key.id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
***************
*** 2392,2396 ****
     /* Entity ID found in key */
     p_attr = (ISNS_Attr *)(key_indx[entityKeyIndex]);
!    ISNS_Key read_key;
     read_key.tag = ENTITY_IDX_KEY;
     read_key.val.idx.index = p_attr->val.index;
--- 2392,2396 ----
     /* Entity ID found in key */
     p_attr = (ISNS_Attr *)(key_indx[entityKeyIndex]);
!    ISNS_DBKey read_key;
     read_key.tag = ENTITY_IDX_KEY;
     read_key.val.idx.index = p_attr->val.index;
***************
*** 2481,2487 ****
     /* Fetch DDS */
     dd_key.id = p_attr->val.dd_id;
!    ISNS_Key read_key;
     read_key.tag = DD_ID_KEY;
!    read_key.val.dd_id = dd_key.id;
     rval = ISNSdbRead(&read_key,&entry);
     if (rval != SUCCESS)
--- 2481,2487 ----
     /* Fetch DDS */
     dd_key.id = p_attr->val.dd_id;
!    ISNS_DBKey read_key;
     read_key.tag = DD_ID_KEY;
!    read_key.val.dd_key.id = dd_key.id;
     rval = ISNSdbRead(&read_key,&entry);
     if (rval != SUCCESS)
***************
*** 2816,2820 ****
        {
           DEBUG_0 (isns_query_debug &1, get portal);
!          ISNS_Key read_key;
           read_key.tag = PORTAL_ID_KEY;
           memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_Portal_Key));
--- 2816,2820 ----
        {
           DEBUG_0 (isns_query_debug &1, get portal);
!          ISNS_DBKey read_key;
           read_key.tag = PORTAL_ID_KEY;
           memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_Portal_Key));
***************
*** 3199,3208 ****
     SOIP_DD_Key dds_key;
     SOIP_DB_Entry lentry;
!    ISNS_Key key;
     int rval;
  
     dds_key.id = dds_id;
     key.tag = DDS_ID_KEY;
!    key.val.dds_id = dds_id;
     rval = ISNSdbRead(&key,&lentry);
     if (rval != SUCCESS)
--- 3199,3208 ----
     SOIP_DD_Key dds_key;
     SOIP_DB_Entry lentry;
!    ISNS_DBKey key;
     int rval;
  
     dds_key.id = dds_id;
     key.tag = DDS_ID_KEY;
!    key.val.dds_key.id = dds_id;
     rval = ISNSdbRead(&key,&lentry);
     if (rval != SUCCESS)
***************
*** 3276,3282 ****
        /* Fetch DD */
        dd_key.id = *(uint32_t *)GetNodeData(pnode);
!       ISNS_Key read_key;
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_id = dd_key.id;
        rval = ISNSdbRead(&read_key,&lentry2);
        if (rval != SUCCESS)
--- 3276,3282 ----
        /* Fetch DD */
        dd_key.id = *(uint32_t *)GetNodeData(pnode);
!       ISNS_DBKey read_key;
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbRead(&read_key,&lentry2);
        if (rval != SUCCESS)
***************
*** 3302,3306 ****
     SOIP_Ifcp *p_node;
     SOIP_DB_Entry lentry;
!    ISNS_Key key;
     int rval;
  
--- 3302,3306 ----
     SOIP_Ifcp *p_node;
     SOIP_DB_Entry lentry;
!    ISNS_DBKey key;
     int rval;
  
***************
*** 3375,3384 ****
     SOIP_Iscsi    *p_node;
     SOIP_DB_Entry lentry;
!    ISNS_Key      key;
     int           rval;
  
     /* Fetch the node */
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_name.v,nodename);
     rval = ISNSdbRead(&key,&lentry);
     if (rval != SUCCESS)
--- 3375,3384 ----
     SOIP_Iscsi    *p_node;
     SOIP_DB_Entry lentry;
!    ISNS_DBKey    key;
     int           rval;
  
     /* Fetch the node */
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_key.v,nodename);
     rval = ISNSdbRead(&key,&lentry);
     if (rval != SUCCESS)
***************
*** 3445,3449 ****
     SOIP_Iscsi           *p_node;
     time_t               t;
!    ISNS_Key		key;
     int                  rval;
  
--- 3445,3449 ----
     SOIP_Iscsi           *p_node;
     time_t               t;
!    ISNS_DBKey           key;
     int                  rval;
  
***************
*** 3460,3464 ****
  
        key.tag = ISCSI_ID_KEY;
!       strcpy(key.val.node_name.v,db_node_name.v);
        rval = ISNSdbRead(&key,&lentry);
  
--- 3460,3464 ----
  
        key.tag = ISCSI_ID_KEY;
!       strcpy(key.val.node_key.v,db_node_name.v);
        rval = ISNSdbRead(&key,&lentry);
  
***************
*** 3483,3487 ****
  
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_id.id,db_entity.id);
     ISNSdbWrite(&key,lentry);
  
--- 3483,3487 ----
  
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_key.id,db_entity.id);
     ISNSdbWrite(&key,lentry);
  

Index: iSNSesi.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSesi.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iSNSesi.c	15 Dec 2006 18:17:19 -0000	1.8
--- iSNSesi.c	18 Dec 2006 19:02:47 -0000	1.9
***************
*** 219,223 ****
     ISNS_DBKey key;
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_id.id,db_entity_id.id);
     rval = ISNSdbRead(&key,&entry);   
     if (rval != SUCCESS)
--- 219,223 ----
     ISNS_DBKey key;
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_key.id,db_entity_id.id);
     rval = ISNSdbRead(&key,&entry);   
     if (rval != SUCCESS)

Index: iSNSdereg.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSdereg.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** iSNSdereg.c	15 Dec 2006 18:17:19 -0000	1.15
--- iSNSdereg.c	18 Dec 2006 19:02:47 -0000	1.16
***************
*** 207,212 ****
     int               updated_dd_list_size;
     int               memberRemovedFlag;
!    ISNS_Key          delete_key;
!    ISNS_Key          read_key;
  
  
--- 207,212 ----
     int               updated_dd_list_size;
     int               memberRemovedFlag;
!    ISNS_DBKey        delete_key;
!    ISNS_DBKey        read_key;
  
  
***************
*** 215,219 ****
     dds_key.id = id;
     read_key.tag = DDS_ID_KEY;
!    read_key.val.dds_id = id;   
     rval = ISNSdbRead(&read_key,&entry);
     if (rval != SUCCESS)
--- 215,219 ----
     dds_key.id = id;
     read_key.tag = DDS_ID_KEY;
!    read_key.val.dds_key.id = id;   
     rval = ISNSdbRead(&read_key,&entry);
     if (rval != SUCCESS)
***************
*** 242,246 ****
        dd_key.id = *(uint32_t *)GetNodeData(pnode);
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry2);
        if (rval != SUCCESS)
--- 242,246 ----
        dd_key.id = *(uint32_t *)GetNodeData(pnode);
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry2);
        if (rval != SUCCESS)
***************
*** 269,275 ****
  
        /* Store Entry */
!       ISNS_Key update_key;
        update_key.tag = DD_ID_KEY;
!       update_key.val.dd_id = dd_key.id;
        rval = ISNSdbWrite(&update_key,entry2);
     }
--- 269,275 ----
  
        /* Store Entry */
!       ISNS_DBKey update_key;
        update_key.tag = DD_ID_KEY;
!       update_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbWrite(&update_key,entry2);
     }
***************
*** 279,283 ****
        dd_key.id = dlist_node[ count ];
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_id = dd_key.id;
        ISNSdbRead(&read_key,&entry2);
        p_dd = (SOIP_Dd *)&entry2.data;
--- 279,283 ----
        dd_key.id = dlist_node[ count ];
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_key.id = dd_key.id;
        ISNSdbRead(&read_key,&entry2);
        p_dd = (SOIP_Dd *)&entry2.data;
***************
*** 295,299 ****
  
     delete_key.tag = DDS_ID_KEY;
!    delete_key.val.dds_id = dds_key.id;
     if ( ISNSdbDelete (&delete_key) != SUCCESS)
     {
--- 295,299 ----
  
     delete_key.tag = DDS_ID_KEY;
!    delete_key.val.dds_key.id = dds_key.id;
     if ( ISNSdbDelete (&delete_key) != SUCCESS)
     {
***************
*** 327,331 ****
     int            updated_dd_list_size;
     int            memberRemovedFlag;
!    ISNS_Key       read_key;
  
     /* int wasActiveFlag; */
--- 327,331 ----
     int            updated_dd_list_size;
     int            memberRemovedFlag;
!    ISNS_DBKey     read_key;
  
     /* int wasActiveFlag; */
***************
*** 336,340 ****
     dds_key.id = id;
     read_key.tag = DDS_ID_KEY;
!    read_key.val.dds_id = id;
     rval = ISNSdbRead(&read_key,&entry);
     if (rval != SUCCESS)
--- 336,340 ----
     dds_key.id = id;
     read_key.tag = DDS_ID_KEY;
!    read_key.val.dds_key.id = id;
     rval = ISNSdbRead(&read_key,&entry);
     if (rval != SUCCESS)
***************
*** 363,375 ****
        if (key->tag == ISNS_DD_ID)
        {
!          if (ISNS_NO_ERR != Remove_dd_from_dds (p_dds, key->val.dd_key.id))
           {
              return (ISNS_UNKNOWN_ERR);
           }
  
!          dd_key.id = key->val.dd_key.id;
!          ISNS_Key read_key;
           read_key.tag = DD_ID_KEY;
!          read_key.val.dd_id = dd_key.id;
           rval = ISNSdbRead(&read_key,&entry2);
           if (rval != SUCCESS)
--- 363,375 ----
        if (key->tag == ISNS_DD_ID)
        {
!          if (ISNS_NO_ERR != Remove_dd_from_dds (p_dds, key->val.dd_id))
           {
              return (ISNS_UNKNOWN_ERR);
           }
  
!          dd_key.id = key->val.dd_id;
!          ISNS_DBKey read_key;
           read_key.tag = DD_ID_KEY;
!          read_key.val.dd_key.id = dd_key.id;
           rval = ISNSdbRead(&read_key,&entry2);
           if (rval != SUCCESS)
***************
*** 394,400 ****
  
           /* Store Entry */
!          ISNS_Key update_key;
           update_key.tag = DD_ID_KEY;
!          update_key.val.dd_id = dd_key.id;
           ISNSdbWrite(&update_key,entry2);
        }
--- 394,400 ----
  
           /* Store Entry */
!          ISNS_DBKey update_key;
           update_key.tag = DD_ID_KEY;
!          update_key.val.dd_key.id = dd_key.id;
           ISNSdbWrite(&update_key,entry2);
        }
***************
*** 407,413 ****
  
        dd_key.id = dlist_node[ kk ];
!       ISNS_Key read_key;
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry2);
        if (rval != SUCCESS)
--- 407,413 ----
  
        dd_key.id = dlist_node[ kk ];
!       ISNS_DBKey read_key;
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry2);
        if (rval != SUCCESS)
***************
*** 425,431 ****
  
     /* Store Entry */
!    ISNS_Key add_key;
     add_key.tag = DDS_ID_KEY;
!    add_key.val.dds_id = id;
     rval = ISNSdbWrite(&add_key,entry);
     return (ISNS_NO_ERR);
--- 425,431 ----
  
     /* Store Entry */
!    ISNS_DBKey add_key;
     add_key.tag = DDS_ID_KEY;
!    add_key.val.dds_key.id = id;
     rval = ISNSdbWrite(&add_key,entry);
     return (ISNS_NO_ERR);
***************
*** 461,465 ****
           if (ISNS_NO_ERR !=
               (rval =
!               SNSdbRemoveAttrDDS_Member (key->val.dd_key.id, attr_indx,
                                               (ISNS_Attr *)src_attr, p_rspmsg)))
              return (rval);
--- 461,465 ----
           if (ISNS_NO_ERR !=
               (rval =
!               SNSdbRemoveAttrDDS_Member (key->val.dd_id, attr_indx,
                                               (ISNS_Attr *)src_attr, p_rspmsg)))
              return (rval);
***************
*** 468,472 ****
           if (ISNS_NO_ERR !=
               (rval =
!               SNSdbRemoveAttrDDS_Entry (key->val.dd_key.id, (ISNS_Attr *)src_attr,
                                              p_rspmsg)))
        {
--- 468,472 ----
           if (ISNS_NO_ERR !=
               (rval =
!               SNSdbRemoveAttrDDS_Entry (key->val.dd_id, (ISNS_Attr *)src_attr,
                                              p_rspmsg)))
        {
***************
*** 515,519 ****
           if (ISNS_NO_ERR !=
               (rval =
!               SNSdbRemoveDD_Member (key->val.dd_key.id, attr_indx,
                                          (ISNS_Attr *)src_attr, p_rspmsg)))
           {
--- 515,519 ----
           if (ISNS_NO_ERR !=
               (rval =
!               SNSdbRemoveDD_Member (key->val.dd_id, attr_indx,
                                          (ISNS_Attr *)src_attr, p_rspmsg)))
           {
***************
*** 523,527 ****
        else if (ISNS_NO_ERR !=
                 (rval =
!                 SNSdbRemoveDD_Entry (key->val.dd_key.id, (ISNS_Attr *)src_attr,
                                           p_rspmsg)))
        {
--- 523,527 ----
        else if (ISNS_NO_ERR !=
                 (rval =
!                 SNSdbRemoveDD_Entry (key->val.dd_id, (ISNS_Attr *)src_attr,
                                           p_rspmsg)))
        {
***************
*** 556,560 ****
     int               rval;
     ISNS_LIST_NODE    *pnode;
!    ISNS_Key          key;
  
     DEBUG_1 ( isns_dereg_debug & 1, (Deregistering Entity %s),p_entity_id);
--- 556,560 ----
     int               rval;
     ISNS_LIST_NODE    *pnode;
!    ISNS_DBKey        key;
  
     DEBUG_1 ( isns_dereg_debug & 1, (Deregistering Entity %s),p_entity_id);
***************
*** 567,571 ****
     /* read entity from database */
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_id.id,p_entity_id);
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
--- 567,571 ----
     /* read entity from database */
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_key.id,p_entity_id);
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
***************
*** 617,621 ****
  
     /* Remove Entity In Entity Index Database */
!    ISNS_Key remove_key;
     remove_key.tag = ENTITY_IDX_KEY;
     remove_key.val.idx.index = p_entity->entity_index;
--- 617,621 ----
  
     /* Remove Entity In Entity Index Database */
!    ISNS_DBKey remove_key;
     remove_key.tag = ENTITY_IDX_KEY;
     remove_key.val.idx.index = p_entity->entity_index;
***************
*** 652,656 ****
     SOIP_DD_Key dd_key;
     ISNS_LIST_NODE *pnode;
!    ISNS_Key       delete_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering IFCP WWPN));
--- 652,656 ----
     SOIP_DD_Key dd_key;
     ISNS_LIST_NODE *pnode;
!    ISNS_DBKey       delete_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering IFCP WWPN));
***************
*** 665,669 ****
     memset (buffer, 0, PORT_NAME_SIZE);
     memcpy (buffer, ifcp_node_key, PORT_NAME_SIZE);
!    ISNS_Key read_key;
     read_key.tag = PORT_NAME_KEY;
     strcpy(read_key.val.port_name.v,(char *)buffer);
--- 665,669 ----
     memset (buffer, 0, PORT_NAME_SIZE);
     memcpy (buffer, ifcp_node_key, PORT_NAME_SIZE);
!    ISNS_DBKey read_key;
     read_key.tag = PORT_NAME_KEY;
     strcpy(read_key.val.port_name.v,(char *)buffer);
***************
*** 679,683 ****
     {
        dd_key.id = *(uint32_t *) GetNodeData(pnode);
!       ISNS_Key read_key;
        read_key.tag = PORT_NAME_KEY;
        strcpy(read_key.val.port_name.v,GetNodeData(pnode));
--- 679,683 ----
     {
        dd_key.id = *(uint32_t *) GetNodeData(pnode);
!       ISNS_DBKey read_key;
        read_key.tag = PORT_NAME_KEY;
        strcpy(read_key.val.port_name.v,GetNodeData(pnode));
***************
*** 694,700 ****
  
        /* Store Entry */
!       ISNS_Key key;
        key.tag = PORT_NAME_KEY;
!       key.val.dd_id = dd_key.id;
        rval = ISNSdbWrite(&key,entry5);
     }
--- 694,700 ----
  
        /* Store Entry */
!       ISNS_DBKey key;
        key.tag = PORT_NAME_KEY;
!       key.val.dd_key.id = dd_key.id;
        rval = ISNSdbWrite(&key,entry5);
     }
***************
*** 715,721 ****
           memcpy (db_node_name.v, p_ifcp_node->node_name.v, ISNS_NODE_NAME_SIZE);
           db_node_name.v[8] = (char)SOIP_DB_Node_Id;
!          ISNS_Key read_key;
           read_key.tag = NODE_NAME_KEY;
!          strcpy(read_key.val.node_name.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry3);
           if (rval != SUCCESS)
--- 715,721 ----
           memcpy (db_node_name.v, p_ifcp_node->node_name.v, ISNS_NODE_NAME_SIZE);
           db_node_name.v[8] = (char)SOIP_DB_Node_Id;
!          ISNS_DBKey read_key;
           read_key.tag = NODE_NAME_KEY;
!          strcpy(read_key.val.node_key.v,db_node_name.v);
           rval = ISNSdbRead(&read_key,&entry3);
           if (rval != SUCCESS)
***************
*** 731,737 ****
           }
           
!          ISNS_Key key;
           key.tag = NODE_NAME_KEY;
!          strcpy(key.val.node_name.v,db_node_name.v);
           rval = ISNSdbWrite(&key,entry3);
  
--- 731,737 ----
           }
           
!          ISNS_DBKey key;
           key.tag = NODE_NAME_KEY;
!          strcpy(key.val.node_key.v,db_node_name.v);
           rval = ISNSdbWrite(&key,entry3);
  
***************
*** 760,766 ****
     }
  
!    ISNS_Key key;
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_id.id,p_ifcp_node->entity_id.id);
     rval = ISNSdbWrite(&key,entry4);
  
--- 760,766 ----
     }
  
!    ISNS_DBKey key;
     key.tag = ENTITY_ID_KEY;
!    strcpy(key.val.entity_key.id,p_ifcp_node->entity_id.id);
     rval = ISNSdbWrite(&key,entry4);
  
***************
*** 776,780 ****
        {
           /* Fetch Portal */
!          ISNS_Key read_key;
           read_key.tag = PORTAL_ID_KEY;
           memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_Portal_Key));
--- 776,780 ----
        {
           /* Fetch Portal */
!          ISNS_DBKey read_key;
           read_key.tag = PORTAL_ID_KEY;
           memcpy(&read_key.val,GetNodeData(pnode),sizeof(SOIP_Portal_Key));
***************
*** 1048,1054 ****
     SOIP_DD_Key       dd_key;
     ISNS_LIST_NODE    *pnode;
!    ISNS_Key          key;
!    ISNS_Key          entity_key;
!    ISNS_Key          remove_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering iSCSI Node));
--- 1048,1054 ----
     SOIP_DD_Key       dd_key;
     ISNS_LIST_NODE    *pnode;
!    ISNS_DBKey        key;
!    ISNS_DBKey        entity_key;
!    ISNS_DBKey        remove_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering iSCSI Node));
***************
*** 1056,1060 ****
     scn_bitmap = 0;
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_name.v,iscsi_node_key);
     rval = ISNSdbRead(&key,&entry2);
     if (rval != SUCCESS)
--- 1056,1060 ----
     scn_bitmap = 0;
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_key.v,iscsi_node_key);
     rval = ISNSdbRead(&key,&entry2);
     if (rval != SUCCESS)
***************
*** 1079,1085 ****
        dd_key.id = *(uint32_t *)GetNodeData(pnode);
  
!       ISNS_Key read_key;
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry5);
        if (rval != SUCCESS)
--- 1079,1085 ----
        dd_key.id = *(uint32_t *)GetNodeData(pnode);
  
!       ISNS_DBKey read_key;
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry5);
        if (rval != SUCCESS)
***************
*** 1115,1121 ****
  
        /* Store Entry */
!       ISNS_Key key;
        key.tag = DD_ID_KEY;
!       key.val.dd_id = dd_key.id;
        rval = ISNSdbWrite(&key,entry5);
     }
--- 1115,1121 ----
  
        /* Store Entry */
!       ISNS_DBKey key;
        key.tag = DD_ID_KEY;
!       key.val.dd_key.id = dd_key.id;
        rval = ISNSdbWrite(&key,entry5);
     }
***************
*** 1123,1127 ****
     /* read entity from database */
     entity_key.tag = ENTITY_ID_KEY;
!    strcpy(entity_key.val.entity_id.id,p_node->entity_id.id);
     rval = ISNSdbRead(&entity_key,&entry4);
     if (rval != SUCCESS)
--- 1123,1127 ----
     /* read entity from database */
     entity_key.tag = ENTITY_ID_KEY;
!    strcpy(entity_key.val.entity_key.id,p_node->entity_id.id);
     rval = ISNSdbRead(&entity_key,&entry4);
     if (rval != SUCCESS)
***************
*** 1176,1181 ****
     SOIP_DB_Node_Name db_node_name;
     ISNS_LIST_NODE *pnode;
!    ISNS_Key delete_key;
!    ISNS_Key read_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering FC Node));
--- 1176,1181 ----
     SOIP_DB_Node_Name db_node_name;
     ISNS_LIST_NODE *pnode;
!    ISNS_DBKey delete_key;
!    ISNS_DBKey read_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering FC Node));
***************
*** 1187,1191 ****
  
     read_key.tag = NODE_NAME_KEY;
!    strcpy(read_key.val.node_name.v,db_node_name.v);
     rval = ISNSdbRead(&read_key,&entry4);
     if (rval != SUCCESS)
--- 1187,1191 ----
  
     read_key.tag = NODE_NAME_KEY;
!    strcpy(read_key.val.node_key.v,db_node_name.v);
     rval = ISNSdbRead(&read_key,&entry4);
     if (rval != SUCCESS)
***************
*** 1197,1201 ****
     while ((pnode=GetNextNode(&p_fc_node->port_list, pnode)))
     {
!       strcpy(read_key.val.node_name.v,GetNodeData(pnode));
        rval = ISNSdbRead(&read_key,&entry5);
        if (rval != SUCCESS)
--- 1197,1201 ----
     while ((pnode=GetNextNode(&p_fc_node->port_list, pnode)))
     {
!       strcpy(read_key.val.node_key.v,GetNodeData(pnode));
        rval = ISNSdbRead(&read_key,&entry5);
        if (rval != SUCCESS)
***************
*** 1213,1217 ****
  
     delete_key.tag = NODE_NAME_KEY;
!    strcpy(delete_key.val.node_name.v,db_node_name.v);
     ISNSdbDelete (&delete_key);
  
--- 1213,1217 ----
  
     delete_key.tag = NODE_NAME_KEY;
!    strcpy(delete_key.val.node_key.v,db_node_name.v);
     ISNSdbDelete (&delete_key);
  
***************
*** 1234,1238 ****
     PORTAL_LIST_ENTRY portalListEntry;
     char              *p_iscsi_name;
!    ISNS_Key          read_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering Portal));
--- 1234,1238 ----
     PORTAL_LIST_ENTRY portalListEntry;
     char              *p_iscsi_name;
!    ISNS_DBKey          read_key;
  
     DEBUG_0 (isns_dereg_debug & 1, (Deregistering Portal));
***************
*** 1263,1267 ****
     }
  
!    ISNS_Key remove_key;
     remove_key.tag = PORTAL_IDX_KEY;
     remove_key.val.idx.index = p_portal->portal_index;
--- 1263,1267 ----
     }
  
!    ISNS_DBKey remove_key;
     remove_key.tag = PORTAL_IDX_KEY;
     remove_key.val.idx.index = p_portal->portal_index;
***************
*** 1272,1276 ****
  
     read_key.tag = ENTITY_ID_KEY;
!    strcpy(read_key.val.entity_id.id,p_portal->entity_id.id);
     rval = ISNSdbRead(&read_key,&entry4);
     if (rval != SUCCESS)
--- 1272,1276 ----
  
     read_key.tag = ENTITY_ID_KEY;
!    strcpy(read_key.val.entity_key.id,p_portal->entity_id.id);
     rval = ISNSdbRead(&read_key,&entry4);
     if (rval != SUCCESS)
***************
*** 1344,1349 ****
     ISNS_LIST_NODE *pnode;
     int            memberRemovedFlag;
!    ISNS_Key       delete_key;
!    ISNS_Key       key;
  
  
--- 1344,1349 ----
     ISNS_LIST_NODE *pnode;
     int            memberRemovedFlag;
!    ISNS_DBKey     delete_key;
!    ISNS_DBKey     key;
  
  
***************
*** 1351,1355 ****
  
     key.tag = DD_ID_KEY;
!    key.val.dd_id = id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
--- 1351,1355 ----
  
     key.tag = DD_ID_KEY;
!    key.val.dd_key.id = id;
     rval = ISNSdbRead(&key,&entry);
     if (rval != SUCCESS)
***************
*** 1426,1435 ****
        SOIP_DD_Key dds_key;
        ISNS_LIST_NODE *pnode2;
!       ISNS_Key key;
  
        dds_key.id = *(uint32_t *) GetNodeData(pnode);
  
        key.tag = DDS_ID_KEY;
!       key.val.dds_id = dds_key.id;
        rval = ISNSdbRead(&key,&entry2);
        if (rval != SUCCESS)
--- 1426,1435 ----
        SOIP_DD_Key dds_key;
        ISNS_LIST_NODE *pnode2;
!       ISNS_DBKey key;
  
        dds_key.id = *(uint32_t *) GetNodeData(pnode);
  
        key.tag = DDS_ID_KEY;
!       key.val.dds_key.id = dds_key.id;
        rval = ISNSdbRead(&key,&entry2);
        if (rval != SUCCESS)
***************
*** 1445,1449 ****
        /* Store Entry */
        key.tag = DDS_ID_KEY;
!       key.val.dds_id = dds_key.id;
        rval = ISNSdbWrite(&key,entry2);
     }
--- 1445,1449 ----
        /* Store Entry */
        key.tag = DDS_ID_KEY;
!       key.val.dds_key.id = dds_key.id;
        rval = ISNSdbWrite(&key,entry2);
     }
***************
*** 1454,1458 ****
  
     delete_key.tag=DD_ID_KEY;
!    delete_key.val.dd_id = dd_key.id;
     if ( ISNSdbDelete(&delete_key) == ERROR )
     {
--- 1454,1458 ----
  
     delete_key.tag=DD_ID_KEY;
!    delete_key.val.dd_key.id = dd_key.id;
     if ( ISNSdbDelete(&delete_key) == ERROR )
     {
***************
*** 1479,1488 ****
     SOIP_DD_Key dd_key;
     int removeMemberFlag;
!    ISNS_Key key;
  
     dd_key.id = id;
  
     key.tag = DD_ID_KEY;
!    key.val.dd_id = dd_key.id;
     rval = ISNSdbRead(&key,&entry);
     if (rval !=SUCCESS)
--- 1479,1488 ----
     SOIP_DD_Key dd_key;
     int removeMemberFlag;
!    ISNS_DBKey key;
  
     dd_key.id = id;
  
     key.tag = DD_ID_KEY;
!    key.val.dd_key.id = dd_key.id;
     rval = ISNSdbRead(&key,&entry);
     if (rval !=SUCCESS)
***************
*** 1547,1551 ****
     /* Store Entry */
     key.tag = DD_ID_KEY;
!    key.val.dd_id = dd_key.id;
     rval = ISNSdbWrite(&key,entry);
  
--- 1547,1551 ----
     /* Store Entry */
     key.tag = DD_ID_KEY;
!    key.val.dd_key.id = dd_key.id;
     rval = ISNSdbWrite(&key,entry);
  
***************
*** 1606,1614 ****
     int              activeFlag;
     SOIP_DD_Key      dd_key;
!    ISNS_Key	    key;
     int              rval;
  
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_name.v,p_node_name);
     rval = ISNSdbRead(&key,&lentry);
     if (rval != SUCCESS)
--- 1606,1614 ----
     int              activeFlag;
     SOIP_DD_Key      dd_key;
!    ISNS_DBKey	    key;
     int              rval;
  
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_key.v,p_node_name);
     rval = ISNSdbRead(&key,&lentry);
     if (rval != SUCCESS)
***************
*** 1635,1639 ****
           dd_key.id = id;
           key.tag = DD_ID_KEY;
!          key.val.dd_id = id;
           rval = ISNSdbRead(&key,&lentry2);
           if (rval != SUCCESS)
--- 1635,1639 ----
           dd_key.id = id;
           key.tag = DD_ID_KEY;
!          key.val.dd_key.id = id;
           rval = ISNSdbRead(&key,&lentry2);
           if (rval != SUCCESS)
***************
*** 1651,1655 ****
  
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_name.v,p_node_name);
     ISNSdbWrite(&key,lentry);
  
--- 1651,1655 ----
  
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_key.v,p_node_name);
     ISNSdbWrite(&key,lentry);
  
***************
*** 1668,1672 ****
     SOIP_DB_Entry  lentry;
     ISNS_LIST_NODE *p_lnode;
!    ISNS_Key       key;
     int            rval;
  
--- 1668,1672 ----
     SOIP_DB_Entry  lentry;
     ISNS_LIST_NODE *p_lnode;
!    ISNS_DBKey     key;
     int            rval;
  
***************
*** 1815,1821 ****
        memcpy ((char *) db_node_name.v, (char *) &key->val, key->len);
  
!       ISNS_Key read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_name.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
--- 1815,1821 ----
        memcpy ((char *) db_node_name.v, (char *) &key->val, key->len);
  
!       ISNS_DBKey read_key;
        read_key.tag = ISCSI_ID_KEY;
!       strcpy(read_key.val.node_key.v,db_node_name.v);
        rval = ISNSdbRead(&read_key,&entry);
        if (rval != SUCCESS)
***************
*** 1830,1836 ****
  
        /* Store the node */
!       ISNS_Key key;
        key.tag = ISCSI_ID_KEY;
!       strcpy(key.val.node_name.v,db_node_name.v);
        ISNSdbWrite(&key,entry);
     }
--- 1830,1836 ----
  
        /* Store the node */
!       ISNS_DBKey key;
        key.tag = ISCSI_ID_KEY;
!       strcpy(key.val.node_key.v,db_node_name.v);
        ISNSdbWrite(&key,entry);
     }
***************
*** 1839,1843 ****
        key = (ISNS_Key *)(key_indx[ifcpKeyIndex]);
  
!       ISNS_Key read_key;
        read_key.tag = PORT_NAME_KEY;
        memcpy(&read_key.val,&key->val,PORT_NAME_SIZE);
--- 1839,1843 ----
        key = (ISNS_Key *)(key_indx[ifcpKeyIndex]);
  
!       ISNS_DBKey read_key;
        read_key.tag = PORT_NAME_KEY;
        memcpy(&read_key.val,&key->val,PORT_NAME_SIZE);
***************
*** 1853,1857 ****
  
        /* Store the node */
!       ISNS_Key update_key;
        update_key.tag = PORT_NAME_KEY;
        strcpy(update_key.val.port_name.v,(char *)&key->val);
--- 1853,1857 ----
  
        /* Store the node */
!       ISNS_DBKey update_key;
        update_key.tag = PORT_NAME_KEY;
        strcpy(update_key.val.port_name.v,(char *)&key->val);
***************
*** 1875,1881 ****
  
        /* Store the node */
!       ISNS_Key key;
        key.tag = ENTITY_ID_KEY;
!       strcpy(key.val.entity_id.id,p_entity->eid.id);
        ISNSdbWrite(&key,entry);
  
--- 1875,1881 ----
  
        /* Store the node */
!       ISNS_DBKey key;
        key.tag = ENTITY_ID_KEY;
!       strcpy(key.val.entity_key.id,p_entity->eid.id);
        ISNSdbWrite(&key,entry);
  
***************
*** 1915,1919 ****
  ISNS_CheckEntities (void)
  {
!    ISNS_Key    key = { 0 };
     SOIP_Entity *p_entity;
     time_t      t;
--- 1915,1919 ----
  ISNS_CheckEntities (void)
  {
!    ISNS_DBKey  key = { 0 };
     SOIP_Entity *p_entity;
     time_t      t;

Index: iSNSreg.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** iSNSreg.c	15 Dec 2006 18:17:19 -0000	1.15
--- iSNSreg.c	18 Dec 2006 19:02:47 -0000	1.16
***************
*** 255,259 ****
     PORTAL_LIST_ENTRY newPortalEntry;
     char              *p_iscsi_name;
!    ISNS_Key          read_key;
     
     DEBUG_0 (isns_reg_debug & 1, (Registering Portal));
--- 255,259 ----
     PORTAL_LIST_ENTRY newPortalEntry;
     char              *p_iscsi_name;
!    ISNS_DBKey        read_key;
     
     DEBUG_0 (isns_reg_debug & 1, (Registering Portal));
***************
*** 412,416 ****
           p_portal->portal_index = ISNSGetNewPortalIdx();
  
!          ISNS_Key idx_key;
           idx_key.tag = PORTAL_IDX_KEY;
           idx_key.val.idx.index_type = PORTAL_IDX_KEY;
--- 412,416 ----
           p_portal->portal_index = ISNSGetNewPortalIdx();
  
!          ISNS_DBKey idx_key;
           idx_key.tag = PORTAL_IDX_KEY;
           idx_key.val.idx.index_type = PORTAL_IDX_KEY;
***************
*** 440,446 ****
              DEBUG_0 (isns_reg_debug &1,Fetch entity);
              strncpy(db_entity_id.id, (char *)&attr->val, sizeof(db_entity_id.id));
!             ISNS_Key read_key;
              read_key.tag = ENTITY_ID_KEY;
!             strcpy(read_key.val.entity_id.id,db_entity_id.id);
              rval = ISNSdbRead(&read_key,&entry);
  
--- 440,446 ----
              DEBUG_0 (isns_reg_debug &1,Fetch entity);
              strncpy(db_entity_id.id, (char *)&attr->val, sizeof(db_entity_id.id));
!             ISNS_DBKey read_key;
              read_key.tag = ENTITY_ID_KEY;
!             strcpy(read_key.val.entity_key.id,db_entity_id.id);
              rval = ISNSdbRead(&read_key,&entry);
  
***************
*** 641,645 ****
        /* Store the portal */
        DEBUG_1 (isns_reg_debug &1,Store Portal:%s,db_portal.ip_addr.v);
!       ISNS_Key update_key;
        update_key.tag = PORTAL_ID_KEY;
        memcpy(&update_key.val,&db_portal,sizeof(SOIP_Portal_Key));
--- 641,645 ----
        /* Store the portal */
        DEBUG_1 (isns_reg_debug &1,Store Portal:%s,db_portal.ip_addr.v);
!       ISNS_DBKey update_key;
        update_key.tag = PORTAL_ID_KEY;
        memcpy(&update_key.val,&db_portal,sizeof(SOIP_Portal_Key));
***************
*** 701,705 ****
     int               updateFlag;
     //char              *p_iscsi_name;
!    ISNS_Key          read_key;
     
     DEBUG_0 (isns_reg_debug & 1, (Registering Portal));
--- 701,705 ----
     int               updateFlag;
     //char              *p_iscsi_name;
!    ISNS_DBKey       read_key;
     
     DEBUG_0 (isns_reg_debug & 1, (Registering Portal));
***************
*** 895,899 ****
        /* Store the portal */
        DEBUG_1 (isns_reg_debug &1,Store Portal Group:%s,db_portal_group.ip_addr.v);
!       ISNS_Key update_key;
        update_key.tag = PORTAL_GROUP_ID_KEY;
        memcpy(&update_key.val,&db_portal_group,sizeof(SOIP_Portal_Group_Key));
--- 895,899 ----
        /* Store the portal */
        DEBUG_1 (isns_reg_debug &1,Store Portal Group:%s,db_portal_group.ip_addr.v);
!       ISNS_DBKey update_key;
        update_key.tag = PORTAL_GROUP_ID_KEY;
        memcpy(&update_key.val,&db_portal_group,sizeof(SOIP_Portal_Group_Key));
***************
*** 976,981 ****
     int              symIndex;
     char             *p_sym;
!    ISNS_Key         add_key;
!    ISNS_Key	    update_key;
  
     DEBUG_0 (isns_reg_debug & 1, (Registering DDS));
--- 976,981 ----
     int              symIndex;
     char             *p_sym;
!    ISNS_DBKey       add_key;
!    ISNS_DBKey	    update_key;
  
     DEBUG_0 (isns_reg_debug & 1, (Registering DDS));
***************
*** 1056,1062 ****
        }
  
!       ISNS_Key read_key;
        read_key.tag = DDS_ID_KEY;
!       read_key.val.dds_id = dds_key.id;
        rval = ISNSdbRead(&read_key,&entry);      
  
--- 1056,1062 ----
        }
  
!       ISNS_DBKey read_key;
        read_key.tag = DDS_ID_KEY;
!       read_key.val.dds_key.id = dds_key.id;
        rval = ISNSdbRead(&read_key,&entry);      
  
***************
*** 1172,1176 ****
        /* ISNSDisplay_DDS ( p_dds, HI_DETAIL ); */
        add_key.tag = DDS_ID_KEY;
!       add_key.val.dds_id = dds_key.id;
        rval = ISNSdbWrite (&add_key,entry);
        if ( newRegFlag )
--- 1172,1176 ----
        /* ISNSDisplay_DDS ( p_dds, HI_DETAIL ); */
        add_key.tag = DDS_ID_KEY;
!       add_key.val.dds_key.id = dds_key.id;
        rval = ISNSdbWrite (&add_key,entry);
        if ( newRegFlag )
***************
*** 1193,1199 ****
              /* Change status for all DD */
              dd_key.id = dd_id;
!             ISNS_Key key;
              key.tag = DD_ID_KEY;
!             key.val.dd_id = dd_key.id;
              rval = ISNSdbRead(&key,&entry);
              if (rval != SUCCESS)
--- 1193,1199 ----
              /* Change status for all DD */
              dd_key.id = dd_id;
!             ISNS_DBKey key;
              key.tag = DD_ID_KEY;
!             key.val.dd_key.id = dd_key.id;
              rval = ISNSdbRead(&key,&entry);
              if (rval != SUCCESS)
***************
*** 1213,1217 ****
                 /* Store Entry */
                 update_key.tag = DD_ID_KEY;
!                update_key.val.dd_id = dd_id;
                 ISNSdbWrite(&update_key,entry);
              }
--- 1213,1217 ----
                 /* Store Entry */
                 update_key.tag = DD_ID_KEY;
!                update_key.val.dd_key.id = dd_id;
                 ISNSdbWrite(&update_key,entry);
              }
***************
*** 1225,1231 ****
  
              dd_key.id = dlist_node[ count ];
!             ISNS_Key key;
              key.tag = DD_ID_KEY;
!             key.val.dd_id = dd_key.id;
              rval = ISNSdbRead(&key,&entry);
              if (rval != SUCCESS)
--- 1225,1231 ----
  
              dd_key.id = dlist_node[ count ];
!             ISNS_DBKey key;
              key.tag = DD_ID_KEY;
!             key.val.dd_key.id = dd_key.id;
              rval = ISNSdbRead(&key,&entry);
              if (rval != SUCCESS)
***************
*** 1292,1297 ****
     int         symIndex;
     uint32_t    iscsi_idx;
!    ISNS_Key    add_key;
!    ISNS_Key    read_key;
  
     DEBUG_0 (isns_reg_debug & 1, (Registering DD));
--- 1292,1297 ----
     int         symIndex;
     uint32_t    iscsi_idx;
!    ISNS_DBKey  add_key;
!    ISNS_DBKey  read_key;
  
     DEBUG_0 (isns_reg_debug & 1, (Registering DD));
***************
*** 1375,1379 ****
  
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry);
        p_dd = (SOIP_Dd *)&entry.data;
--- 1375,1379 ----
  
        read_key.tag = DD_ID_KEY;
!       read_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbRead(&read_key,&entry);
        p_dd = (SOIP_Dd *)&entry.data;
***************
*** 1525,1529 ****
        DEBUG_1 (isns_reg_debug &1, now write dd record dds_list id:%i,entry.data.dd.dds_list.list_id);
        add_key.tag = DD_ID_KEY;
!       add_key.val.dd_id = dd_key.id;
        rval = ISNSdbWrite(&add_key,entry);
        if ( newRegFlag )
--- 1525,1529 ----
        DEBUG_1 (isns_reg_debug &1, now write dd record dds_list id:%i,entry.data.dd.dds_list.list_id);
        add_key.tag = DD_ID_KEY;
!       add_key.val.dd_key.id = dd_key.id;
        rval = ISNSdbWrite(&add_key,entry);
        if ( newRegFlag )
***************
*** 1565,1569 ****
     SOIP_Dd_Member new_member;
     SOIP_Iscsi *p_node;
!    ISNS_Key key;
     int rval;
  
--- 1565,1569 ----
     SOIP_Dd_Member new_member;
     SOIP_Iscsi *p_node;
!    ISNS_DBKey key;
     int rval;
  
***************
*** 1583,1587 ****
     /* Fetch iSCSI Node */
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_name.v,ptr);
     rval = ISNSdbRead(&key,&entry2);
     
--- 1583,1587 ----
     /* Fetch iSCSI Node */
     key.tag = ISCSI_ID_KEY;
!    strcpy(key.val.node_key.v,ptr);
     rval = ISNSdbRead(&key,&entry2);
     
***************
*** 1592,1596 ****
        
        new_member.node_idx = ISNSGetNewISCSIIdx();
!       ISNS_Key idx_key;
        idx_key.tag = ISCSI_IDX_KEY;
        idx_key.val.idx.index_type = ISCSI_IDX_KEY;
--- 1592,1596 ----
        
        new_member.node_idx = ISNSGetNewISCSIIdx();
!       ISNS_DBKey idx_key;
        idx_key.tag = ISCSI_IDX_KEY;
        idx_key.val.idx.index_type = ISCSI_IDX_KEY;
***************
*** 1642,1646 ****
     ISNS_LIST_N...
 
[truncated message content]