[Linuxisns-commit] isnsNT/isnsserver/include iSNStypes.h, 1.13, 1.14

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

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

Modified Files:
	iSNStypes.h 
Log Message:
add timeout to socket connection

Index: iSNStypes.h
===================================================================
RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** iSNStypes.h	12 Jan 2007 21:10:22 -0000	1.13
--- iSNStypes.h	15 Mar 2007 22:28:30 -0000	1.14
***************
*** 494,505 ****
  
  typedef struct soip_entity {
! 
!     SOIP_Entity_Id   eid;
!     uint32_t         eid_len;
!     uint32_t         esi;
!     SOIP_Entity_Type eid_type;
!     SOIP_Port_List   port_list;
! 
!     /* iSNS Stuff */
      uint32_t             entity_index;
      SOIP_Time            timestamp;
--- 494,503 ----
  
  typedef struct soip_entity {
!     SOIP_Entity_Id       eid;
!     uint32_t             eid_len;
!     uint32_t             esi;
!     SOIP_Entity_Type     eid_type;         //1=iscsi,  2=ifcp
!     uint32_t             node_type;        //1=target, 2=initiator, 3=both
!     SOIP_Port_List       port_list;
      uint32_t             entity_index;
      SOIP_Time            timestamp;
***************
*** 514,518 ****
      uint32_t             cert_size;
      uint32_t             period;
- 
  } SOIP_Entity;
  
--- 512,515 ----
***************
*** 532,554 ****
  
  typedef struct soip_portal {
! 
!     uint32_t         portal_id;
!     IP_Address       ip_addr;
!     uint32_t         ip_port;
! 
!    /* 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;
!    uint32_t          cert_size;
!    uint32_t          group;
! 
  } SOIP_Portal;
  
--- 529,548 ----
  
  typedef struct soip_portal {
!     uint32_t          portal_id;
!     IP_Address        ip_addr;
!     int32_t           ip_port;
!     char              sym_name[ PORTAL_SYM_NAME_SIZE ];
!     uint32_t          node_type;        //1=target, 2=initiator
!     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;
!     uint32_t          cert_size;
!     uint32_t          group;
  } SOIP_Portal;
  
***************
*** 573,579 ****
      uint32_t         ip_port;
      uint32_t         portal_tag;
! 
!    /* More iSNS Stuff */
!    uint32_t          portal_group_index;
  
  } SOIP_Portal_Group;
--- 567,571 ----
      uint32_t         ip_port;
      uint32_t         portal_tag;
!     uint32_t          portal_group_index;
  
  } SOIP_Portal_Group;