linuxisns-commit

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

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

Modified Files:
	iSNSquery.c iSNSreg.c 
Log Message:
fix portal group tag

Index: iSNSreg.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSreg.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** iSNSreg.c	27 Aug 2007 21:25:17 -0000	1.31
--- iSNSreg.c	27 Aug 2007 22:49:05 -0000	1.32
***************
*** 258,261 ****
--- 258,262 ----
     PORTAL_LIST_ENTRY newPortalEntry;
     char              *p_iscsi_name;
+    SOIP_DB_Portal    *p_idx;
     
     __DEBUG (isns_reg_debug & 1, (Registering Portal));
***************
*** 406,410 ****
           p_portal->portal_index = ISNSGetNewPortalIdx();
  
!          SOIP_DB_Portal *p_idx;
           memset (&entry3, 0, sizeof(SOIP_DB_Entry));
           p_idx = &entry3.data.portal_idx;
--- 407,412 ----
           p_portal->portal_index = ISNSGetNewPortalIdx();
  
! 	 p_portal->default_portal_tag = 1;  //DEFAULT portal_tag 
! 
           memset (&entry3, 0, sizeof(SOIP_DB_Entry));
           p_idx = &entry3.data.portal_idx;
***************
*** 540,543 ****
--- 542,548 ----
              }
              break;
+          case ISNS_PORTAL_GROUP_TAG:
+ 	      p_portal->default_portal_tag = attr->val.portal_group;
+               break;
           case ISNS_PORTAL_IP:
           case ISNS_PORTAL_PORT:

Index: iSNSquery.c
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/src/iSNSquery.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** iSNSquery.c	27 Aug 2007 21:25:17 -0000	1.29
--- iSNSquery.c	27 Aug 2007 22:49:05 -0000	1.30
***************
*** 2659,2663 ****
                    if (p_portal_group)
                    {
!                     __DEBUG (isns_query_debug &1,Add ISNS_PORTAL_GROUP_TAG);
                     ISNSAppendAttr (p_msg, ISNS_PORTAL_GROUP_TAG, ISNS_PORTAL_GROUP_TAG_SIZE,
                                   NULL, p_portal_group->portal_tag);
--- 2659,2663 ----
                    if (p_portal_group)
                    {
!                     __DEBUG (isns_query_debug &1,Add ISNS_PORTAL_GROUP_TAG from portal group object);
                     ISNSAppendAttr (p_msg, ISNS_PORTAL_GROUP_TAG, ISNS_PORTAL_GROUP_TAG_SIZE,
                                   NULL, p_portal_group->portal_tag);
***************
*** 2665,2671 ****
                    else
                    {
!                     __DEBUG (isns_query_debug &1,Add ISNS_PORTAL_GROUP_TAG);
                     ISNSAppendAttr (p_msg, ISNS_PORTAL_GROUP_TAG, ISNS_PORTAL_GROUP_TAG_SIZE,
!                                  NULL, 1);
                    }
                    break;
--- 2665,2671 ----
                    else
                    {
!                     __DEBUG (isns_query_debug &1,Add ISNS_PORTAL_GROUP_TAG from default tag in portal object);
                     ISNSAppendAttr (p_msg, ISNS_PORTAL_GROUP_TAG, ISNS_PORTAL_GROUP_TAG_SIZE,
!                                  NULL, p_portal->default_portal_tag);
                    }
                    break;