admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'aredlich/master'

Browse Source 
Conflicts:
	lib/init.c
	lib/socket.c
This commit is contained in:
Peter Lieven
2012-11-03 10:39:23 +01:00
parent c4dc380262 f618d08350
commit 36527c5122
25 changed files with 286 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/iscsi-private.h
View File

@@ -86,7 +86,7 @@ struct iscsi_context {
int fd;
int is_connected;
int tcp_user_timeout;
int tcp_keepcnt;
int tcp_keepintvl;
@@ -274,7 +274,7 @@ int iscsi_process_reject(struct iscsi_context *iscsi,
int iscsi_send_target_nop_out(struct iscsi_context *iscsi, uint32_t ttt);
void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string,
...);
...) __attribute__((format(printf, 2, 3)));
unsigned char *iscsi_get_user_in_buffer(struct iscsi_context *iscsi, struct iscsi_in_pdu *in, uint32_t pos, ssize_t *count);
unsigned char *scsi_task_get_data_in_buffer(struct scsi_task *task, uint32_t pos, ssize_t *count);
@@ -295,4 +295,3 @@ void iscsi_set_noautoreconnect(struct iscsi_context *iscsi, int state);
#endif
#endif /* __iscsi_private_h__ */