[Linuxisns-commit] isnsNT/isnsserver/src iSNSquery.c,1.25,1.26

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

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

Modified Files:
	iSNSquery.c 
Log Message:
fixed dd query returning incorrect MEMBER_IDX tags

Index: iSNSquery.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** iSNSquery.c	23 Aug 2007 02:50:20 -0000	1.25
--- iSNSquery.c	23 Aug 2007 04:00:52 -0000	1.26
***************
*** 2661,2674 ****
             p_member=(SOIP_Dd_Member *)GetNodeData(pnode);
             if (p_member->type == ISNS_DD_ISCSI_MEMBER)
                 ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER,
                                 PAD4 (strlen (p_member->node_id)),
                                 p_member->node_id, 0);
! 
!            index_Flag = ISNSFindTag (0, ISNS_DD_ISCSI_MEMBER_IDX, attr_indx);
!            if (index_Flag != -1 )
!              if (p_member->type == ISNS_DD_ISCSI_MEMBER)
!                ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
                                 ISNS_DD_ISCSI_MEMBER_IDX_SIZE,
                                 NULL, p_member->node_idx);
           }
           break;
--- 2661,2675 ----
             p_member=(SOIP_Dd_Member *)GetNodeData(pnode);
             if (p_member->type == ISNS_DD_ISCSI_MEMBER)
+            {
                 ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER,
                                 PAD4 (strlen (p_member->node_id)),
                                 p_member->node_id, 0);
!                index_Flag = ISNSFindTag (0, ISNS_DD_ISCSI_MEMBER_IDX, attr_indx);
!                if (index_Flag != -1 )
!                  if (p_member->type == ISNS_DD_ISCSI_MEMBER)
!                    ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
                                 ISNS_DD_ISCSI_MEMBER_IDX_SIZE,
                                 NULL, p_member->node_idx);
+            }
           }
           break;
***************
*** 2679,2691 ****
              p_member=(SOIP_Dd_Member *)GetNodeData(pnode);
              if (p_member->type == ISNS_DD_IFCP_MEMBER)
                 ISNSAppendAttr (p_msg, ISNS_DD_IFCP_MEMBER,
                                 ISNS_PORT_NAME_SIZE, p_member->node_id,
                                 0);
!            index_Flag = ISNSFindTag (0, ISNS_DD_ISCSI_MEMBER_IDX, attr_indx);
!            if (index_Flag != -1 )
!              if (p_member->type == ISNS_DD_ISCSI_MEMBER)
!                ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
                                 ISNS_DD_ISCSI_MEMBER_IDX_SIZE,
                                 NULL, p_member->node_idx);
           }
           break;
--- 2680,2694 ----
              p_member=(SOIP_Dd_Member *)GetNodeData(pnode);
              if (p_member->type == ISNS_DD_IFCP_MEMBER)
+             {
                 ISNSAppendAttr (p_msg, ISNS_DD_IFCP_MEMBER,
                                 ISNS_PORT_NAME_SIZE, p_member->node_id,
                                 0);
!                index_Flag = ISNSFindTag (0, ISNS_DD_ISCSI_MEMBER_IDX, attr_indx);
!                if (index_Flag != -1 )
!                  if (p_member->type == ISNS_DD_ISCSI_MEMBER)
!                    ISNSAppendAttr (p_msg, ISNS_DD_ISCSI_MEMBER_IDX,
                                 ISNS_DD_ISCSI_MEMBER_IDX_SIZE,
                                 NULL, p_member->node_idx);
+             }
           }
           break;
***************
*** 3060,3063 ****
--- 3063,3068 ----
     ISNS_Attr *q_attr;
  
+    __DEBUG (isns_query_debug &1, ISNSdbProcessEntityOpAttr);
+ 
     for (ii = 0; ii < MAX_PARSE_ATTRS && attr_indx[ii]; ii++)
     {