diff options
| author | dmitry_yus <dmitry_yus@d7303112-9cec-0310-bdd2-e83a94d6c2b6> | 2005-04-27 01:29:03 +0000 |
|---|---|---|
| committer | dmitry_yus <dmitry_yus@d7303112-9cec-0310-bdd2-e83a94d6c2b6> | 2005-04-27 01:29:03 +0000 |
| commit | d269bc986d5eeb091298fcc1a883d57af21eabee (patch) | |
| tree | 78a78e12858878ada3970f9cbf5ebf103ea90865 /include | |
| parent | cc7f11d3afed323d419a87c6f5beb7f65e375ee7 (diff) | |
| download | open-iscsi-d269bc986d5eeb091298fcc1a883d57af21eabee.tar.gz | |
get rid of control plane's handles.
git-svn-id: svn://svn.berlios.de/open-iscsi@256 d7303112-9cec-0310-bdd2-e83a94d6c2b6
Diffstat (limited to 'include')
| -rw-r--r-- | include/iscsi_ifev.h | 6 | ||||
| -rw-r--r-- | include/iscsi_iftrans.h | 29 |
2 files changed, 16 insertions, 19 deletions
diff --git a/include/iscsi_ifev.h b/include/iscsi_ifev.h index 2a83f01..467a4c5 100644 --- a/include/iscsi_ifev.h +++ b/include/iscsi_ifev.h @@ -49,7 +49,6 @@ struct iscsi_uevent { union { /* messages u -> k */ struct msg_create_session { - uint64_t session_handle; uint32_t initial_cmdsn; } c_session; struct msg_destroy_session { @@ -58,7 +57,6 @@ struct iscsi_uevent { } d_session; struct msg_create_cnx { uint64_t session_handle; - uint64_t cnx_handle; uint32_t cid; uint32_t sid; } c_cnx; @@ -95,7 +93,7 @@ struct iscsi_uevent { uint64_t handle; int retcode; struct msg_create_session_ret { - uint64_t handle; + uint64_t session_handle; uint32_t sid; } c_session_ret; struct msg_recv_req { @@ -108,7 +106,7 @@ struct iscsi_uevent { } cnxerror; struct msg_trans_list { struct { - uint64_t handle; + uint64_t trans_handle; char name[ISCSI_TRANSPORT_NAME_MAXLEN]; } elements[ISCSI_TRANSPORT_MAX]; } t_list; diff --git a/include/iscsi_iftrans.h b/include/iscsi_iftrans.h index 75248ef..40e9e0e 100644 --- a/include/iscsi_iftrans.h +++ b/include/iscsi_iftrans.h @@ -49,21 +49,20 @@ struct iscsi_transport { int max_lun; unsigned int max_cnx; unsigned int max_cmd_len; - iscsi_snx_t (*create_session) (iscsi_snx_t cp_snx, - uint32_t initial_cmdsn, struct Scsi_Host *shost); - void (*destroy_session) (iscsi_snx_t dp_snx); - iscsi_cnx_t (*create_cnx) (iscsi_snx_t dp_snx, iscsi_cnx_t cp_cnx, - uint32_t cid); - int (*bind_cnx) (iscsi_snx_t dp_snx, iscsi_cnx_t dp_cnx, + iscsi_snx_t (*create_session) (uint32_t initial_cmdsn, + struct Scsi_Host *shost); + void (*destroy_session) (iscsi_snx_t snx); + iscsi_cnx_t (*create_cnx) (iscsi_snx_t snx, uint32_t cid); + int (*bind_cnx) (iscsi_snx_t snx, iscsi_cnx_t cnx, uint32_t transport_fd, int is_leading); - int (*start_cnx) (iscsi_cnx_t dp_cnx); - void (*stop_cnx) (iscsi_cnx_t dp_cnx, int flag); - void (*destroy_cnx) (iscsi_cnx_t dp_cnx); - int (*set_param) (iscsi_cnx_t dp_cnx, enum iscsi_param param, + int (*start_cnx) (iscsi_cnx_t cnx); + void (*stop_cnx) (iscsi_cnx_t cnx, int flag); + void (*destroy_cnx) (iscsi_cnx_t cnx); + int (*set_param) (iscsi_cnx_t cnx, enum iscsi_param param, uint32_t value); - int (*get_param) (iscsi_cnx_t dp_cnx, enum iscsi_param param, + int (*get_param) (iscsi_cnx_t cnx, enum iscsi_param param, uint32_t *value); - int (*send_pdu) (iscsi_cnx_t dp_cnx, struct iscsi_hdr *hdr, + int (*send_pdu) (iscsi_cnx_t cnx, struct iscsi_hdr *hdr, char *data, uint32_t data_size); }; @@ -74,10 +73,10 @@ extern int iscsi_register_transport(struct iscsi_transport *t); extern int iscsi_unregister_transport(struct iscsi_transport *t); /* - * control plane "up" calls + * control plane upcalls */ -extern void iscsi_cnx_error(iscsi_cnx_t cp_cnx, enum iscsi_err error); -extern int iscsi_recv_pdu(iscsi_cnx_t cp_cnx, struct iscsi_hdr *hdr, +extern void iscsi_cnx_error(iscsi_cnx_t cnx, enum iscsi_err error); +extern int iscsi_recv_pdu(iscsi_cnx_t cnx, struct iscsi_hdr *hdr, char *data, uint32_t data_size); #endif /* ISCSI_IFTRANS_H */ |