From: Robert W. <wrw...@us...> - 2007-08-28 17:48:00
|
Update of /cvsroot/linuxisns/isnsNT/isnsserver/include In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30054 Modified Files: iSNS.h iSNSList.h iSNStypes.h Log Message: fix type defs to specify as unsigned integers Index: iSNStypes.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNStypes.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** iSNStypes.h 27 Aug 2007 22:49:05 -0000 1.19 --- iSNStypes.h 28 Aug 2007 17:47:56 -0000 1.20 *************** *** 135,139 **** typedef struct { uint32_t attr_id; ! int attr_len; void *attr_val; } ISNS_ATTR_VALS; --- 135,139 ---- typedef struct { uint32_t attr_id; ! uint32_t attr_len; void *attr_val; } ISNS_ATTR_VALS; *************** *** 143,149 **** */ typedef struct { ! int flags; ! int num_entries; ! int total_size; ISNS_ATTR_VALS *attr_val_sptr; } ISNS_ATTR_VALS_CB; --- 143,149 ---- */ typedef struct { ! uint32_t flags; ! uint32_t num_entries; ! uint32_t total_size; ISNS_ATTR_VALS *attr_val_sptr; } ISNS_ATTR_VALS_CB; *************** *** 531,535 **** 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 --- 531,535 ---- uint32_t portal_id; IP_Address ip_addr; ! uint32_t ip_port; char sym_name[ PORTAL_SYM_NAME_SIZE ]; uint32_t node_type; //1=target, 2=initiator *************** *** 725,729 **** typedef struct ISNS_key { ! int tag; uint32_t len; --- 725,729 ---- typedef struct ISNS_key { ! uint32_t tag; uint32_t len; *************** *** 749,753 **** typedef struct ISNS_attr { ! int tag; uint32_t len; --- 749,753 ---- typedef struct ISNS_attr { ! uint32_t tag; uint32_t len; *************** *** 772,776 **** SOIP_COS cos; uint32_t portal_group; ! int priority; SOIP_Node_IPA ipa; SOIP_Hard_Addr hard_addr; --- 772,776 ---- SOIP_COS cos; uint32_t portal_group; ! uint32_t priority; SOIP_Node_IPA ipa; SOIP_Hard_Addr hard_addr; *************** *** 806,810 **** typedef struct soip_scn_callback_entry { ! int bitmap; uint32_t type; void (*scn_callback_func)(ISNS_ATTR_VALS_CB *avcb_ptr); --- 806,810 ---- typedef struct soip_scn_callback_entry { ! uint32_t bitmap; uint32_t type; void (*scn_callback_func)(ISNS_ATTR_VALS_CB *avcb_ptr); Index: iSNSList.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNSList.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iSNSList.h 27 Aug 2007 21:25:16 -0000 1.4 --- iSNSList.h 28 Aug 2007 17:47:56 -0000 1.5 *************** *** 39,49 **** { void *data; ! int data_size; ! int list_id; ! int index; void *p_entry; ! int next_index; ! int prev_index; } ISNS_LIST_NODE; --- 39,49 ---- { void *data; ! uint32_t data_size; ! uint32_t list_id; ! uint32_t index; void *p_entry; ! uint32_t next_index; ! uint32_t prev_index; } ISNS_LIST_NODE; *************** *** 51,58 **** typedef struct _list { ! int node_count; ! int list_id; ! int first_index; ! int last_index; void *p_entry; --- 51,58 ---- typedef struct _list { ! uint32_t node_count; ! uint32_t list_id; ! uint32_t first_index; ! uint32_t last_index; void *p_entry; Index: iSNS.h =================================================================== RCS file: /cvsroot/linuxisns/isnsNT/isnsserver/include/iSNS.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** iSNS.h 2 Jan 2007 20:15:24 -0000 1.3 --- iSNS.h 28 Aug 2007 17:47:56 -0000 1.4 *************** *** 44,48 **** /* This should be a string */ ! #define ISNS_VERSION "1.2.0" /* This should be an integer, and is the protocol version */ --- 44,48 ---- /* This should be a string */ ! #define ISNS_VERSION "2.1.1" /* This should be an integer, and is the protocol version */ |