[Linuxisns-commit] isnsNT/isnsserver/include iSNSreg.h, 1.2, 1.3 iSNStypes.h, 1.7, 1.8

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

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

Modified Files:
	iSNSreg.h iSNStypes.h 
Log Message:
Fix up Portal object and rework ESI processing

Index: iSNStypes.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** iSNStypes.h	8 Dec 2006 20:05:50 -0000	1.7
--- iSNStypes.h	14 Dec 2006 23:04:27 -0000	1.8
***************
*** 583,594 ****
  
     /* More iSNS Stuff */
-    ISNS_LIST         entity_list;
-    uint32_t          portal_index;
     char              sym_name[ PORTAL_SYM_NAME_SIZE ];
     uint32_t          esi_sockfd;
     uint32_t          esi_port;
     uint32_t          esi_interval;
     uint32_t          esiSent;
!    int               esi_timer;
  
     void              *ptr_cert;
--- 583,595 ----
  
     /* More iSNS Stuff */
     char              sym_name[ PORTAL_SYM_NAME_SIZE ];
+    SOIP_Entity_Id    entity_id;
+    uint32_t          entity_index;
+    uint32_t          portal_index;
     uint32_t          esi_sockfd;
     uint32_t          esi_port;
     uint32_t          esi_interval;
     uint32_t          esiSent;
!    time_t            esi_timer;
  
     void              *ptr_cert;
***************
*** 673,677 ****
    DDS_DD_LIST,
    PORTAL_ENTITY_LIST,
-   ESI_LIST,
    SCN_CALLBACK_LIST,
    SCN_LIST
--- 674,677 ----
***************
*** 804,807 ****
--- 804,808 ----
          SOIP_Time        timestamp;
          void             (*scn_callback)(ISNS_ATTR_VALS_CB *attr_vals_sptr);
+ 	SOIP_Entity_Id   entity_id;
  
      } val;

Index: iSNSreg.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSreg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** iSNSreg.h	6 Dec 2006 22:05:34 -0000	1.2
--- iSNSreg.h	14 Dec 2006 23:04:27 -0000	1.3
***************
*** 85,94 ****
  
  int
- ISNSRemoveESIEntry(IP_Address *p_ip, uint32_t port, char *p_eid);
- 
- int
- ISNSAddESIEntry(IP_Address *p_ip, uint32_t port, char *p_eid);
- 
- int
  Copy_DD_List(ISNS_LIST *dd_list, ISNS_DD_LIST p_dlist);
  
--- 85,88 ----